From af6ea1cf23466bc00427d7256f0cb0740d59ee7f Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Wed, 26 Oct 2022 22:28:59 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=9D=E5=AD=98=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/addCountOrder.vue    | 32 ++++++++++++++++++------
 src/views/inventory/invCountOrderNew.vue | 11 ++++++++
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/views/inventory/addCountOrder.vue b/src/views/inventory/addCountOrder.vue
index 5a7bdb4..13d1c74 100644
--- a/src/views/inventory/addCountOrder.vue
+++ b/src/views/inventory/addCountOrder.vue
@@ -156,9 +156,9 @@
                     </el-table-column>
                     <el-table-column width="250" label="注册/备案凭证号" prop="zczbhhzbapzbh" show-overflow-tooltip>
                     </el-table-column>
-                    <el-table-column width="150" abel="生产厂家" prop="ylqxzcrbarmc"
+                    <el-table-column width="150" label="生产厂家" prop="ylqxzcrbarmc"
                                      show-overflow-tooltip></el-table-column>
-                    <el-table-column width="150" abel="库存数量" prop="invCount"
+                    <el-table-column width="150" label="库存数量" prop="invCount"
                                      show-overflow-tooltip></el-table-column>
                     <el-table-column label="操作" fixed="right" width="150">
                         <template slot-scope="scope">
@@ -232,7 +232,6 @@
                             {{ (scope.row.inCount - scope.row.outCount) }}
                         </template>
                     </el-table-column>
-
                 </el-table>
 
                 <el-pagination
@@ -298,7 +297,6 @@ export default {
             storageList: [],
             subInvList: [],
             spaceList: [],
-            thisData: {},
             filterQuery: {
                 invStorageCode: null,
                 invWarehouseCode: null,
@@ -315,14 +313,34 @@ export default {
         saveOrder() {
             this.$refs['dataForm'].validate((valid) => {
                 if (valid) {
-                    saveCountOrder(this.formData).then((res) => {
+                    if (this.codeArray.length === 0) {
+                        this.$message.error("请选择盘点产品");
+                        return;
+                    }
+
+                    let invProductList = [];
+                    this.codeArray.forEach(product => {
+                        invProductList.push(product);
+                    });
+
+                    let orderData = {
+                        invCountOrder: {
+                            createTime: this.formData.billDate,
+                            invStorageCode: this.formData.locStorageCode,
+                            invWarehouseCode: this.formData.invWarehouseCode,
+                            invSpaceCode: this.formData.invSpaceCode
+                        },
+                        invProductList: invProductList
+                    };
+
+                    saveCountOrder(orderData).then((res) => {
                         if (res.code === 20000) {
                             this.$message.success("保存成功");
                             this.closeDialog();
                         } else {
                             this.$message.error(res.data.message);
                         }
-                    })
+                    });
                 }
             })
         },
@@ -400,7 +418,7 @@ export default {
                     productName: product.cpmctymc,
                     spce: product.ggxh,
                     batchNo: product.batchNo,
-                    produceDate: product.productionDate,
+                    productDate: product.productionDate,
                     expireDate: product.expireDate,
                     zczbhhzbapzbh: null,
                     ylqxzcrbarmc: null,
diff --git a/src/views/inventory/invCountOrderNew.vue b/src/views/inventory/invCountOrderNew.vue
index 02889e5..dcbd3d6 100644
--- a/src/views/inventory/invCountOrderNew.vue
+++ b/src/views/inventory/invCountOrderNew.vue
@@ -73,6 +73,14 @@
                 </el-table-column>
                 <el-table-column label="操作" width="120" fixed="right">
                     <template slot-scope="scope">
+                        <el-button
+                            type="text"
+                            size="small"
+                            @click.native.stop="addCode(scope.row)"
+                        >盘点
+                        </el-button
+                        >
+
                         <el-button
                             type="text"
                             size="small"
@@ -260,6 +268,9 @@ export default {
             this.addCountOrderVisible = false;
             this.getList();
         },
+        addCode(row) {
+
+        },
     },
     components: {
         addCountOrder