From 1c66c2140e9cf8a71c398ac838194a31393bebed Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Tue, 4 Jan 2022 19:07:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E4=BA=A4=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 2 +- .../warehouse/LocationInventory/index.vue | 0 .../warehouse/LocationInventory/model.ts | 0 .../warehouse/MaterialInventory/index.vue | 0 .../warehouse/MaterialInventory/model.ts | 0 .../warehouse/wholeLnventory/index.vue | 17 ++++- .../product/warehouse/wholeLnventory/model.ts | 4 +- .../product/warehouse/wholeScrap/index.vue | 74 +++---------------- src/pages/raw/handover/aggregating/model.ts | 5 +- src/pages/raw/handover/aggregating/order.vue | 2 + .../raw/handover/aggregating/summary.vue | 2 + src/pages/raw/handover/picking/ByOrder.vue | 8 +- src/pages/raw/handover/picking/BySummary.vue | 4 + src/pages/raw/handover/picking/result.vue | 4 +- 14 files changed, 50 insertions(+), 72 deletions(-) create mode 100644 src/pages/product/warehouse/LocationInventory/index.vue create mode 100644 src/pages/product/warehouse/LocationInventory/model.ts create mode 100644 src/pages/product/warehouse/MaterialInventory/index.vue create mode 100644 src/pages/product/warehouse/MaterialInventory/model.ts diff --git a/src/manifest.json b/src/manifest.json index 1cac0c3..7e28642 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,6 +1,6 @@ { "name" : "HaierGWMS", - "appid" : "__UNI__96A47CA", + "appid" : "__UNI__306D001", "description" : "", "versionName" : "0.0.1", "versionCode" : 1, diff --git a/src/pages/product/warehouse/LocationInventory/index.vue b/src/pages/product/warehouse/LocationInventory/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/product/warehouse/LocationInventory/model.ts b/src/pages/product/warehouse/LocationInventory/model.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/product/warehouse/MaterialInventory/index.vue b/src/pages/product/warehouse/MaterialInventory/index.vue new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/product/warehouse/MaterialInventory/model.ts b/src/pages/product/warehouse/MaterialInventory/model.ts new file mode 100644 index 0000000..e69de29 diff --git a/src/pages/product/warehouse/wholeLnventory/index.vue b/src/pages/product/warehouse/wholeLnventory/index.vue index e886bb8..f762e8a 100644 --- a/src/pages/product/warehouse/wholeLnventory/index.vue +++ b/src/pages/product/warehouse/wholeLnventory/index.vue @@ -10,7 +10,7 @@ - + @@ -119,6 +119,21 @@ export default class productCheckReceipt extends BasePage { async onReady() { this.$form.setRules(this.rules); } + async query() { + if (this.form.pddNo == '') { + uni.showToast({ + icon: 'none', + title: this.$t('message.Commission_tips1') as string, + }); + } + await this.model.getProductCode(this.form.pddNo); + if (model.code == '1') { + uni.showToast({ + icon: 'none', + title: this.$t('message.product_Tip8') as string, + }); + } + } onchange(e: any) { // 获取选择库位的集合 const storeList = this.model.WlListaa.filter((item) => item.locCode === e[0].value); diff --git a/src/pages/product/warehouse/wholeLnventory/model.ts b/src/pages/product/warehouse/wholeLnventory/model.ts index 5e60d13..9fc893f 100644 --- a/src/pages/product/warehouse/wholeLnventory/model.ts +++ b/src/pages/product/warehouse/wholeLnventory/model.ts @@ -27,6 +27,7 @@ export class wholeLnventory extends VuexModule { WlListaa = []; productCode: any = ''; productDescZh: any = ''; + code: any = ''; /** * 物料型号类型 */ @@ -63,6 +64,7 @@ export class wholeLnventory extends VuexModule { }); const WlListaa = res.data; let arr: any = []; + const code = res.code; // 去重 arr = removeDuplicates([...res.data], 'locCode'); const WlList = arr.map((item: any) => ({ @@ -71,7 +73,7 @@ export class wholeLnventory extends VuexModule { })); // WlList select结构，只有lbael,value // WlListaa 原始结构 - return { WlList, WlListaa }; + return { WlList, WlListaa, code }; } @MutationAction diff --git a/src/pages/product/warehouse/wholeScrap/index.vue b/src/pages/product/warehouse/wholeScrap/index.vue index 217e212..be20c34 100644 --- a/src/pages/product/warehouse/wholeScrap/index.vue +++ b/src/pages/product/warehouse/wholeScrap/index.vue @@ -8,76 +8,26 @@ - - + + - + - + - + - - + - - - - - - - + + @@ -86,9 +36,7 @@ {{ $t('message.workArea_Confirm') }} - {{ - $t('message.po_Return') - }} + {{ $t('message.po_Return') }} diff --git a/src/pages/raw/handover/aggregating/model.ts b/src/pages/raw/handover/aggregating/model.ts index 4539b2d..6e6148a 100644 --- a/src/pages/raw/handover/aggregating/model.ts +++ b/src/pages/raw/handover/aggregating/model.ts @@ -22,7 +22,7 @@ export class AggregatingModule extends VuexModule { * 查询结果列表 */ proOrderResultList = []; - isFormChange: any = ''; + isFormChange: any; /** * 查询结果汇总列表 @@ -157,7 +157,7 @@ export class AggregatingModule extends VuexModule { get isOrderCheckedAll() { return !this.orderList.filter((_: any) => !_.checked).length; } - /** + /** * 全选/取消全选查询列表 * @param checked */ @@ -220,6 +220,7 @@ export class AggregatingModule extends VuexModule { icon: 'none', title: 'No Data Found！', }); + return { aggregateList }; } return { aggregateList }; } diff --git a/src/pages/raw/handover/aggregating/order.vue b/src/pages/raw/handover/aggregating/order.vue index 06be575..405b2f5 100644 --- a/src/pages/raw/handover/aggregating/order.vue +++ b/src/pages/raw/handover/aggregating/order.vue @@ -295,6 +295,8 @@ export default class AggregatingOrder extends BasePage { queryParams: this.model.orderOutIdListParams, proOrderResultList: this.model.proOrderResultList, }); + this.$amountForm.setRules(this.amountFormRules); + this.$submitForm.setRules(this.submitFormRules); } /** * 解锁 diff --git a/src/pages/raw/handover/aggregating/summary.vue b/src/pages/raw/handover/aggregating/summary.vue index f1e198d..8ae4c5d 100644 --- a/src/pages/raw/handover/aggregating/summary.vue +++ b/src/pages/raw/handover/aggregating/summary.vue @@ -300,6 +300,8 @@ export default class AggregatingSummary extends BasePage { await this.model.queryProOrder(this.model.isFormChange); await this.model.queryProOrderResult(this.model.param); await this.model.queryAggregateList(this.model.orderOutIdListParams); + this.$amountForm.setRules(this.amountFormRules); + this.$submitForm.setRules(this.submitFormRules); } /** * 解锁 diff --git a/src/pages/raw/handover/picking/ByOrder.vue b/src/pages/raw/handover/picking/ByOrder.vue index 48c4d13..6eaccf3 100644 --- a/src/pages/raw/handover/picking/ByOrder.vue +++ b/src/pages/raw/handover/picking/ByOrder.vue @@ -25,7 +25,7 @@ {{ $t('message.CommissionedLocation') }}: - + {{ $t('message.CommissionedThisNumber') }}: @@ -251,7 +251,8 @@ export default class RawReceiptDetail extends BasePage { this.model.proOrderResultList[this.someIndex].currentAmount = num; } async onReady() { - this.GetLocation(); + await this.onAggregate(); + await this.GetLocation(); } async bill() { if (this.some == {} || this.some.prdOrder == null) { @@ -302,6 +303,9 @@ export default class RawReceiptDetail extends BasePage { await this.model.queryProOrder(this.model.formParams); await this.model.queryProOrderResult(this.model.NEWparams); await this.model.lockProOrderResult(this.model.proOrderResultList); + this.some = {}; + this.LocationList = []; + this.wlCode = ''; } async GetLocation() { this.Location = []; diff --git a/src/pages/raw/handover/picking/BySummary.vue b/src/pages/raw/handover/picking/BySummary.vue index 6cd404a..3ae69e6 100644 --- a/src/pages/raw/handover/picking/BySummary.vue +++ b/src/pages/raw/handover/picking/BySummary.vue @@ -243,6 +243,7 @@ export default class RawReceiptDetail extends BasePage { this.model.aggregateList[this.someIndex].currentAmount = num; } async onReady() { + await this.onAggregate(); await this.GetLocation(); } async bill() { @@ -292,6 +293,9 @@ export default class RawReceiptDetail extends BasePage { orderOutIdList, }; await this.model.queryAggregateList(params); + this.some = {}; + this.LocationList = []; + this.wlCode = ''; } async GetLocation() { this.Location = []; diff --git a/src/pages/raw/handover/picking/result.vue b/src/pages/raw/handover/picking/result.vue index bb28b15..2d6011d 100644 --- a/src/pages/raw/handover/picking/result.vue +++ b/src/pages/raw/handover/picking/result.vue @@ -51,8 +51,8 @@ export default class RawReceiptDetail extends BasePage { } //按单 async onOrder() { - const list = this.model.proOrderResultList; - await this.model.lockProOrderResult(list); + // const list = this.model.proOrderResultList; + // await this.model.lockProOrderResult(list); this.toPage(this.page.raw.handover.picking.byorder); } //汇总