From ed4030cfbc9542743a68995bbb97f5ea52d79f01 Mon Sep 17 00:00:00 2001 From: hou <1601990943@qq.com> Date: Wed, 27 Jul 2022 16:59:26 +0800 Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E4=BF=84=E7=BD=97=E6=96=AF?= =?UTF-8?q?=E5=B7=A5=E5=8E=82=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 8 ++ src/pages/login/area/config.ts | 4 +- src/pages/raw/commission/RUS-Out/config.ts | 5 ++ src/pages/raw/commission/RUS-Out/index.vue | 39 +++++---- .../raw/commission/RUS-entrant/config.ts | 5 ++ .../raw/commission/RUS-entrant/index.vue | 41 +++++++--- .../raw/handover/RUS-returning/index.vue | 26 +++--- .../handover/feeding/RUS-Local-details.vue | 79 +++++++++++++++++++ .../raw/handover/feeding/RUS-Location.vue | 27 ++++--- .../RUS-dnReturnGoods/Local-details.vue | 9 ++- .../ingoods/RUS-dnReturnGoods/Location.vue | 21 ++--- .../raw/ingoods/dnReceipt/ImportPOReceive.vue | 5 +- .../raw/warehouse/RUS-rowCollect/index.vue | 6 +- .../raw/warehouse/RUS-rowScrap/index.vue | 8 +- .../raw/warehouse/RUS-rowTransfer/index.vue | 20 +++-- src/utils/page.ts | 1 + 16 files changed, 225 insertions(+), 79 deletions(-) create mode 100644 src/pages/raw/handover/feeding/RUS-Local-details.vue diff --git a/src/pages.json b/src/pages.json index ad1c54c..d3be8c2 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1058,6 +1058,14 @@ "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 } }, + { + "path": "pages/raw/handover/feeding/RUS-Local-details", + "style": { + "navigationBarTitleText": "俄罗斯明细", + "navigationStyle": "custom", // 隐藏系统导航栏 + "navigationBarTextStyle": "white" // 状态栏字体为白色，只能为 white-白色，black-黑色 二选一 + } + }, { "path": "pages/raw/handover/RUS-picking/index", "style": { diff --git a/src/pages/login/area/config.ts b/src/pages/login/area/config.ts index c2090db..f05304f 100644 --- a/src/pages/login/area/config.ts +++ b/src/pages/login/area/config.ts @@ -16,12 +16,12 @@ export const headers = [ { label: vm.$t('message.workArea_RegionName'), key: 'regionDesc', - width: 200, + width: 300, }, { label: vm.$t('message.workArea_WorkAreaName'), key: 'workareaName', - width: 200, + width: 350, }, { label: vm.$t('message.workArea_WarehouseClassify'), diff --git a/src/pages/raw/commission/RUS-Out/config.ts b/src/pages/raw/commission/RUS-Out/config.ts index 24a85df..d29f0cb 100644 --- a/src/pages/raw/commission/RUS-Out/config.ts +++ b/src/pages/raw/commission/RUS-Out/config.ts @@ -60,4 +60,9 @@ export const detailHeader = [ key: 'nowAmount', width: 186, }, + { + label: vm.$t('message.Container'), + key: 'barCode', + width: 400, + }, ]; diff --git a/src/pages/raw/commission/RUS-Out/index.vue b/src/pages/raw/commission/RUS-Out/index.vue index 93f727b..bf4d7b4 100644 --- a/src/pages/raw/commission/RUS-Out/index.vue +++ b/src/pages/raw/commission/RUS-Out/index.vue @@ -43,6 +43,16 @@ + + + + {{ $t('message.Container') }}: + + + + {{ $t('message.product_add') }} + + @@ -54,16 +64,6 @@ - - - - {{ $t('message.Container') }}: - - - - {{ $t('message.product_add') }} - - + + + + {{ $t('message.Container') }}: + + + + {{ $t('message.product_add') }} + + @@ -62,16 +72,6 @@ - - - - {{ $t('message.Container') }}: - - - - {{ $t('message.product_add') }} - - + + + {{ $t('message.Container') }}: + + + + {{ $t('message.product_add') }} + + @@ -66,16 +76,6 @@ - - - - {{ $t('message.Container') }}: - - - - {{ $t('message.product_add') }} - - + + + {{ $t('message.Container') }}: + + + + {{ $t('message.product_add') }} + + @@ -79,16 +89,6 @@ - - - - {{ $t('message.Container') }}: - - - - {{ $t('message.product_add') }} - - - + @@ -126,6 +126,7 @@ export default class KanDanHandOver extends BasePage { } }); } + total = 0; async searchBarcode() { if (this.Barcode == '') { this.customToast(this.$t('message.barcode') as string); @@ -138,6 +139,11 @@ export default class KanDanHandOver extends BasePage { }; await this.model.searchBarcode(params); this.Container = this.model.ContainerCode; + if (this.Container.cpRef4 == null) { + this.total = this.Container.qty; + } else { + this.total = this.Container.qty - this.Container.cpRef4; + } } Add() { if (this.Container == '' || !this.Container.barcode) { @@ -157,11 +163,12 @@ export default class KanDanHandOver extends BasePage { this.SubmitOrderlist[this.SubmitOrderlist.length - 1].keepBy = session.loginName; this.SubmitOrderlist[this.SubmitOrderlist.length - 1].orderType = '0'; this.SubmitOrderlist[this.SubmitOrderlist.length - 1].barCode = this.Container.barcode; - if (this.Container.cpRef4 == null) { - this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = parseFloat(this.Container.qty); - } else { - this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4); - } + this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = this.total; + // if (this.Container.cpRef4 == null) { + // this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = parseFloat(this.Container.qty); + // } else { + // this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = parseFloat(this.Container.qty) - parseFloat(this.Container.cpRef4); + // } this.model.materielList[this.orderlistIndex].actualQty += parseFloat(this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty); this.Barcode = ''; this.Container = ''; @@ -203,6 +210,7 @@ export default class KanDanHandOver extends BasePage { this.SubmitOrderlist = []; this.Barcode = ''; this.Container = ''; + this.total = 0; this.query(); } } diff --git a/src/utils/page.ts b/src/utils/page.ts index ccd27ed..16037a7 100644 --- a/src/utils/page.ts +++ b/src/utils/page.ts @@ -101,6 +101,7 @@ export const page = { detail: '/pages/raw/handover/feeding/detail', Location: '/pages/raw/handover/feeding/Location', Local: '/pages/raw/handover/feeding/Local-details', + RUSLocal: '/pages/raw/handover/feeding/RUS-Local-details', }, returning: { index: '/pages/raw/handover/returning/index',