From a0ea12685636475c4e5f550d8282b93d0068b763 Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Thu, 9 Dec 2021 13:36:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=A7=94=E5=A4=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../outbound/stoOutbound/DN-delivergoods.vue | 15 ++++--- .../product/outbound/stoOutbound/config.ts | 14 +++---- src/pages/raw/commission/entrant/model.ts | 5 ++- src/pages/raw/commission/goOut/model.ts | 5 ++- .../raw/ingoods/dnReturnGoods/Location.vue | 42 ++++++++++++------- 5 files changed, 52 insertions(+), 29 deletions(-) diff --git a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue index 3691c17..871ccd0 100644 --- a/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue +++ b/src/pages/product/outbound/stoOutbound/DN-delivergoods.vue @@ -54,7 +54,7 @@ - + @@ -169,6 +169,7 @@ export default class stoOutboundDom extends BasePage { productCode: "", // 物料类型name productDescZh: "", scanAmount: 0, + rowItem: "", barCode: "", }; materialList: any = []; //物料列表 @@ -227,10 +228,12 @@ export default class stoOutboundDom extends BasePage { // }); this.model.materielList.forEach((item: any) => { if (v[0].label == item.materialCode) { + console.log("item", item); this.form.productCode = item.materialCode; this.form.productDescZh = item.materialDesc; + this.form.rowItem = item.rowItem; this.form.orderAmount = item.orderAmount; - this.form.scanAmount = parseFloat(item.scanAmount); + this.form.scanAmount = parseFloat(item.outAmount); return; } }); @@ -246,7 +249,8 @@ export default class stoOutboundDom extends BasePage { if (this.form.productCode == item.label) { this.form.productDescZh = item.materialDesc; this.form.orderAmount = item.orderAmount; - this.form.scanAmount = item.scanAmount; + this.form.rowItem = item.rowItem; + this.form.scanAmount = parseFloat(item.outAmount); } }); } @@ -349,11 +353,11 @@ export default class stoOutboundDom extends BasePage { keepBy: session.loginName, loginName: session.loginName, order3: this.form.orderNo, - // orderType: 3, orderType: 4, type: 0, productCode: item.productCode, productDescZh: item.productDescZh, + orderItem: this.form.rowItem, originWl: item.locCode, dockCode: item.dockCode, dockName: item.dockName, @@ -375,12 +379,13 @@ export default class stoOutboundDom extends BasePage { }); this.form.barCode = ""; this.form.productCode = ""; + model.orderInInfo.stoAmount = 0; // this.form.orderNo = null; this.form.scanAmount = 0; this.form.orderAmount = ""; this.form.productDescZh = ""; this.selectMaterielList = []; - this.$table.onEmpty(); + (this.form.rowItem = ""), this.$table.onEmpty(); } // } } diff --git a/src/pages/product/outbound/stoOutbound/config.ts b/src/pages/product/outbound/stoOutbound/config.ts index 1d45ca0..9f6bfc3 100644 --- a/src/pages/product/outbound/stoOutbound/config.ts +++ b/src/pages/product/outbound/stoOutbound/config.ts @@ -1,21 +1,21 @@ /** * 看单明细表格列 */ -import vm from '@/main'; +import vm from "@/main"; export const headers = [ { - label: vm.$t('message.product_barCode'), - key: 'barcode', + label: vm.$t("message.product_barCode"), + key: "barcode", width: 300, }, { - label: vm.$t('message.product_FGCode'), - key: 'materialCode', + label: vm.$t("message.product_FGCode"), + key: "productCode", width: 300, }, { - label: vm.$t('message.product_FGDes'), - key: 'materialDesc', + label: vm.$t("message.product_FGDes"), + key: "productDescZh", width: 300, }, ]; diff --git a/src/pages/raw/commission/entrant/model.ts b/src/pages/raw/commission/entrant/model.ts index 3cea728..2fb2736 100644 --- a/src/pages/raw/commission/entrant/model.ts +++ b/src/pages/raw/commission/entrant/model.ts @@ -225,7 +225,10 @@ export class ReturningModule extends VuexModule { //查询明细 @Action({ commit: "updateCheckedOrderInInfoListKw" }) async querydetaildlist(content: any) { - let res: any = await http.post("/material/outsourcing/into/info", content); + let res: any = await http.post( + "/wmspda/material/outsourcing/into/info", + content + ); console.log("明细》》》》》》》》》", res.list); this.detailedList = res.data; return res; diff --git a/src/pages/raw/commission/goOut/model.ts b/src/pages/raw/commission/goOut/model.ts index 5999b64..5a61185 100644 --- a/src/pages/raw/commission/goOut/model.ts +++ b/src/pages/raw/commission/goOut/model.ts @@ -181,7 +181,10 @@ export class ReturningModule extends VuexModule { //查询明细 @Action({ commit: "updateCheckedOrderInInfoListKw" }) async querydetaildlist(content: any) { - let res: any = await http.post("/material/outsourcing/outInfo", content); + let res: any = await http.post( + "/wmspda/material/outsourcing/outInfo", + content + ); console.log("明细》》》》》》》》》", res.list); this.detailedList = res.data; return res; diff --git a/src/pages/raw/ingoods/dnReturnGoods/Location.vue b/src/pages/raw/ingoods/dnReturnGoods/Location.vue index 9f52557..21d0658 100644 --- a/src/pages/raw/ingoods/dnReturnGoods/Location.vue +++ b/src/pages/raw/ingoods/dnReturnGoods/Location.vue @@ -4,7 +4,7 @@ - {{ $t("message.Pi_ByOrderPicking") }} + {{ $t("message.rawMenu_ReturnGoods") }} @@ -23,18 +23,22 @@ - 工位: + {{ $t("message.Pi_Station") }}: {{ some.sendSpot }} - 已拣数量: + {{ $t("message.po_ReturnGoodsQuantity") }}: {{ some.totalMoAmount }} - 库位: + {{ $t("message.CommissionedLocation") }}: - 本次数量 + {{ + $t("message.CommissionedThisNumber") + }} - 添加 + {{ + $t("message.product_add") + }} @@ -81,15 +89,19 @@
- 拣配明细 + {{ + $t("message.detailed") + }} - 提交 + + {{ $t("message.po_Submit") }} + - 返回 + + {{ $t("message.po_Return") }} +
@@ -177,14 +189,14 @@ export default class RawReceiptDetail extends BasePage { if (this.qty == "" || this.wlCode == "") { uni.showToast({ icon: "none", - title: "请输入正确的库位和数量" as any, + title: this.$t("message.Commission_tips2") as any, }); return; } if (parseFloat(this.qty) <= 0) { uni.showToast({ icon: "none", - title: "请输入大于0的数量" as any, + title: this.$t("message.Commission_tips3") as any, }); return; } @@ -215,7 +227,7 @@ export default class RawReceiptDetail extends BasePage { if (this.wlCode.sendSpot != item.Code) { uni.showToast({ icon: "none", - title: "请选择正确的库位" as any, + title: this.$t("message.Commission_tips7") as any, }); return (isTrue = false); } @@ -224,7 +236,7 @@ export default class RawReceiptDetail extends BasePage { if (this.some == {}) { uni.showToast({ icon: "none", - title: "请先选择一个物料" as any, + title: this.$t("message.Commission_tips6") as any, }); return; }