From 66083c5efd0bdd2e80f3c645047984f7c2b6650e Mon Sep 17 00:00:00 2001 From: guoshuang Date: Tue, 18 Oct 2022 17:53:20 +0800 Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20sto=E6=88=90=E5=93=81?= =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4&&?= =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 5 ++++ src/i18n/lang/en.ts | 5 ++++ src/i18n/lang/ru.ts | 5 ++++ src/pages/product/STO-Outbound/index.vue | 17 ++++++----- .../product/warehouse/wholeScrap/index.vue | 14 +++++++++ .../raw/warehouse/RUS-rowScrap/index.vue | 30 +++++++++++++++++-- 6 files changed, 67 insertions(+), 9 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index b4dce4f..d4a1d7c 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -503,5 +503,10 @@ export default { Lineedge_raw_transfer: '线边库原材料移库', CostCenter: '成本中心', recovery: '回收', + personLiable: '责任人', + CausesOfDefects: '不良原因', + PleaseOne: '请输入责任人', + PleaseTwo: '请输入不良原因', + ManualOffline: '半成品手动下线', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 718fe00..a39a1bd 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -503,5 +503,10 @@ export default { Lineedge_raw_transfer: 'Line edge raw material transfer', CostCenter: 'Cost Center', recovery: 'recovery', + personLiable: 'person liable', + CausesOfDefects: 'Causes of defects', + PleaseOne: 'Please enter the responsible person', + PleaseTwo: 'Please enter the cause of the defect', + ManualOffline: 'Manual offline of semi-finished products', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index 0cc8403..a5b4371 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -503,5 +503,10 @@ export default { Lineedge_raw_transfer: 'транзитный склад', CostCenter: 'центр себестоимости', recovery: 'рекуперация', + personLiable: 'ответственное лицо', + CausesOfDefects: 'нежелательная причина', + PleaseOne: 'Введите ответственное лицо', + PleaseTwo: 'Введите причину неисправности', + ManualOffline: 'ручной спуск полуфабриката', }, }; diff --git a/src/pages/product/STO-Outbound/index.vue b/src/pages/product/STO-Outbound/index.vue index 3850774..00c62ae 100644 --- a/src/pages/product/STO-Outbound/index.vue +++ b/src/pages/product/STO-Outbound/index.vue @@ -73,7 +73,7 @@ - + @@ -281,11 +281,14 @@ export default class dnReceiptDom extends BasePage { display: flex; view { - width: 140rpx; + width: 180rpx; line-height: 100rpx; } } } + .u-form-item--left { + width: 130rpx; + } // .material { // width: 100%; @@ -324,7 +327,7 @@ export default class dnReceiptDom extends BasePage { display: flex; .material-right-title { - width: 140rpx; + width: 180rpx; height: 100%; line-height: 100rpx; } @@ -344,12 +347,12 @@ export default class dnReceiptDom extends BasePage { display: flex; .number-left { - width: 45%; + width: 50%; height: 100%; display: flex; .number-left-title { - width: 120rpx; + width: 150rpx; height: 100%; line-height: 100rpx; } @@ -363,12 +366,12 @@ export default class dnReceiptDom extends BasePage { } .number-right { - width: 55%; + width: 50%; height: 100%; display: flex; .number-right-title { - width: 140rpx; + width: 150rpx; height: 100%; //text-align: center; line-height: 100rpx; diff --git a/src/pages/product/warehouse/wholeScrap/index.vue b/src/pages/product/warehouse/wholeScrap/index.vue index 51aaddf..f5a6eca 100644 --- a/src/pages/product/warehouse/wholeScrap/index.vue +++ b/src/pages/product/warehouse/wholeScrap/index.vue @@ -47,6 +47,14 @@ + + + + + + + + @@ -102,6 +110,8 @@ export default class productCheckReceipt extends BasePage { order3: '', barcode: '', }; + dockCode: any = ''; + dockName: any = ''; wl: any = {}; Some: any = {}; //选择成品编码 @@ -223,6 +233,8 @@ export default class productCheckReceipt extends BasePage { aimWl: this.Some.aimWl, type: '0', orderType: '1', + dockCode: this.dockCode, + dockName: this.dockName, keepBy: session.loginName as string, factoryCode: session.factoryCode as string, order3: this.form.order3, @@ -241,6 +253,8 @@ export default class productCheckReceipt extends BasePage { this.Some = {}; this.Some.fileNo = ' '; this.wl = {}; + this.dockCode = ''; + this.dockName = ''; // this.form.order3 = ''; this.form.barcode = ''; this.query(); diff --git a/src/pages/raw/warehouse/RUS-rowScrap/index.vue b/src/pages/raw/warehouse/RUS-rowScrap/index.vue index 78c0bbb..d58f525 100644 --- a/src/pages/raw/warehouse/RUS-rowScrap/index.vue +++ b/src/pages/raw/warehouse/RUS-rowScrap/index.vue @@ -2,7 +2,7 @@ - + {{ $t('message.RowScrap') }} @@ -72,10 +72,18 @@ + + + + + + + + - {{ $t('message.po_Return') }} + {{ $t('message.po_Return') }} {{ $t('message.InventoryFinish') }} @@ -102,6 +110,8 @@ export default class KanDanHandOver extends BasePage { model = model; border = true; wl: any = {}; + dockCode: any = ''; + dockName: any = ''; Some: any = {}; MaterialList: any = []; SubmitOrderlist: any = []; @@ -186,6 +196,16 @@ export default class KanDanHandOver extends BasePage { this.customToast(this.$t('message.scanningContainer') as string); return; } + ///// + // if (!this.dockCode) { + // this.customToast(this.$t('message.PleaseOne') as string); + // return; + // } + // if (!this.dockName) { + // this.customToast(this.$t('message.PleaseTwo') as string); + // return; + // } + ////// if (parseFloat(this.qty) <= 0) { this.customToast(this.$t('message.AppendMateriel2') as string); return; @@ -231,12 +251,16 @@ export default class KanDanHandOver extends BasePage { this.SubmitOrderlist[this.SubmitOrderlist.length - 1].type = '1'; this.SubmitOrderlist[this.SubmitOrderlist.length - 1].keepBy = session.loginName; this.SubmitOrderlist[this.SubmitOrderlist.length - 1].orderType = '1'; + this.SubmitOrderlist[this.SubmitOrderlist.length - 1].dockCode = this.dockCode; + this.SubmitOrderlist[this.SubmitOrderlist.length - 1].dockName = this.dockName; this.SubmitOrderlist[this.SubmitOrderlist.length - 1].qty = this.qty; this.SubmitOrderlist[this.SubmitOrderlist.length - 1].barCode = this.Container.barcode; this.model.orderInInfoList[this.SomeIndex].totalqty += parseFloat(this.qty); this.Container = ''; this.qty = 0; this.Barcode = ''; + this.dockCode = ''; + this.dockName = ''; } deleteItem(e: any) { uni.showModal({ @@ -289,6 +313,8 @@ export default class KanDanHandOver extends BasePage { this.Container = ''; this.SubmitOrderlist = []; this.Barcode = ''; + this.dockCode = ''; + this.dockName = ''; this.query(); } }