cosmoim-852 fix 印尼回车校验问题处理

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: 'Примечание',
   },
 };

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);
   }

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) => ({

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) => ({

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,
     };

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,