diff --git a/src/pages.json b/src/pages.json index ae44ee0..05bb412 100644 --- a/src/pages.json +++ b/src/pages.json @@ -567,6 +567,14 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } + }, + { + "path": "pages/wms/product/ProductionRecord/index", + "style": { + "navigationBarTitleText": "成品生成记录", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index d552dc0..abd71fd 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -142,7 +142,7 @@ export default class LoginPage extends BasePage { // console.log('Version////', this.Version); } ///********版本号修改区域********** - version = '0.0.83'; //正式版本号 + version = '0.0.84'; //正式版本号 //version = '0.0.4'; //测试版本号 //***************标志修改区域:是否是测试标志: false 正式版本; true 测试版本**************** //isTest = true; diff --git a/src/pages/wms/product/ProductionRecord/index.vue b/src/pages/wms/product/ProductionRecord/index.vue new file mode 100644 index 0000000..8b6a716 --- /dev/null +++ b/src/pages/wms/product/ProductionRecord/index.vue @@ -0,0 +1,587 @@ + + + diff --git a/src/pages/wms/product/ProductionRecord/model.ts b/src/pages/wms/product/ProductionRecord/model.ts new file mode 100644 index 0000000..58b4903 --- /dev/null +++ b/src/pages/wms/product/ProductionRecord/model.ts @@ -0,0 +1,50 @@ +import { getModule, Module, MutationAction, VuexModule } from 'vuex-module-decorators'; +import store from '@/store'; +import http from '@/utils/request'; +import { url } from '@/utils/url'; +import { session } from '@/store/modules/session'; +@Module({ + namespaced: true, + dynamic: true, + store, + name: 'page.product.ProductionRecord', +}) +// http.defaults.headers.common['poolName'] = session.PoolName; +export class ProductionRecord extends VuexModule { + @MutationAction + async getlistBaseEquipment() { + const result: any = await http.post(url.lanjuwms.product.ProductionRecord.getlistBaseEquipment, { + factoryCode: session.FactoryCode, + }); + const Linelist = result.data.map((element: any) => ({ + label: element.equipmentName, + value: element.equipmentCode, + ...element, + })); + return { WlList: Linelist }; + } + WlList = []; + orderNoItemList: any = []; + @MutationAction + async queryOrderNo(params: any) { + const result: any = await http.post(url.lanjuwms.product.ProductionRecord.listProOrderWorkorder, params); + const orderNoItemList = result.data; + return { orderNoItemList }; + } + productCodeList: any = []; + @MutationAction + async list(orderNo: any) { + const result: any = await http.get(url.lanjuwms.product.OfflineStorage.list + '/' + orderNo, {}); + const productCodeList = result.data; + return { productCodeList }; + } + submitcode: any = ''; + @MutationAction + async getwarehouselist(params: any) { + const result: any = await http.post(url.lanjuwms.product.ProductionRecord.finishedProductProductionRecords, params); + const submitcode = result.code; + return { submitcode }; + } +} + +export default getModule(ProductionRecord); diff --git a/src/utils/page.ts b/src/utils/page.ts index daf38b6..2104ccd 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -47,5 +47,6 @@ export const page = { FinishedProCheck: '/pages/wms/FGmanagement/FinishedProCheck/index', BatchOfflineStorage: '/pages/wms/product/BatchOfflineStorage/index', ArrivalRecord: '/pages/wms/Raw/ArrivalRecord/index', + ProductionRecord: '/pages/wms/product/ProductionRecord/index', }, }; diff --git a/src/utils/url.ts b/src/utils/url.ts index c895a53..2b80fca 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -86,6 +86,11 @@ export const url = { selectFinishedProductTransferAndOutbound: qianzhuione + '/wms/WmsToWCSmission/selectFinishedProductTransferAndOutbound', confirmFinishedProductTransferAndOutbound: qianzhuione + '/wms/WmsToWCSmission/confirmFinishedProductTransferAndOutbound', }, + ProductionRecord: { + getlistBaseEquipment: qianzhuione + '/wms/WmsToWCSmission/listBaseEquipment', + listProOrderWorkorder: qianzhuione + '/wms/WmsToWCSmission/listProOrderWorkorder', + finishedProductProductionRecords: qianzhuione + '/wms/WmsToWCSmission/finishedProductProductionRecords', + }, }, raw: { ReceivePO: {