From 8235ff3e73959e70d4b266f13beace3c19c1047c 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: Tue, 18 Apr 2023 13:48:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E4=B8=8B=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=202.=E5=9C=A8=E5=BA=93=E4=BD=8D=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E7=82=B9=E5=BC=80=E5=90=8E=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?rfid=E8=8A=AF=E7=89=87=E7=A0=81=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E6=88=91=E4=BB=AC=E8=AF=86=E5=88=AB=E7=9A=84=E8=8A=AF=E7=89=87?=
 =?UTF-8?q?=E7=A0=81=EF=BC=8C=E6=9C=AA=E8=83=BD=E8=AF=86=E5=88=AB=E7=9A=84?=
 =?UTF-8?q?=E8=BF=91=E8=B4=A7=E4=BD=8D=E7=A0=81=E7=94=A8ng=E8=A1=A8?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E6=B7=B1=E8=B4=A7=E4=BD=8D=E7=9A=84=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=BB=A5=E6=98=86=E8=88=B9=E7=9A=84=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E3=80=82=E5=BA=93=E4=BD=8D=E5=86=85=E5=8F=AA?=
 =?UTF-8?q?=E4=BF=9D=E7=95=99=E7=9B=98=E7=82=B9=E5=9B=BE=E7=89=87=E3=80=82?=
 =?UTF-8?q?=203.=E6=B8=85=E9=99=A4=E6=9C=80=E5=90=8E=E4=B8=80=E6=AC=A1?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=204.=E4=B8=8B=E4=B8=80=E6=AC=A1=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E6=A0=B8=E5=AF=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/http/http-api.js                 | 10 ++++
 src/views/checkManage/checkOperation.vue | 72 +++++++++++++++++++++---
 src/views/checkManage/index.vue          | 22 +++++++-
 3 files changed, 94 insertions(+), 10 deletions(-)

diff --git a/src/api/http/http-api.js b/src/api/http/http-api.js
index 2216346..0216085 100644
--- a/src/api/http/http-api.js
+++ b/src/api/http/http-api.js
@@ -198,6 +198,11 @@ export default  {
         name: '人工复核',
         method: 'POST'
     },
+    nextOne: {
+        url: '/stock/nextOne',
+        name: '下一个盘点',
+        method: 'POST'
+    },
     checkLog: {
         url: '/checkLog',
         name: '盘点历史',
@@ -218,6 +223,11 @@ export default  {
         name: '品规模板下载',
         method: 'GET'
     },
+    truncateStock: {
+        url: '/stock/truncateStock',
+        name: '清空盘点信息',
+        method: 'POST'
+    },
     stockExportModel: {
         url: '/stock/export/model',
         name: '库存模板下载',
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index bab1665..44d3542 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -7,8 +7,11 @@
                     <div class="img-box">
                         <ul>
                             <li>
-                                <span >
-                                    {{streetName}}-{{this.direction == 1?"左":"右"}}-{{this.side == 1?"浅":"深"}}-{{row}}层-{{column}}列
+                                 <span class="img-box-title">
+                                    位置:
+                                </span>
+                                <span class="img-box-value">
+                                    {{checkObj.streetName}}-{{checkObj.direction == 1?"左":"右"}}-{{checkObj.side == 1?"浅":"深"}}-{{checkObj.row}}层-{{checkObj.column}}列
                                 </span>
                             </li>
                             <li>
@@ -30,8 +33,18 @@
                             </li>
                         </ul>
                     </div>
-                    
-                    <div class="img-box">
+                    <div class="img-box" style="margin:auto;display: flex;align-items: center">
+                        <viewer v-if="checkObj.checkPic" style="height:400px">
+                            <img  :src="imgUrl+checkObj.checkPic"/>
+                        </viewer>
+                        
+                        <div v-else  style="display: flex;align-items: center;justify-content: center;width:300px;height:300px;">
+                            暂无图片
+                        </div>
+                        <p>盘点照片</p>
+                    </div>
+                    <!-- 不再展示操作照片 -->
+                    <!-- <div class="img-box">
                         <viewer v-if="checkObj.preoperationPic" style="height:300px;">
                             <img  :src="imgUrl+checkObj.preoperationPic"/>
                         </viewer>
@@ -53,15 +66,21 @@
                             暂无图片
                         </div>
                         <p>操作后照片</p>
-                    </div>
+                    </div> -->
                 </div>
             </div>
             <div class="bottom-btn" >
                 <a-button class="btn"
                         type="primary"
                         style="background:#29c12b;border-color:#29c12b;"
-                        @click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
-                >核对
+                        @click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)">
+                        核对
+                </a-button>
+                <a-button class="btn"
+                        type="primary"
+                        style="background:#29c12b;border-color:#29c12b;"
+                        @click="nextOne(checkObj.id)">
+                        下一个盘点
                 </a-button>
             </div>
             
@@ -79,7 +98,9 @@
 </template>
 <script>
 import Model from "./model.vue"
-import {imgUrl} from "@/api/importExcel";
+import {imgUrl} from "@/api/importExcel"; 
+import { message } from 'ant-design-vue';
+
 export default {
     data() {
         return {
@@ -175,6 +196,9 @@ export default {
                 }
             }).then(res => {
                 if (res.data) {
+                    if(res.data.trayCode ==""){
+                        res.data.trayCode = "NG";
+                    }
                     this.checkObj = res.data;
                     //this.shelveId = res.data.shelveId;
                     //this.getScanAndCheck();
@@ -197,6 +221,9 @@ export default {
                 data: {
                     row: Number(row),
                     column: Number(column),
+                    side: Number(this.side),
+                    streetId: Number(this.streetId),
+                    direction: Number(this.direction),
                     shelveId: shelveId,
                 }
             }).then(res => {
@@ -224,7 +251,34 @@ export default {
             this.visible = visible
             this.modelData = data
         },
-        
+        nextOne(id){
+            console.log(1111);
+            this.$api.httpApi.nextOne({
+                data: {
+                    id:Number(id)
+                }
+            }).then(res => {
+                if (res.data) {
+                    this.checkObj = {}
+                    if(res.data.trayCode ==""){
+                        res.data.trayCode = "NG";
+                    }
+                    this.checkObj = res.data;
+                    this.id = res.data.id
+                    this.row = res.data.row
+                    this.column = res.data.column
+                    this.direction = res.data.direction
+                    this.side = res.data.side
+                    this.streetId = res.data.streetId
+                    this.streetName = res.data.streetName
+            
+                }else{
+                    message.info('全部盘点已完成')
+                }
+            }).catch(err => {
+                console.log(err)
+            });
+        }
        
     }
 }
diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue
index 371ace1..475483d 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="truncateStock"
+  >
+  <a-button type="primary"  class="export-all">
+            清空盘点
+        </a-button>
+  </a-popconfirm>
+       
         <a-button type="primary" @click="exportStock" class="export-all">
             导出巷道盘点数据
         </a-button>
@@ -138,7 +149,16 @@ export default {
 
             });
         },
-       
+        truncateStock() {
+            this.$api.httpApi.truncateStock({
+
+            }).then(res => {
+                console.log("aaa")
+                this.$message.success('已清空盘点');
+            }).catch(err => {
+
+            });
+        },
         //获取巷道详情
         getStreetDetail(id) {
             this.$axios.get('/street/' + id, {