From e1e5880dcd2b28684dbdf83a822c2d9b9946b55c Mon Sep 17 00:00:00 2001
From: hou <1601990943@qq.com>
Date: Tue, 15 Feb 2022 23:18:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B6=E4=BB=96=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/warehouse/LocationInventory/index.vue   |  2 +-
 .../product/warehouse/MaterialInventory/index.vue   |  2 +-
 src/pages/product/warehouse/wholeTransfer/index.vue | 13 ++++++++++++-
 src/pages/raw/handover/picking/ByOrder.vue          |  5 +++--
 src/pages/raw/handover/picking/BySummary.vue        |  5 +++--
 src/pages/raw/ingoods/dnReturnGoods/Location.vue    |  1 +
 6 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/pages/product/warehouse/LocationInventory/index.vue b/src/pages/product/warehouse/LocationInventory/index.vue
index 1f86bbe..147187d 100644
--- a/src/pages/product/warehouse/LocationInventory/index.vue
+++ b/src/pages/product/warehouse/LocationInventory/index.vue
@@ -253,7 +253,7 @@ export default class ProductCheckReceipt extends BasePage {
         view {
           width: 110rpx;
           height: 100%;
-          //line-height: 100rpx;
+          line-height: 100rpx;
         }
       }
       .single-right {
diff --git a/src/pages/product/warehouse/MaterialInventory/index.vue b/src/pages/product/warehouse/MaterialInventory/index.vue
index db76eb1..68d2344 100644
--- a/src/pages/product/warehouse/MaterialInventory/index.vue
+++ b/src/pages/product/warehouse/MaterialInventory/index.vue
@@ -262,7 +262,7 @@ export default class ProductCheckReceipt extends BasePage {
         view {
           width: 110rpx;
           height: 100%;
-          //line-height: 100rpx;
+          line-height: 100rpx;
         }
       }
       .single-right {
diff --git a/src/pages/product/warehouse/wholeTransfer/index.vue b/src/pages/product/warehouse/wholeTransfer/index.vue
index bc477a5..c7dbae3 100644
--- a/src/pages/product/warehouse/wholeTransfer/index.vue
+++ b/src/pages/product/warehouse/wholeTransfer/index.vue
@@ -14,6 +14,10 @@
         <u-search :placeholder="$t('message.barcode')" class="Transfer" v-model.trim="userDefined4" @search="QueryHistory" :show-action="false"></u-search>
         <u-button type="primary" style="height: 60rpx; margin-left: 20rpx" @click="generate">{{ $t('message.generate') }}</u-button>
       </u-form-item>
+      <!-- 总数 -->
+      <u-form-item :label="$t('message.Warehouse_TotalNumber')">
+        <u-input :disabled="true" v-model="allNum" placeholder="" />
+      </u-form-item>
       <!-- 已扫 -->
       <!-- <u-form-item :label="$t('message.product_Swept')">
         <u-input :disabled="true" v-model="model.orderInInfo.actualQty" placeholder="" />
@@ -87,6 +91,7 @@ export default class productCheckReceipt extends BasePage {
     productCode: '',
   };
   remove:any = {}
+  allNum:number = 0
   userDefined4: any = '';
   histroyItem:any = {}
   aimWlSelect = false;
@@ -136,6 +141,9 @@ export default class productCheckReceipt extends BasePage {
       proMoveCode: this.userDefined4,
     }
     await this.model.QueryHistory(params)
+    this,model.removeList.forEach((item:any) =>{
+      this.allNum += parseFloat(item.proNum)
+    })
   }
   //页面初始化
   async onReady() {
@@ -197,7 +205,10 @@ export default class productCheckReceipt extends BasePage {
         this.customToast(this.$t('message.Warehouse_Tip9') as string);
         // this.form.productCode = '';
         this.model.empty();
-        this.query()
+        // this.query()
+        this.form.productCode = ''
+        this.allNum = 0
+        this.QueryHistory()
         // setTimeout(() => {
         //   this.$forceUpdate();
         // }, 2000);
diff --git a/src/pages/raw/handover/picking/ByOrder.vue b/src/pages/raw/handover/picking/ByOrder.vue
index 78dd2e3..1f2450b 100644
--- a/src/pages/raw/handover/picking/ByOrder.vue
+++ b/src/pages/raw/handover/picking/ByOrder.vue
@@ -180,6 +180,7 @@ export default class RawReceiptDetail extends BasePage {
     this.Location = [];
     this.Location = this.model.LocList
     console.log('this.Location',this.Location)
+    this.wlCode = this.Location[0]
   }
   Add() {
     if (this.qty == '' || this.wlCode == '') {
@@ -262,7 +263,7 @@ export default class RawReceiptDetail extends BasePage {
   }
   async onReady() {
     await this.onAggregate();
-    await this.GetLocation();
+    // await this.GetLocation();
   }
   async bill() {
     if (this.some == {} || this.some.prdOrder == null) {
@@ -297,7 +298,7 @@ export default class RawReceiptDetail extends BasePage {
         icon: 'success',
         title: this.$t('message.Warehouse_Tip9') as any,
       });
-      this.GetLocation();
+      // this.GetLocation();
       setTimeout(() => {
         this.onAggregate();
       }, 2000);
diff --git a/src/pages/raw/handover/picking/BySummary.vue b/src/pages/raw/handover/picking/BySummary.vue
index dd84f57..e37af4c 100644
--- a/src/pages/raw/handover/picking/BySummary.vue
+++ b/src/pages/raw/handover/picking/BySummary.vue
@@ -169,6 +169,7 @@ export default class RawReceiptDetail extends BasePage {
     this.Location = [];
     this.Location = this.model.LocList
     console.log('this.Location',this.Location)
+    this.wlCode = this.Location[0]
   }
   //添加库位和数量到数据和表格中
   Add() {
@@ -255,7 +256,7 @@ export default class RawReceiptDetail extends BasePage {
   }
   async onReady() {
     await this.onAggregate();
-    await this.GetLocation();
+    // await this.GetLocation();
   }
   async bill() {
     this.redirectTo(this.page.raw.handover.picking.SummaryLocal);
@@ -282,7 +283,7 @@ export default class RawReceiptDetail extends BasePage {
     await this.model.saveAggregateUpload(params);
     if (this.model.code == '1') {
       this.customToast(this.$t('message.Warehouse_Tip9') as any);
-      this.GetLocation();
+      // this.GetLocation();
       setTimeout(() => {
         this.onAggregate();
       }, 2000);
diff --git a/src/pages/raw/ingoods/dnReturnGoods/Location.vue b/src/pages/raw/ingoods/dnReturnGoods/Location.vue
index 519188e..c1cc286 100644
--- a/src/pages/raw/ingoods/dnReturnGoods/Location.vue
+++ b/src/pages/raw/ingoods/dnReturnGoods/Location.vue
@@ -188,6 +188,7 @@ export default class RawReceiptDetail extends BasePage {
       pickerName.sendSpot = item.sendSpot;
       this.Location.push(pickerName);
     });
+    this.wlCode = this.Location[0]
   }
   onUpload(){
     uni.navigateBack({delta:1})