From d9777aa49f1bb73d51c20d6208d71882befa93be Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Fri, 5 Aug 2022 16:04:35 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=89=AB=E7=A0=81=E5=8D=95=E6=8D=AE=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inout/IOAddOrder.vue            |  6 ++++++
 src/views/inout/editCode.vue              | 15 +++++++++++++++
 src/views/inventory/InvProducts.vue       |  2 +-
 src/views/inventory/InvProductsDetail.vue |  8 ++++++--
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/views/inout/IOAddOrder.vue b/src/views/inout/IOAddOrder.vue
index 02c4c2a..650f7d2 100644
--- a/src/views/inout/IOAddOrder.vue
+++ b/src/views/inout/IOAddOrder.vue
@@ -310,6 +310,12 @@
                     show-overflow-tooltip
                 ></el-table-column>
 
+                <el-table-column
+                    label="实际数量"
+                    prop="reCount"
+                    show-overflow-tooltip
+                ></el-table-column>
+
                 <el-table-column label="操作" fixed="right" width="250">
                     <template slot-scope="scope">
                         <el-button
diff --git a/src/views/inout/editCode.vue b/src/views/inout/editCode.vue
index 0fcb3ef..999e377 100644
--- a/src/views/inout/editCode.vue
+++ b/src/views/inout/editCode.vue
@@ -83,6 +83,17 @@
                                   :disabled="editData.serialNo!=null && editData.serialNo!='' "></el-input>
                     </el-form-item>
                 </el-col>
+
+                <el-col :span="3">
+                    <div class="ao-text">
+                        <span>是否以使用单元数量入库：</span>
+                    </div>
+                </el-col>
+                <el-col :span="7">
+                    <el-form-item>
+                        <el-checkbox v-model="isUseDyCheck" disabled></el-checkbox>
+                    </el-form-item>
+                </el-col>
             </el-row>
             <el-row :gutter="20">
                 <el-col :span="17">
@@ -129,6 +140,7 @@ export default {
     data() {
         return {
             xlhEnable: false,
+            isUseDyCheck: false
         };
     },
 
@@ -162,6 +174,9 @@ export default {
                         if (response.data.scbssfbhxlh == "否") {
                             this.xlhEnable = true;
                         }
+                        if (response.data.zxxsbzbhsydysl > 1) {
+                            this.isUseDyCheck = true;
+                        }
                     } else {
                     }
                     this.loading = false;
diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index 335aae3..2ac8b1b 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -242,6 +242,7 @@ export default {
     },
     onSubmit() {
       this.loading = true;
+      this.filterQuery.page = 1;
       this.getList();
     },
     handleSizeChange(val) {
@@ -265,7 +266,6 @@ export default {
     },
     getList() {
       this.loading = true;
-      this.filterQuery.page = 1;
       this.filterQuery.customerId = store.getters.customerId;
       filterProducts(this.filterQuery)
           .then((response) => {
diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue
index 5570140..10f42f4 100644
--- a/src/views/inventory/InvProductsDetail.vue
+++ b/src/views/inventory/InvProductsDetail.vue
@@ -82,7 +82,7 @@
 
             <el-form-item>
                 <el-button-group>
-                    <el-button type="primary" icon="search" @click="getCodeList"
+                    <el-button type="primary" icon="search" @click="searchCode"
                     >查询
                     </el-button
                     >
@@ -144,6 +144,7 @@
             @current-change="handleCurrentChange"
             layout="prev, pager, next,total"
             :total="total"
+            :current-page="query.page"
         >
         </el-pagination>
     </div>
@@ -219,7 +220,10 @@ export default {
             this.query.page = val;
             this.getCodeList();
         },
-
+        searchCode() {
+            this.query.page = 1;
+            this.getCodeList();
+        },
         getCodeList() {
             this.loading = true;
             this.query.productIdFk = this.idQuery.relIdFk;