From 60b971fd5677983cfde4274abd4c9fa38a31ec2c Mon Sep 17 00:00:00 2001 From: guoshuang Date: Wed, 22 Dec 2021 18:13:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E6=8B=A3=E9=85=8D=20?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=89=A9=E6=96=99=E4=B8=8D=E8=83=BD=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=9B=B8=E5=90=8Cwms=E5=BA=93=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 1 + src/i18n/lang/en.ts | 1 + .../warehouse/wholeLnventory/index.vue | 2 +- src/pages/raw/handover/picking/ByOrder.vue | 2 +- src/pages/raw/handover/returning/config.ts | 6 ++--- src/pages/raw/handover/virtual/index.vue | 5 ++++ src/pages/raw/ingoods/dnReceipt/ImportDN.vue | 17 +++++++++---- .../raw/ingoods/dnReceipt/dnReceiving.vue | 24 +++++++++++++++---- 8 files changed, 44 insertions(+), 14 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index 0bb3a47..533044e 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -192,6 +192,7 @@ export default { return_Tip4: '退料数量不能大于总数', quantitys: '不能大于应退货数量', actual: '实际退货数量不等于应退货数量', + receiveAStation: '接收工位', //库内主菜单 Warehouse: '成品库内', diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 9c49e84..cbfa792 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -194,6 +194,7 @@ export default { quantitys: "Cannot be greater than the quantity to be returned", actual: "The actual returned quantity is not equal to the quantity to be returned", + receiveAStation: 'Receiving station', //库内主菜单 Warehouse: "FG WH", diff --git a/src/pages/product/warehouse/wholeLnventory/index.vue b/src/pages/product/warehouse/wholeLnventory/index.vue index e28294c..e886bb8 100644 --- a/src/pages/product/warehouse/wholeLnventory/index.vue +++ b/src/pages/product/warehouse/wholeLnventory/index.vue @@ -217,7 +217,7 @@ export default class productCheckReceipt extends BasePage { snFlag: this.form.originWl.snFlag, pdMode: this.form.originWl.pdMode, sn: this.form.code, - spQty: this.aaa, + spQty: this.form.spQty, }; await this.model.onTakeoutConfirm(list); } diff --git a/src/pages/raw/handover/picking/ByOrder.vue b/src/pages/raw/handover/picking/ByOrder.vue index 8b3b143..c675aec 100644 --- a/src/pages/raw/handover/picking/ByOrder.vue +++ b/src/pages/raw/handover/picking/ByOrder.vue @@ -222,7 +222,7 @@ export default class RawReceiptDetail extends BasePage { let isTrue: boolean = true; if (this.LocationList.length != 0) { this.LocationList.forEach((item: any) => { - if (this.wlCode.sendSpot != item.Code) { + if (this.wlCode.sendSpot != item.Code || this.wlCode.label === item.wlCode) { uni.showToast({ icon: "none", title: this.$t("message.Commission_tips7") as any, diff --git a/src/pages/raw/handover/returning/config.ts b/src/pages/raw/handover/returning/config.ts index e6b4240..9c44949 100644 --- a/src/pages/raw/handover/returning/config.ts +++ b/src/pages/raw/handover/returning/config.ts @@ -6,15 +6,15 @@ export const headers = [ { label: vm.$t('message.InventoryOrderNo'), key: 'label', - width: 216, + width: 330, }, { label: vm.$t('message.InventoryMaterielNo'), key: 'value', - width: 216, + width: 330, }, { - label: "接收人", + label: vm.$t('message.receiveAStation'), key: 'sendSpot', width: 216, }, diff --git a/src/pages/raw/handover/virtual/index.vue b/src/pages/raw/handover/virtual/index.vue index 6a8e480..f8a190a 100644 --- a/src/pages/raw/handover/virtual/index.vue +++ b/src/pages/raw/handover/virtual/index.vue @@ -9,6 +9,7 @@ + @@ -32,6 +33,7 @@ /> --> + + @@ -115,6 +118,7 @@ /> --> + + {{ $t('message.Materiel') }} - + + {{ $t('message.CommissionedMaterielDesc') }} {{ every.materialDesc }} + @@ -154,6 +157,7 @@ export default class dnReceiptDom extends BasePage { }; let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content); res.forEach((item: any) => { + console.log('res is:', res); let pickerName: any = {}; pickerName.label = item.locationCode; pickerName.value = item.locationCode + '(' + item.sendSpot + ')'; @@ -414,7 +418,7 @@ export default class dnReceiptDom extends BasePage { height: 100rpx; display: flex; .material-left { - width: 50%; + width: 100%; height: 100%; display: flex; view { @@ -422,8 +426,13 @@ export default class dnReceiptDom extends BasePage { line-height: 100rpx; } } + } + .material { + width: 100%; + height: 100rpx; + display: flex; .material-right { - width: 50%; + width: 100%; height: 100%; display: flex; .material-right-title { @@ -432,7 +441,7 @@ export default class dnReceiptDom extends BasePage { line-height: 100rpx; } .material-right-code { - width: 190rpx; + width: 80%; height: 100%; // line-height: 100rpx; } diff --git a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue index b4975ac..a8eccd3 100644 --- a/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue +++ b/src/pages/raw/ingoods/dnReceipt/dnReceiving.vue @@ -32,11 +32,14 @@ {{ $t('message.Materiel') }} - + + {{ $t('message.CommissionedMaterielDesc') }} {{ every.materialDesc }} + @@ -136,7 +139,7 @@ export default class dnReceiptDom extends BasePage { requestAmount: number = null; async onReady() { - // this.initLocation(); + this.initLocation(); } // 页面初始化 // 页面需要清空仓库，因此需要复用该方法 @@ -152,6 +155,7 @@ export default class dnReceiptDom extends BasePage { }; let res: any = await this.model.queryByFactoryCodeAndWorkAreaCode(content); res.forEach((item: any) => { + console.log('res is:', res); let pickerName: any = {}; pickerName.label = item.locationCode; pickerName.value = item.locationCode + '(' + item.sendSpot + ')'; @@ -271,6 +275,11 @@ export default class dnReceiptDom extends BasePage { deleteItem(index: any) { this.LocationList.splice(index, 1); this.business(); + // guoshuang 删除成功提示 + uni.showToast({ + icon: 'none', + title: this.$t('message.success') as any, + }); } // 重置页面数据 resetForm() { @@ -408,7 +417,7 @@ export default class dnReceiptDom extends BasePage { height: 100rpx; display: flex; .material-left { - width: 50%; + width: 100%; height: 100%; display: flex; view { @@ -416,8 +425,13 @@ export default class dnReceiptDom extends BasePage { line-height: 100rpx; } } + } + .material { + width: 100%; + height: 100rpx; + display: flex; .material-right { - width: 50%; + width: 100%; height: 100%; display: flex; .material-right-title { @@ -426,7 +440,7 @@ export default class dnReceiptDom extends BasePage { line-height: 100rpx; } .material-right-code { - width: 190rpx; + width: 80%; height: 100%; // line-height: 100rpx; }