From 4267341f6afa1b799bfb90c2fe8f2c6a339a328f Mon Sep 17 00:00:00 2001 From: guoshuang Date: Mon, 7 Nov 2022 17:09:51 +0800 Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E5=8D=B0=E5=B0=BC=E5=9B=9E?= =?UTF-8?q?=E8=BD=A6=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/lang/ru.ts | 4 ++-- src/pages/login/login/index.vue | 2 +- src/pages/raw/handover/aggregating/order.vue | 6 +++--- src/pages/raw/handover/aggregating/summary.vue | 6 +++--- src/pages/raw/handover/feeding/Location.vue | 4 +++- src/pages/raw/handover/virtual/summary.vue | 6 +++--- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/i18n/lang/ru.ts b/src/i18n/lang/ru.ts index 623a319..a485746 100644 --- a/src/i18n/lang/ru.ts +++ b/src/i18n/lang/ru.ts @@ -508,7 +508,7 @@ export default { PleaseOne: 'Введите ответственное лицо', PleaseTwo: 'Введите причину неисправности', rejectsOffline: 'нижняя линия дефекта', - ResponsibleProcess: 'зона ответственности', + ResponsibleProcess: 'Ответственный участок', PleaseThere: 'Введите ответственную операцию', rawWasteJudgment: 'утилизация сырья', reason1: 'причина', @@ -526,7 +526,7 @@ export default { allocation: 'переброска', Relationship: 'производственные вычеты', Insufficient: 'недостаточная емкость источника', - defect: 'дефект', + defect: 'Дефект', Note: 'Примечание', }, }; diff --git a/src/pages/login/login/index.vue b/src/pages/login/login/index.vue index c1da8f4..0bd7ebb 100644 --- a/src/pages/login/login/index.vue +++ b/src/pages/login/login/index.vue @@ -165,7 +165,7 @@ export default class LoginPage extends BasePage { //修改俄罗斯版本号 this.Version = '1.1.3'; } else { - this.Version = '1.0.36'; + this.Version = '1.0.37'; } console.log('////', this.Version); } diff --git a/src/pages/raw/handover/aggregating/order.vue b/src/pages/raw/handover/aggregating/order.vue index 2d733ba..3760da8 100644 --- a/src/pages/raw/handover/aggregating/order.vue +++ b/src/pages/raw/handover/aggregating/order.vue @@ -200,7 +200,7 @@ export default class AggregatingOrder extends BasePage { if (model.orderList.length === 0) { this.customToast(this.$t('message.Pi_tip4') as string); } else { - if (this.submitForm.receiver == session.loginName) { + if (this.submitForm.receiver ? this.submitForm.receiver : this.submitForm.receiverName == session.loginName) { this.customToast(this.$t('message.different') as string); return; } @@ -208,7 +208,7 @@ export default class AggregatingOrder extends BasePage { rfPwd: this.submitForm.password, factoryCode: session.factoryCode as string, // loginName: this.submitForm.receiver, - loginName: this.submitForm.receiver, + loginName: this.submitForm.receiver ? this.submitForm.receiver : this.submitForm.receiverName, }); let submit = false; let selectsta = true; @@ -252,7 +252,7 @@ export default class AggregatingOrder extends BasePage { return; } await this.model.uploadOrderList({ - operatorPass: this.submitForm.receiver, + operatorPass: this.submitForm.receiver ? this.submitForm.receiver : this.submitForm.receiverName, factoryCode: session.factoryCode, loginName: session.loginName, orderOutIdAmountList: List.map((item: any) => ({ diff --git a/src/pages/raw/handover/aggregating/summary.vue b/src/pages/raw/handover/aggregating/summary.vue index a19625a..0be92d2 100644 --- a/src/pages/raw/handover/aggregating/summary.vue +++ b/src/pages/raw/handover/aggregating/summary.vue @@ -235,14 +235,14 @@ export default class AggregatingSummary extends BasePage { if (this.model.aggregateList.length === 0) { this.customToast(this.$t('message.Pi_tip4') as string); } else { - if (this.submitForm.receiver == session.loginName) { + if (this.submitForm.receiver ? this.submitForm.receiver : this.submitForm.receiverName == session.loginName) { this.customToast(this.$t('message.different') as string); return; } await auth.checkPassword({ rfPwd: this.submitForm.password, factoryCode: session.factoryCode as string, - loginName: this.submitForm.receiver, + loginName: this.submitForm.receiver ? this.submitForm.receiver : this.submitForm.receiverName, }); let submit = false; let selectsta = true; @@ -288,7 +288,7 @@ export default class AggregatingSummary extends BasePage { return; } await this.model.uploadAggregateList({ - operatorPass: this.submitForm.receiver, + operatorPass: this.submitForm.receiver ? this.submitForm.receiver : this.submitForm.receiverName, factoryCode: session.factoryCode as string, loginName: session.loginName as string, dataList: List.map((item: any) => ({ diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue index fc0b719..0030c80 100644 --- a/src/pages/raw/handover/feeding/Location.vue +++ b/src/pages/raw/handover/feeding/Location.vue @@ -444,7 +444,9 @@ export default class RawReceiptDetail extends BasePage { let dataList = this.model.blDetailList; const params = { dataList, - ...this.form2, + //...this.form2, + rfPwd: this.form2.rfPwd, + operatorPass: this.form2.operatorPass ? this.form2.operatorPass : this.operatorName, factoryCode: this.session.factoryCode, loginName: this.session.loginName, }; diff --git a/src/pages/raw/handover/virtual/summary.vue b/src/pages/raw/handover/virtual/summary.vue index a9f5abc..396576c 100644 --- a/src/pages/raw/handover/virtual/summary.vue +++ b/src/pages/raw/handover/virtual/summary.vue @@ -225,14 +225,14 @@ export default class VirtualSummary extends BasePage { this.customToast(this.$t('message.Summary_PleaseInputNumber') as string); return; } - if (this.submitForm.receiver == session.loginName) { + if (this.submitForm.receiver ? this.submitForm.receiver : this.submitForm.receiverName == session.loginName) { this.customToast(this.$t('message.different') as string); return; } let res = await auth.checkPassword({ rfPwd: this.submitForm.password, factoryCode: session.factoryCode as string, - loginName: this.submitForm.receiver, + loginName: this.submitForm.receiver ? this.submitForm.receiver : this.submitForm.receiverName, }); if (res.code != 1) { return; @@ -246,7 +246,7 @@ export default class VirtualSummary extends BasePage { }); console.log('数据。。。', list); await model.uploadSummaryList({ - operatorPass: this.submitForm.receiver, + operatorPass: this.submitForm.receiver ? this.submitForm.receiver : this.submitForm.receiverName, factoryCode: session.factoryCode as string, loginName: session.loginName as string, sapFactoryCode: model.sapFactoryCode,