From 36ae52556aeee340b0df5d5b4f12e6abdbb3c52a Mon Sep 17 00:00:00 2001
From: guoshuang <guoshuang@qq.com>
Date: Wed, 26 Oct 2022 16:18:35 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E6=8E=A5=E6=94=B6=E4=BA=BA?=
 =?UTF-8?q?=E5=9B=9E=E8=BD=A6=E6=A0=A1=E9=AA=8C=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/handover/aggregating/order.vue   | 4 ++--
 src/pages/raw/handover/aggregating/summary.vue | 4 ++--
 src/pages/raw/handover/feeding/Location.vue    | 3 ++-
 src/pages/raw/handover/feeding/model.ts        | 4 ++--
 src/pages/raw/handover/virtual/summary.vue     | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/pages/raw/handover/aggregating/order.vue b/src/pages/raw/handover/aggregating/order.vue
index 9875656..2d733ba 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.receiverName == session.loginName) {
+          if (this.submitForm.receiver == 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.receiverName,
+            loginName: this.submitForm.receiver,
           });
           let submit = false;
           let selectsta = true;
diff --git a/src/pages/raw/handover/aggregating/summary.vue b/src/pages/raw/handover/aggregating/summary.vue
index d1fb9e2..a19625a 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.receiverName == session.loginName) {
+          if (this.submitForm.receiver == 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.receiverName,
+            loginName: this.submitForm.receiver,
           });
           let submit = false;
           let selectsta = true;
diff --git a/src/pages/raw/handover/feeding/Location.vue b/src/pages/raw/handover/feeding/Location.vue
index 6255979..fc0b719 100644
--- a/src/pages/raw/handover/feeding/Location.vue
+++ b/src/pages/raw/handover/feeding/Location.vue
@@ -104,7 +104,7 @@
             </u-button>
           </u-col>
           <u-col :span="4">
-            <u-button type="error" @click="uni.navigateBack()">
+            <u-button type="error" @click="uni.navigateBack({})">
               {{ $t('message.po_Return') }}
             </u-button>
           </u-col>
@@ -448,6 +448,7 @@ export default class RawReceiptDetail extends BasePage {
       factoryCode: this.session.factoryCode,
       loginName: this.session.loginName,
     };
+    console.log(params);
     await this.model.saveBlDetailUpload(params).then(() => {
       this.qty = '';
       this.LocationList = [];
diff --git a/src/pages/raw/handover/feeding/model.ts b/src/pages/raw/handover/feeding/model.ts
index a310da2..c26f163 100644
--- a/src/pages/raw/handover/feeding/model.ts
+++ b/src/pages/raw/handover/feeding/model.ts
@@ -108,7 +108,7 @@ export class FeedingModule extends VuexModule {
   async saveBlDetailUpload(params: any) {
     await auth.checkPassword({
       factoryCode: session.factoryCode as string,
-      loginName: session.loginName as string,
+      loginName: params.operatorPass as string,
       rfPwd: params.rfPwd,
     });
     await http.post(url.bl.u, {
@@ -226,7 +226,7 @@ export class FeedingModule extends VuexModule {
   async saveBlDetailSubmit(params: any) {
     await auth.checkPassword({
       factoryCode: session.factoryCode as string,
-      loginName: session.loginName as string,
+      loginName: params.operatorPass as string,
       rfPwd: params.rfPwd,
     });
     await http.post(url.bl.uRussia, {
diff --git a/src/pages/raw/handover/virtual/summary.vue b/src/pages/raw/handover/virtual/summary.vue
index 12a3ad2..a9f5abc 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.receiverName == session.loginName) {
+        if (this.submitForm.receiver == 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.receiverName,
+          loginName: this.submitForm.receiver,
         });
         if (res.code != 1) {
           return;