diff --git a/src/pages.json b/src/pages.json index 684b45a..4871b9f 100644 --- a/src/pages.json +++ b/src/pages.json @@ -607,7 +607,25 @@ "navigationStyle": "custom", "navigationBarTextStyle": "white" } + }, + { + "path": "pages/wms/Raw/ArrivalRegistration/index", + "style": { + "navigationBarTitleText": "到货登记", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } + }, + { + "path": "pages/wms/Raw/ArrivalRegistration/detail", + "style": { + "navigationBarTitleText": "到货登记详细", + "navigationStyle": "custom", + "navigationBarTextStyle": "white" + } } + + ], diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index 4bec8d3..ebbc488 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.98'; //正式版本号 + version = '0.0.99'; //正式版本号 //version = '0.0.11'; //测试版本号 //***************标志修改区域：是否是测试标志： false 正式版本； true 测试版本**************** //isTest = true; diff --git a/src/pages/quality/Belowstandard/index.vue b/src/pages/quality/Belowstandard/index.vue index 4d5b683..e2e6717 100644 --- a/src/pages/quality/Belowstandard/index.vue +++ b/src/pages/quality/Belowstandard/index.vue @@ -9,9 +9,13 @@ - - - + + + + + + + @@ -62,65 +66,38 @@ -
-
来料不合格处理:
-
-
厂区：{{ formdata.factoryCode }}
-
OEM厂名：{{ formdata.supplierCode }}
-
-
-
来料类别：{{ formdata.supplierCode }}
-
物料名称：{{ formdata.materialName }}
-
-
-
供应商编码：{{ formdata.supplierCode }}
-
供应商名称：{{ formdata.supplierName }}
-
-
-
来料批次号：{{ formdata.incomeBatchNo }}
-
来料日期：{{ formdata.incomeTime }}
-
-
-
物料数量：{{ formdata.quality }}
-
单位：{{ formdata.unit }}
-
-
-
检验编号：{{ formdata.orderNo }}
-
检验人：{{ formdata.checkManName }}
-
-
-
物料来源：{{ formdata.supplierCode }}
-
-
- - - - - -
处理人1： 姓名1 2023-01-01 11:11:11
- - - -
处理人2 姓名1 2023-01-01 11:11:11
- - - - - - - - -
- 提交 -
-
- 取消 -
+ + + + + 操作日期: + {{ item.operatedate }} + + + 操作时间: + {{ item.operatetime }} + + + 操作者: + {{ item.operator }} + + + 接收者: + {{ item.receivedpersons }} + + + 签字类型: + {{ item.logtype }} + + + + + + diff --git a/src/pages/wms/Raw/ArrivalRegistration/index.vue b/src/pages/wms/Raw/ArrivalRegistration/index.vue new file mode 100644 index 0000000..dac432d --- /dev/null +++ b/src/pages/wms/Raw/ArrivalRegistration/index.vue @@ -0,0 +1,906 @@ + + + diff --git a/src/pages/wms/Raw/ArrivalRegistration/model.ts b/src/pages/wms/Raw/ArrivalRegistration/model.ts new file mode 100644 index 0000000..080d69c --- /dev/null +++ b/src/pages/wms/Raw/ArrivalRegistration/model.ts @@ -0,0 +1,130 @@ +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.ArrivalRegistration', +}) +export class ArrivalRegistration extends VuexModule { + WlList = []; + orderNoItemList: any = []; + orderNoItemListdes: any = []; + @MutationAction + async PurchaseOrderPda(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.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.ReceiveSRM.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.ReceiveSRM.sapPurchaseOrderSync, data); + const sapPurchasecode = result.code; + return { sapPurchasecode }; + } + deliverycode: any = ''; + @MutationAction + async getDeliveryNoteDetail(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.getDeliveryNoteDetail, data); + const deliverycode = result.code; + return { deliverycode }; + } + SubmitCode: any = ''; + @MutationAction + async PurchaseOrderdeliPda(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.PurchaseOrderdeliPda, data); + const SubmitCode: [] = result; + return { SubmitCode }; + } + + @MutationAction + async PurchaseOrderdetailPda(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.PurchaseOrderdetailPda, data); + const orderNoItemListdes = result.data; + return { orderNoItemListdes }; + } + DictTypeList: any = []; + @MutationAction + async Stashlist() { + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.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.ReceiveSRM.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.ReceiveSRM.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.ReceiveSRM.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.ReceiveSRM.selectArrivalRegistration, data); + const singcode = result.code; + const singobj = result.data; + return { singcode, singobj }; + } +} + +export default getModule(ArrivalRegistration); diff --git a/src/pages/wms/Raw/ReceiveSRM/index.vue b/src/pages/wms/Raw/ReceiveSRM/index.vue index 5113e6c..b4a27ce 100644 --- a/src/pages/wms/Raw/ReceiveSRM/index.vue +++ b/src/pages/wms/Raw/ReceiveSRM/index.vue @@ -7,78 +7,94 @@ 采购收货(SRM) - - - - - 送货单号: - - - - 提单 - - - - - - - - - - - - - 生成收货单号 - - - - - - - - - - {{ item.orderStatus == 0 ? '未收货' : item.orderStatus == 1 ? '正在收货' : '收货完成' }} - - - 送货单号: - {{ item.userDefined5 }} - - - 行项目: - {{ item.userDefined3 }} - - - 物料编码: - {{ item.handlematerialCode }} - - - 物料描述: - {{ item.materialDesc }} - - - 工厂号: - {{ item.siteCode }} - - - 应收/已收: - {{ item.planNumber }}/{{ item.realityNumber }} - - - 收货 - + + + + + + 送货单号: + - + + 提单 + + + + + + + + {{ waCodeList.warehouseName }} + + + + + + + + + + + + + + + 生成收货单号 + + + + + + + + + + {{ item.orderStatus == 0 ? '未收货' : item.orderStatus == 1 ? '正在收货' : '收货完成' }} + + + 送货单号: + {{ item.userDefined5 }} + + + 采购单号: + {{ item.procureCode }} + + + 行项目: + {{ item.userDefined3 }} + + + 物料编码: + {{ item.handlematerialCode }} + + + 物料描述: + {{ item.materialDesc }} + + + 工厂号: + {{ item.siteCode }} + + + 应收/实收: + {{ item.planNumber }}/{{ item.realityNumber }} + + + + + - + - 已收货 + {{ item.userDefined10 == '0' ? '未收货' : '已收货' }} 送货单号: @@ -105,8 +121,12 @@ {{ item.siteCode }} - 应收/已收: - {{ item.planNumber }}/{{ item.realityNumber }} + 托盘: + {{ item.sn }} + + + 实际收货: + 确认收货 + + 返回 + - - - - - 标识码： - - - - 数量： - - - - 收货方式： - - - - - - 物料号： - - - - 托盘号： - - - - - - 收货仓库： - - - - 库区： - - - - -
- 确定 -
-
- 取消 -
- - - - - - - - - 已登记数量： - - - - 未登记数量： - - - - 登记数量： - - - -
- 确定 -
-
- 取消 -
- - - - - @@ -761,7 +672,7 @@ export default class receiveSRM extends BasePage { box-shadow: 0 0 20rpx 0 rgba(128, 128, 128, 0.2); .u-form-item { - padding: 30rpx 0; + padding: 10rpx 0; line-height: 35rpx; .Transfer { @@ -810,6 +721,7 @@ export default class receiveSRM extends BasePage { margin-top: 5px; .buttonshow { flex: 1; + height: 60rpx; } .inputshow { flex: 4; diff --git a/src/pages/wms/Raw/ReceiveSRM/model.ts b/src/pages/wms/Raw/ReceiveSRM/model.ts index 5ff3184..4501428 100644 --- a/src/pages/wms/Raw/ReceiveSRM/model.ts +++ b/src/pages/wms/Raw/ReceiveSRM/model.ts @@ -79,6 +79,20 @@ export class receiveSRM extends VuexModule { })); return { DictTypeList }; } + //最新仓库查询 + workloclist: any = {}; + @MutationAction + async getworkloc(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.listTableCK, data); + const workloclist = result.data; + // let workloclist = oldworkloclist.map((item: any) => ({ + // label: item.warehouseName, + // value: item.warehouseCode, + // ...item, + // })); + //let wacode = oldwacode[0].areaCode; + return { workloclist }; + } //库区查询 wacodelist: any = []; @MutationAction @@ -96,12 +110,15 @@ export class receiveSRM extends VuexModule { return { wacodelist }; } submitcode: any = ''; + submitmsg: any = ''; @MutationAction async OnSubmit(data: any) { - const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.PurchaseOrderdeliPdaConfirm, data); + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.addOrderCard, data); const submitcode = result.code; + const submitmsg = result.msg; return { submitcode, + submitmsg, }; } Arrivalcode: any = ''; @@ -125,6 +142,16 @@ export class receiveSRM extends VuexModule { const singobj = result.data; return { singcode, singobj }; } + ///扫描标志卡 + getidcardcode: any = ''; + byidcardobj: any = {}; + @MutationAction + async getByidcard(data: any) { + const result: any = await http.post(url.lanjuwms.raw.ReceiveSRM.selectOrderCard, data); + const getidcardcode = result.code; + const byidcardobj = result.data; + return { getidcardcode, byidcardobj }; + } } export default getModule(receiveSRM); diff --git a/src/utils/url.ts b/src/utils/url.ts index 68ab122..4017be6 100644 --- a/src/utils/url.ts +++ b/src/utils/url.ts @@ -131,6 +131,9 @@ export const url = { selectArrivalRegistration: qianzhuione + '/wms/WmsToWCSmission/selectArrivalRegistration', getDeliveryNoteDetail: qianzhuione + '/wms/WmsToWCSmission/getDeliveryNoteDetail', WarehouseList: qianzhuione + '/wms/WmsToWCSmission/listTableDataInfo', + listTableCK: qianzhuione + '/wms/WmsToWCSmission/listTableCK', + selectOrderCard: qianzhuione + '/wms/WmsToWCSmission/selectOrderCard', + addOrderCard: qianzhuione + '/wms/WmsToWCSmission/addOrderCard', }, PurchaseWHPO: { // 手持 －－包材采购单采购收货查询 @@ -301,6 +304,9 @@ export const url = { getClassInfoList: qianzhuione + '/quality/defectClass/getClassInfoList', getCheckTaskDetailListCg: qianzhuione + '/quality/handCheck/getCheckTaskDetailListCg', getSJLLdefect: qianzhuione + '/quality/defectClass/getClassInfoListByCheckType', + getOAInfoListMobile: qianzhuione + '/quality/unqualified/getOAInfoListMobile', + togetherTask: qianzhuione + '/quality/qcIncome/togetherTask', + getUnqualifiedListMobile: qianzhuione + '/quality/unqualified/getUnqualifiedListMobile', }, // 历史记录 Records: {