From 293370a96f8e2461a3ff21495549a16a62207e23 Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Wed, 16 Feb 2022 13:12:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E4=BD=8D=E9=97=AE=E9=A2=98=20=20?=
 =?UTF-8?q?=E6=8B=89=E5=8F=96=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/warehouse/wholeTransfer/index.vue | 38 ++++++++++---------
 .../product/warehouse/wholeTransfer/model.ts  |  4 +-
 src/pages/raw/commission/goOut/index.vue      | 13 +++++--
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/pages/product/warehouse/wholeTransfer/index.vue b/src/pages/product/warehouse/wholeTransfer/index.vue
index c7dbae3..29ecf70 100644
--- a/src/pages/product/warehouse/wholeTransfer/index.vue
+++ b/src/pages/product/warehouse/wholeTransfer/index.vue
@@ -87,13 +87,13 @@ export default class productCheckReceipt extends BasePage {
   @Ref('form') readonly $form!: VForm;
   model = model;
   form = {
-    aimWl:{} as OptionType,
+    aimWl: {} as OptionType,
     productCode: '',
   };
-  remove:any = {}
-  allNum:number = 0
+  remove: any = {};
+  allNum: number = 0;
   userDefined4: any = '';
-  histroyItem:any = {}
+  histroyItem: any = {};
   aimWlSelect = false;
   cboPlaceSelect = false;
   rules: VFormRules<any> = {
@@ -107,13 +107,13 @@ export default class productCheckReceipt extends BasePage {
   bookTypeChange(e: any) {
     this.form.aimWl = e.pickerName;
   }
-  selectItem(e:any){
+  selectItem(e: any) {
     this.remove = e.pickerName;
-    this.model.removeList.forEach((item:any) =>{
-      if(item.materialCode = this.remove.value){
-        this.histroyItem = item
+    this.model.removeList.forEach((item: any) => {
+      if ((item.materialCode = this.remove.value)) {
+        this.histroyItem = item;
       }
-    })
+    });
   }
   //扫描条码回车
   async query() {
@@ -130,20 +130,22 @@ export default class productCheckReceipt extends BasePage {
     }
   }
   //查询已扫物料
-  async QueryHistory(){
+  async QueryHistory() {
     if (this.userDefined4 == ' ' || this.userDefined4.length == 0) {
       this.customToast(this.$t('message.barcode') as string);
       return;
     }
+    this.allNum = 0;
     let params = {
       loginName: session.loginName,
       factoryCode: session.factoryCode,
       proMoveCode: this.userDefined4,
-    }
-    await this.model.QueryHistory(params)
-    this,model.removeList.forEach((item:any) =>{
-      this.allNum += parseFloat(item.proNum)
-    })
+    };
+    await this.model.QueryHistory(params);
+    this,
+      model.removeList.forEach((item: any) => {
+        this.allNum += parseFloat(item.proNum);
+      });
   }
   //页面初始化
   async onReady() {
@@ -206,9 +208,9 @@ export default class productCheckReceipt extends BasePage {
         // this.form.productCode = '';
         this.model.empty();
         // this.query()
-        this.form.productCode = ''
-        this.allNum = 0
-        this.QueryHistory()
+        this.form.productCode = '';
+        this.allNum = 0;
+        this.QueryHistory();
         // setTimeout(() => {
         //   this.$forceUpdate();
         // }, 2000);
diff --git a/src/pages/product/warehouse/wholeTransfer/model.ts b/src/pages/product/warehouse/wholeTransfer/model.ts
index 43de861..a21e92f 100644
--- a/src/pages/product/warehouse/wholeTransfer/model.ts
+++ b/src/pages/product/warehouse/wholeTransfer/model.ts
@@ -112,9 +112,9 @@ export class wholeTransfer extends VuexModule {
   async empty() {
     const orderInInfo: any = [];
     // const userDefined = '';
-    const WlList = [];
+    // const WlList = [];
     const code = '';
-    return { orderInInfo, WlList, code };
+    return { orderInInfo, code };
   }
   @MutationAction
   async onTakeoutConfirm(list: any) {
diff --git a/src/pages/raw/commission/goOut/index.vue b/src/pages/raw/commission/goOut/index.vue
index 820dd4d..3c44215 100644
--- a/src/pages/raw/commission/goOut/index.vue
+++ b/src/pages/raw/commission/goOut/index.vue
@@ -114,12 +114,15 @@ export default class dnReceiptDom extends BasePage {
   //页面初始化
   async onReady() {
     //页面初始化 获取可选库位
-    let means: any = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
+    // let means: any = JSON.parse(localStorage.getItem('__GWMS_APP_STATE_DATA__') as any);
     //let sendSpot = JSON.parse(localStorage.getItem('sendSpot') as any);
+    await this.QueryLoc()
+  }
+  async QueryLoc(){
     let content = {
-      loginName: means.session.user.loginName,
+      loginName: session.loginName,
       //sendSpot: sendSpot,
-      factoryCode: means.session.user.factoryCode,
+      factoryCode: session.factoryCode,
       workArea: session.workareaCode,
     };
     await this.model.queryCodeAndWorkAreaCode(content);
@@ -285,7 +288,9 @@ export default class dnReceiptDom extends BasePage {
       this.customToast(this.$t('message.Commission_tips5') as any);
     }
     await this.model.submitOutsourcing(this.list);
-    this.empty();
+    await this.empty();
+    await this.QueryLoc()
+    await this.query()
   }
   async bill() {
     if (this.form.documentNo == '') {