diff --git a/src/pages.json b/src/pages.json index 4871b9f..6ce278b 100644 --- a/src/pages.json +++ b/src/pages.json @@ -611,7 +611,7 @@ { "path": "pages/wms/Raw/ArrivalRegistration/index", "style": { - "navigationBarTitleText": "到货登记", + "navigationBarTitleText": "采购收货(SRM)到货登记", "navigationStyle": "custom", "navigationBarTextStyle": "white" } @@ -623,6 +623,14 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } + }, + { + "path": "pages/wms/Raw/ArrivalRegistrationPO/index", + "style": { + "navigationBarTitleText": "采购收货(PO)到货登记", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 37c182f..7d6674c 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -142,8 +142,8 @@ export default class LoginPage extends BasePage { // console.log('Version////', this.Version); } ///********版本号修改区域********** - // version = '0.0.100'; //正式版本号 - version = '0.0.12'; //测试版本号 + version = '0.0.101'; //正式版本号 + //version = '0.0.12'; //测试版本号 //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //isTest = true; diff --git a/src/pages/wms/Raw/ArrivalRegistration/index.vue b/src/pages/wms/Raw/ArrivalRegistration/index.vue index dac432d..4d7af09 100644 --- a/src/pages/wms/Raw/ArrivalRegistration/index.vue +++ b/src/pages/wms/Raw/ArrivalRegistration/index.vue @@ -4,7 +4,7 @@ - 到货登记 + 采购收货(SRM)到货登记 diff --git a/src/pages/wms/Raw/ArrivalRegistrationPO/index.vue b/src/pages/wms/Raw/ArrivalRegistrationPO/index.vue new file mode 100644 index 0000000..0edf9a2 --- /dev/null +++ b/src/pages/wms/Raw/ArrivalRegistrationPO/index.vue @@ -0,0 +1,876 @@ + + + diff --git a/src/pages/wms/Raw/ArrivalRegistrationPO/model.ts b/src/pages/wms/Raw/ArrivalRegistrationPO/model.ts new file mode 100644 index 0000000..9fc6b3d --- /dev/null +++ b/src/pages/wms/Raw/ArrivalRegistrationPO/model.ts @@ -0,0 +1,129 @@ +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.raw.ArrivalRegistrationPO', +}) +export class ArrivalRegistrationPO extends VuexModule { + WlList = []; + orderNoItemList: any = []; + orderNoItemListdes: any = []; + @MutationAction + async PurchaseOrderPda(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.PurchaseOrderPda, data); + let orderNoItemList: any = []; + if (result.data.length) { + orderNoItemList = result.data.map((item: any) => ({ + label: item.materialDesc, + value: item.materialCode, + ...item, + })); + } else { + orderNoItemList = []; + } + return { orderNoItemList }; + } + Alreadycode: any = ''; + ProcureOrderAlreadylist: any = ''; + @MutationAction + async selectOdsProcureOrderAlready(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.selectOdsProcureOrderAlready, data); + const Alreadycode = result.code; + const ProcureOrderAlreadylist = result.data; + return { Alreadycode, ProcureOrderAlreadylist }; + } + sapPurchasecode: any = ''; + @MutationAction + async sapPurchaseOrderSync(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.sapPurchaseOrderSync, data); + const sapPurchasecode = result.code; + return { sapPurchasecode }; + } + deliverycode: any = ''; + @MutationAction + async getDeliveryNoteDetail(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.getDeliveryNoteDetail, data); + const deliverycode = result.code; + return { deliverycode }; + } + SubmitCode: any = ''; + @MutationAction + async PurchaseOrderdeliPda(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.PurchaseOrderdeliPda, data); + const SubmitCode: [] = result; + return { SubmitCode }; + } + + @MutationAction + async PurchaseOrderdetailPda(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.PurchaseOrderdetailPda, data); + const orderNoItemListdes = result.data; + return { orderNoItemListdes }; + } + DictTypeList: any = []; + @MutationAction + async Stashlist() { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.list, { + factoryCode: session.FactoryCode, + }); + const DictTypeListoild: [] = result.data; + const DictTypeList = DictTypeListoild.map((item: any) => ({ + label: item.warehouseName, + value: item.warehouseCode, + ...item, + })); + return { DictTypeList }; + } + wacodelist: any = []; + @MutationAction + async WarehouseList(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.WarehouseList, data); + const oldwacode = result.data; + let wacodelist = oldwacode.map((item: any) => ({ + label: item.areaDesc, + value: item.areaCode, + ...item, + })); + if (!wacodelist.length) { + wacodelist = []; + } + return { wacodelist }; + } + submitcode: any = ''; + @MutationAction + async OnSubmit(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.PurchaseOrderdeliPdaConfirm, data); + const submitcode = result.code; + return { + submitcode, + }; + } + Arrivalcode: any = ''; + Arrivalmsg: any = ''; + @MutationAction + async ArrivalRegistration(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.ArrivalRegistration, data); + const Arrivalcode = result.code; + const Arrivalmsg = result.msg; + return { + Arrivalcode, + Arrivalmsg, + }; + } + singcode: any = ''; + singobj: any = {}; + @MutationAction + async selectArrivalRegistration(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceivePO.selectArrivalRegistration, data); + const singcode = result.code; + const singobj = result.data; + return { singcode, singobj }; + } +} + +export default getModule(ArrivalRegistrationPO); diff --git a/src/pages/wms/Raw/ReceivePO/index.vue b/src/pages/wms/Raw/ReceivePO/index.vue index 92508b1..2eedfaa 100644 --- a/src/pages/wms/Raw/ReceivePO/index.vue +++ b/src/pages/wms/Raw/ReceivePO/index.vue @@ -23,6 +23,17 @@ + + + + + + {{ waCodeList && waCodeList.warehouseName }} + + + + + 生成收货单号 @@ -30,7 +41,7 @@ - + @@ -60,46 +71,50 @@ 应收/已收: {{ item.planNumber }}/{{ item.realityNumber }} - - 收货 - - - - - - - - - - - - - 已收货 - - - 采购单号: - {{ item.procureCode }} - - - 行项目: - {{ item.userDefined3 }} - - - 物料编码: - {{ item.handlematerialCode }} - - - 物料描述: - {{ item.materialDesc }} - - - 工厂号: - {{ item.siteCode }} - - - 应收/已收: - {{ item.planNumber }}/{{ item.realityNumber }} - + + + + + + + + + + + + + {{ item.userDefined10 == '0' ? '未收货' : '已收货' }} + + + 采购单号: + {{ item.procureCode }} + + + 行项目: + {{ item.userDefined3 }} + + + 物料编码: + {{ item.handlematerialCode }} + + + 物料描述: + {{ item.materialDesc }} + + + 工厂号: + {{ item.siteCode }} + + + 托盘: + {{ item.sn }} + + + 实际收货: + + @@ -109,92 +124,18 @@ - - 到货登记 - 确认收货 + + 返回 + - - - - - 标识码： - - - - - 数量： - - - - 收货方式： - - - - - - 物料号： - - - - 托盘号： - - - - - 收货仓库： - - - - 库区： - - - - -
- 确定 -
-
- 取消 -
- - - - - - - - - 已登记数量： - - - - 未登记数量： - - - - 登记数量： - - - -
- 确定 -
-
- 取消 -
- - - - -