From ce4d9e84d9a4aa552e3001ff2428c40561fd25ac Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Fri, 8 Jul 2022 10:21:58 +0800
Subject: [PATCH] =?UTF-8?q?cosmoim-852=20fix=20=E4=BF=84=E7=BD=97=E6=96=AF?=
 =?UTF-8?q?=E5=A7=94=E5=A4=96=E5=87=BA=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AE=B9=E5=99=A8=E7=A0=81=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/raw/commission/RUS-Out/config.ts       | 5 +++++
 src/pages/raw/commission/RUS-Out/detail.vue      | 1 -
 src/pages/raw/commission/RUS-Out/index.vue       | 7 +++----
 src/pages/raw/commission/RUS-entrant/config.ts   | 5 +++++
 src/pages/raw/commission/RUS-entrant/detail.vue  | 1 -
 src/pages/raw/commission/RUS-entrant/index.vue   | 5 ++---
 src/pages/raw/handover/RUS-picking/BySummary.vue | 1 -
 src/utils/page.ts                                | 8 ++++++++
 8 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/pages/raw/commission/RUS-Out/config.ts b/src/pages/raw/commission/RUS-Out/config.ts
index 00022da..24a85df 100644
--- a/src/pages/raw/commission/RUS-Out/config.ts
+++ b/src/pages/raw/commission/RUS-Out/config.ts
@@ -37,6 +37,11 @@ export const headers = [
     key: 'wlCode',
     width: 200,
   },
+  {
+    label: vm.$t('message.Container'),
+    key: 'user_defined6',
+    width: 400,
+  },
 ];
 
 export const detailHeader = [
diff --git a/src/pages/raw/commission/RUS-Out/detail.vue b/src/pages/raw/commission/RUS-Out/detail.vue
index a0e89c3..5d28ef7 100644
--- a/src/pages/raw/commission/RUS-Out/detail.vue
+++ b/src/pages/raw/commission/RUS-Out/detail.vue
@@ -17,7 +17,6 @@ import { Component } from 'vue-property-decorator';
 import { BasePage } from '@/components/base/page';
 import { headers } from './config';
 import model from './model';
-
 @Component
 export default class RawReceiptDetail extends BasePage {
   model = model;
diff --git a/src/pages/raw/commission/RUS-Out/index.vue b/src/pages/raw/commission/RUS-Out/index.vue
index 5b35d58..64dab68 100644
--- a/src/pages/raw/commission/RUS-Out/index.vue
+++ b/src/pages/raw/commission/RUS-Out/index.vue
@@ -351,14 +351,13 @@ export default class dnReceiptDom extends BasePage {
       this.customToast(this.$t('message._tips6') as any);
       return;
     }
-    let person = JSON.parse(uni.getStorageSync('__GWMS_APP_STATE_DATA__') as any);
     let content = {
-      loginName: person.session.user.loginName,
+      loginName: session.loginName,
       poNo: this.form.documentNo,
-      factoryCode: person.session.user.factoryCode,
+      factoryCode: session.factoryCode,
     };
     await this.model.querydetaildlist(content);
-    this.toPage(this.page.raw.commission.goOut.detail);
+    this.toPage(this.page.raw.commission.RUSgoOut.detail);
   }
 }
 </script>
diff --git a/src/pages/raw/commission/RUS-entrant/config.ts b/src/pages/raw/commission/RUS-entrant/config.ts
index d101737..745c044 100644
--- a/src/pages/raw/commission/RUS-entrant/config.ts
+++ b/src/pages/raw/commission/RUS-entrant/config.ts
@@ -37,6 +37,11 @@ export const headers = [
     key: 'sendSpot',
     width: 200,
   },
+  {
+    label: vm.$t('message.Container'),
+    key: 'sn',
+    width: 400,
+  },
 ];
 export const detailHeader = [
   {
diff --git a/src/pages/raw/commission/RUS-entrant/detail.vue b/src/pages/raw/commission/RUS-entrant/detail.vue
index 0f97457..4292c27 100644
--- a/src/pages/raw/commission/RUS-entrant/detail.vue
+++ b/src/pages/raw/commission/RUS-entrant/detail.vue
@@ -26,7 +26,6 @@ import { Component } from 'vue-property-decorator';
 import { BasePage } from '@/components/base/page';
 import { headers } from './config';
 import model from './model';
-
 @Component
 export default class RawReceiptDetail extends BasePage {
   model = model;
diff --git a/src/pages/raw/commission/RUS-entrant/index.vue b/src/pages/raw/commission/RUS-entrant/index.vue
index 1850c6d..89cbfc2 100644
--- a/src/pages/raw/commission/RUS-entrant/index.vue
+++ b/src/pages/raw/commission/RUS-entrant/index.vue
@@ -507,13 +507,12 @@ export default class dnReceiptDom extends BasePage {
       this.customToast(this.$t('message._tips6') as any);
       return;
     }
-    let person = JSON.parse(uni.getStorageSync('__GWMS_APP_STATE_DATA__') as any);
     let content = {
-      loginName: person.session.user.loginName,
+      loginName: session.loginName,
       dnNo: this.form.documentNo,
     };
     await this.model.queryBill(content);
-    this.toPage(this.page.raw.commission.entrant.detail);
+    this.toPage(this.page.raw.commission.RUSentrant.detail);
   }
 }
 </script>
diff --git a/src/pages/raw/handover/RUS-picking/BySummary.vue b/src/pages/raw/handover/RUS-picking/BySummary.vue
index adc7f6a..0d13909 100644
--- a/src/pages/raw/handover/RUS-picking/BySummary.vue
+++ b/src/pages/raw/handover/RUS-picking/BySummary.vue
@@ -323,7 +323,6 @@ export default class RawReceiptDetail extends BasePage {
         TEM.wlList = null;
         TEM.wlCode = this.wlCode.label;
         TEM.qty = this.qty;
-        ///
         TEM.barcode = this.Barcode;
         this.model.aggregateList[this.someIndex].wlList.push(TEM);
         this.model.aggregateList[this.someIndex].currentAmount += parseFloat(this.qty);
diff --git a/src/utils/page.ts b/src/utils/page.ts
index dc96239..03fbfb3 100644
--- a/src/utils/page.ts
+++ b/src/utils/page.ts
@@ -189,6 +189,14 @@ export const page = {
         index: '/pages/raw/commission/goOut/index',
         detail: '/pages/raw/commission/goOut/detail',
       },
+      RUSentrant: {
+        index: '/pages/raw/commission/RUS-entrant/index',
+        detail: '/pages/raw/commission/RUS-entrant/detail',
+      },
+      RUSgoOut: {
+        index: '/pages/raw/commission/RUS-Out/index',
+        detail: '/pages/raw/commission/RUS-Out/detail',
+      },
     },
     SemiFinished: {
       SemiFinishedSO: {