From cc446d1aa890fa7e5814980d3d4c496872797d28 Mon Sep 17 00:00:00 2001 From: guoshuang Date: Thu, 12 Jan 2023 17:58:30 +0800 Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E6=B3=B0=E5=9B=BD=E6=88=90?= =?UTF-8?q?=E5=93=81dn=E5=87=BA=E5=BA=93=E9=80=80=E6=89=AB=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E4=BF=84=E7=BD=97=E6=96=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/cn.ts | 2 + src/i18n/lang/en.ts | 2 + src/i18n/lang/ru.ts | 2 + src/pages/login/login/index.vue | 4 +- .../product/outbound/stoOutbound/Back.vue | 43 +++++-------------- .../raw/LineSide/rejectsOffline/index.vue | 16 +++++-- .../semifinished-wasteJudgment/index.vue | 12 +++++- src/pages/raw/handover/picking/index.vue | 8 ++++ src/pages/raw/handover/picking/model.ts | 10 +++++ .../raw/ingoods/RUS-dnReceipt/ImportDN.vue | 2 +- 10 files changed, 60 insertions(+), 41 deletions(-) diff --git a/src/i18n/lang/cn.ts b/src/i18n/lang/cn.ts index a021e54..8800476 100644 --- a/src/i18n/lang/cn.ts +++ b/src/i18n/lang/cn.ts @@ -546,5 +546,7 @@ export default { SONO: 'SO单号', Closecount: '是否关闭盘点单', SPDR: '备件DN收货', + Nodefectname: '没有缺陷名称', + Nozonename: '没有区域名称', }, }; diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts index 3083253..727dd19 100644 --- a/src/i18n/lang/en.ts +++ b/src/i18n/lang/en.ts @@ -545,5 +545,7 @@ export default { SONO: 'SO NO', Closecount: 'Close the count sheet?', SPDR: 'Spare Part DN Receive', + Nodefectname: 'No defect name', + Nozonename: 'No zone name', }, }; diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index 09a6929..c47c43f 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -545,5 +545,7 @@ export default { SONO: 'SO NO', Closecount: 'Закрыты ли инвентарные ведомости?', SPDR: 'Запасные части DN Получение', + Nodefectname: 'Имя дефекта отсутствует', + Nozonename: 'Нет названия региона', }, }; diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index aaba5bb..4487e9f 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -171,9 +171,9 @@ export default class LoginPage extends BasePage { console.log('......', server.serverAddress); if (server.serverAddress.includes('https://eurmom.haier.net')) { //修改俄罗斯版本号 - this.Version = '1.1.19'; + this.Version = '1.1.22'; } else { - this.Version = '1.0.46'; + this.Version = '1.0.47'; } console.log('////', this.Version); } diff --git a/src/pages/product/outbound/stoOutbound/Back.vue b/src/pages/product/outbound/stoOutbound/Back.vue index 6edd9bd..9dbbb23 100644 --- a/src/pages/product/outbound/stoOutbound/Back.vue +++ b/src/pages/product/outbound/stoOutbound/Back.vue @@ -15,6 +15,14 @@ {{ $t('message.Query') }} + + + + + + + + @@ -112,38 +120,9 @@ export default class stoOutboundDom extends BasePage { // duration: 2000, // image: '/static/icons/icon-51.png', // }); - if (this.rowItemIndex == null) { - this.form.productCode = this.model.materielList[0].materialCode; - this.form.productDescZh = this.model.materielList[0].materialDesc; - this.form.rowItem = this.model.materielList[0].materialCode; - this.form.row = this.model.materielList[0].rowItem; - this.form.orderAmount = this.model.materielList[0].orderAmount; - this.form.scanAmount = parseFloat(this.model.materielList[0].outAmount); - this.rowItemIndex = this.model.materielList[0].rowItem; - } else { - let rowIndex: any = null; - this.model.materielList.forEach((item: any, index) => { - if (item.rowItem == this.rowItemIndex) { - rowIndex = index; - } - }); - if (rowIndex == null) { - this.form.productCode = this.model.materielList[0].materialCode; - this.form.productDescZh = this.model.materielList[0].materialDesc; - this.form.rowItem = this.model.materielList[0].materialCode; - this.form.row = this.model.materielList[0].rowItem; - this.form.orderAmount = this.model.materielList[0].orderAmount; - this.form.scanAmount = parseFloat(this.model.materielList[0].outAmount); - this.rowItemIndex = this.model.materielList[0].rowItem; - } else { - this.form.productCode = this.model.materielList[rowIndex].materialCode; - this.form.productDescZh = this.model.materielList[rowIndex].materialDesc; - this.form.rowItem = this.model.materielList[rowIndex].materialCode; - this.form.row = this.model.materielList[rowIndex].rowItem; - this.form.orderAmount = this.model.materielList[rowIndex].orderAmount; - this.form.scanAmount = parseFloat(this.model.materielList[rowIndex].outAmount); - } - } + this.model.materielList.forEach((item: any) => { + this.scanAmount += parseFloat(item.outAmount); + }); } } } diff --git a/src/pages/raw/LineSide/rejectsOffline/index.vue b/src/pages/raw/LineSide/rejectsOffline/index.vue index 11f61b5..869ff56 100644 --- a/src/pages/raw/LineSide/rejectsOffline/index.vue +++ b/src/pages/raw/LineSide/rejectsOffline/index.vue @@ -32,11 +32,11 @@ - + - + @@ -44,11 +44,11 @@ - + - + @@ -182,6 +182,14 @@ export default class productCheckReceipt extends BasePage { this.customToast(this.$t('message.Pleasedefects') as string); return; } + if (this.reasonList.dicName == '') { + this.customToast(this.$t('message.Nodefectname') as string); + return; + } + if (this.ProcessList.dicName == '') { + this.customToast(this.$t('message.Nozonename') as string); + return; + } // if (!this.Some.responsibleUser) { // this.customToast(this.$t('message.PleaseOne') as string); // return; diff --git a/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue b/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue index bdbab25..6dc25ee 100644 --- a/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue +++ b/src/pages/raw/LineSide/semifinished-wasteJudgment/index.vue @@ -33,7 +33,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -150,6 +150,14 @@ export default class KanDanHandOver extends BasePage { this.customToast(this.$t('message.Pleasedefects') as string); return; } + if (this.reasonList.dicName == '') { + this.customToast(this.$t('message.Nodefectname') as string); + return; + } + if (this.ProcessList.dicName == '') { + this.customToast(this.$t('message.Nozonename') as string); + return; + } // if (this.responsibleUser == '') { // this.customToast(this.$t('message.PleaseOne') as string); // return; diff --git a/src/pages/raw/handover/picking/index.vue b/src/pages/raw/handover/picking/index.vue index ea725bb..027482b 100644 --- a/src/pages/raw/handover/picking/index.vue +++ b/src/pages/raw/handover/picking/index.vue @@ -172,6 +172,14 @@ export default class pickingDom extends BasePage { } return params; } + // async onLoad() { + // await this.getMRP(); + // } + // async getMRP() { + // let params = {}; + // await this.model.getMRP(params); + // this.form.mrpCodeRegion = model.mrpdata; + // } // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕 onReady() { this.$form.setRules(this.rules); diff --git a/src/pages/raw/handover/picking/model.ts b/src/pages/raw/handover/picking/model.ts index 1a95c58..1f33e9a 100644 --- a/src/pages/raw/handover/picking/model.ts +++ b/src/pages/raw/handover/picking/model.ts @@ -20,6 +20,7 @@ export class PickingModule extends VuexModule { sapFactoryCode: ''; formParams: ''; code = ''; + //mrpdata: any; orderOutIdList: any; NEWparams: any; LocList: any = []; @@ -405,6 +406,15 @@ export class PickingModule extends VuexModule { console.log(this.detailedList); return res; } + //获取MRP + // @MutationAction + // async getMRP(params: any = {}) { + // const res: any = await http.post(url.sortscan.save.order, params); + // const code = res.code; + // const mrpdata = res.data; + // console.log('code', code); + // return { code, mrpdata }; + // } } export default getModule(PickingModule); diff --git a/src/pages/raw/ingoods/RUS-dnReceipt/ImportDN.vue b/src/pages/raw/ingoods/RUS-dnReceipt/ImportDN.vue index 8fcdbd6..cb11728 100644 --- a/src/pages/raw/ingoods/RUS-dnReceipt/ImportDN.vue +++ b/src/pages/raw/ingoods/RUS-dnReceipt/ImportDN.vue @@ -476,7 +476,7 @@ export default class dnReceiptDom extends BasePage { text-align: center; .title { - flex: 3; + flex: 6; } .left,