From 6d38451dd3aa9ec5828c59dbbc4cb78fd3758384 Mon Sep 17 00:00:00 2001
From: x_z <zrhdyxa@163.com>
Date: Thu, 17 Nov 2022 15:46:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=AE=8C=E5=96=84=E7=9B=98=E7=82=B9=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inventory/addCountOrder.vue          |  5 +++++
 src/views/inventory/invCountOrderAudit.vue     | 17 +++++++++++++++--
 src/views/inventory/invCountOrderCompleted.vue | 14 ++++++++++++--
 src/views/inventory/invCountOrderNew.vue       | 14 ++++++++++++--
 4 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/src/views/inventory/addCountOrder.vue b/src/views/inventory/addCountOrder.vue
index 1c327bd..dd3b5ee 100644
--- a/src/views/inventory/addCountOrder.vue
+++ b/src/views/inventory/addCountOrder.vue
@@ -593,6 +593,11 @@ export default {
                     return;
                 }
             }
+
+            if (this.codeArray.length < 1) {
+                this.$message.error("未选择盘点产品！")
+                return;
+            }
             this.formData.code.trim();
             let params = {
                 orderIdFk: this.formData.orderId,
diff --git a/src/views/inventory/invCountOrderAudit.vue b/src/views/inventory/invCountOrderAudit.vue
index 3c89e88..aa540c3 100644
--- a/src/views/inventory/invCountOrderAudit.vue
+++ b/src/views/inventory/invCountOrderAudit.vue
@@ -69,7 +69,12 @@
                 <el-table-column label="盘点单号" prop="orderId" width="180"></el-table-column>
                 <el-table-column label="仓库" prop="invStorageName" width="180"></el-table-column>
                 <el-table-column label="分库" prop="invSubStorageName" width="180"></el-table-column>
-                <el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
+                <el-table-column label="货位" prop="invSpaceName" width="240"></el-table-column>
+                <el-table-column label="盘点类型" prop="countType" width="100">
+                    <template slot-scope="scope">
+                        <span>{{ countTypeMap[scope.row.countType]}}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="盘点人" prop="createUser" width="120"></el-table-column>
                 <el-table-column label="盘点时间" prop="createTime" width="150"></el-table-column>
                 <el-table-column label="状态" prop="status" width="120">
@@ -233,7 +238,12 @@ export default {
                 productId: null,
                 edit: false
             },
-            codesVisible: false
+            codesVisible: false,
+            countTypeMap: {
+                0: "整库盘点",
+                1: "货位盘点",
+                2: "部分盘点"
+            }
         };
     },
     methods: {
@@ -314,6 +324,9 @@ export default {
                 if (res.code === 20000) {
                     this.$message.success("删除成功");
                     this.getList();
+                    this.detailList = [];
+                    this.detailTotal = 0;
+                    this.detailQuery.page = 1;
                 } else {
                     this.$message.error(res.message());
                 }
diff --git a/src/views/inventory/invCountOrderCompleted.vue b/src/views/inventory/invCountOrderCompleted.vue
index 69e46f4..bebeee7 100644
--- a/src/views/inventory/invCountOrderCompleted.vue
+++ b/src/views/inventory/invCountOrderCompleted.vue
@@ -70,7 +70,12 @@
                 <el-table-column label="仓库" prop="invStorageName" width="180"></el-table-column>
                 <el-table-column label="分库" prop="invSubStorageName" width="180"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="货位" prop="invSpaceName" width="180"></el-table-column>
+                <el-table-column label="货位" prop="invSpaceName" width="200"></el-table-column>
+                <el-table-column label="盘点类型" prop="countType" width="100">
+                    <template slot-scope="scope">
+                        <span>{{ countTypeMap[scope.row.countType]}}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="盘点人" prop="createUser" width="120"></el-table-column>
                 <el-table-column label="盘点时间" prop="createTime" width="150"></el-table-column>
                 <el-table-column label="状态" prop="status" width="120">
@@ -207,7 +212,12 @@ export default {
                 productId: null,
                 edit: false
             },
-            codesVisible: false
+            codesVisible: false,
+            countTypeMap: {
+                0: "整库盘点",
+                1: "货位盘点",
+                2: "部分盘点"
+            }
         };
     },
     methods: {
diff --git a/src/views/inventory/invCountOrderNew.vue b/src/views/inventory/invCountOrderNew.vue
index fb05318..f30dc74 100644
--- a/src/views/inventory/invCountOrderNew.vue
+++ b/src/views/inventory/invCountOrderNew.vue
@@ -82,7 +82,12 @@
                 <el-table-column label="仓库" prop="invStorageName" width="180"></el-table-column>
                 <el-table-column label="分库" prop="invSubStorageName" width="180"
                                  show-overflow-tooltip></el-table-column>
-                <el-table-column label="货位" prop="invSpaceName" width="120"></el-table-column>
+                <el-table-column label="货位" prop="invSpaceName" width="220"></el-table-column>
+                <el-table-column label="盘点类型" prop="countType" width="100">
+                    <template slot-scope="scope">
+                        <span>{{ countTypeMap[scope.row.countType]}}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column label="盘点人" prop="createUser" width="120"></el-table-column>
                 <el-table-column label="盘点时间" prop="createTime" width="150"></el-table-column>
                 <el-table-column label="状态" prop="status" width="120">
@@ -187,7 +192,12 @@ export default {
             countOrder: null,
             formName: null,
             formType: null,
-            countType: null
+            countType: null,
+            countTypeMap: {
+                0: "整库盘点",
+                1: "货位盘点",
+                2: "部分盘点"
+            }
         };
     },
     methods: {