From 92e34d1d8c114ac20b17c3479effa996b72e766b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Fri, 26 May 2023 16:46:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=94=B9=E5=8F=98=E5=B7=A6=E5=8F=B3=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=B7=B1=E6=B5=85=202.=E6=B8=85=E7=A9=BA?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/checkManage/checkOperation.vue |  2 +-
 src/views/checkManage/index.vue          | 20 ++++++++++++++++++++
 src/views/historyCheck/index.vue         |  9 +++++----
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index 308323f..661b913 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -11,7 +11,7 @@
                                     位置:
                                 </span>
                                 <span class="img-box-value">
-                                    {{checkObj.streetName}}-{{checkObj.direction == 1?"左":"右"}}-{{checkObj.side == 1?"浅":"深"}}-{{checkObj.row}}层-{{checkObj.column}}列
+                                    {{checkObj.streetName}}-{{checkObj.direction }}-{{checkObj.column}}列-{{checkObj.row}}层
                                 </span>
                             </li>
                             <li>
diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue
index e0070b5..6bff017 100644
--- a/src/views/checkManage/index.vue
+++ b/src/views/checkManage/index.vue
@@ -1,6 +1,17 @@
 <template>
     <div class="check-page">
         <div class="button-box">
+            
+            <a-popconfirm
+                title="是否清空全部盘点"
+                ok-text="是"
+                cancel-text="否"
+                @confirm="allStockClear"
+            >
+                <a-button type="primary" class="export-all">
+                    盘点清空
+                </a-button>
+            </a-popconfirm>
             <a-popconfirm
                 title="是否确定要全部盘点"
                 ok-text="是"
@@ -243,6 +254,15 @@ export default {
                 })
                 .catch((err) => {});
         },
+        allStockClear() {
+            console.log("清空盘点");
+            this.$api.httpApi
+                .allStockClear({})
+                .then((res) => {
+                    message.success("盘点清空", 10);
+                })
+                .catch((err) => {});
+        },
         initWebSocket() {
             //初始化weosocket
             const wsuri = "ws://127.0.0.1:8099/ws/111";
diff --git a/src/views/historyCheck/index.vue b/src/views/historyCheck/index.vue
index 8d3a241..5b6b275 100644
--- a/src/views/historyCheck/index.vue
+++ b/src/views/historyCheck/index.vue
@@ -29,7 +29,7 @@
                         </a-form-item>
                         
                     </a-col>
-                    <a-col :span="2">
+                    <!-- <a-col :span="2">
                         <a-form-item label="深浅" v-if="queryParam.side >= 0">
                             <a-select  style="width: 50px"  :key="queryParam.side"  >
                                 <a-select-option :key=0>
@@ -46,7 +46,7 @@
                         </a-form-item>
                         
                         
-                    </a-col>
+                    </a-col> -->
                     <a-col :span="2" style="text-align: left">
                         <a-form-item label="行号">
                             <a-input v-model="queryParam.row" placeholder="请输入" style="width:50px;" type="number"/>
@@ -96,7 +96,7 @@
                {{ text }}
           </span>
           <span slot="goodsLocation" slot-scope="text">
-               {{ text.direction == 1 ?"左":"右"}}-{{ text.side == 1 ?"浅":"深"}}-{{ text.row}}-{{ text.column}}
+               {{ text.direction }}-{{ text.row}}-{{ text.column}}
           </span>
           <span slot="status" slot-scope="text">
                {{ statusMap[text.status] }}
@@ -159,8 +159,9 @@ export default {
                     dataIndex: "streetName",
                 },
                 {
-                    title: "货位({左右}-{深浅}-{行}-{列})",
+                    title: "货位({1:左,2:右}-{行}-{列})",
                     scopedSlots: {customRender: 'goodsLocation'},
+                    width:200,
                 },
                 
                 {