清空盘点

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: '库存模板下载',

src/views/checkManage/checkOperation.vue

@@ -7,8 +7,11 @@
                     <div class="img-box">
                         <ul>
                             <li>
-                                <span >
+                                 <span class="img-box-title">
-                                    {{streetName}}-{{this.direction == 1?"左":"右"}}-{{this.side == 1?"浅":"深"}}-{{row}}层-{{column}}列
+                                    位置:
+                                </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" style="margin:auto;display: flex;align-items: center">
-                    <div class="img-box">
+                        <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)
+            });
+        }
        
     }
 }

src/views/checkManage/index.vue

@@ -1,10 +1,17 @@
 <template>
     <div class="check-page">
     <div class="button-box">
-        
+        <a-popconfirm
-        <a-button type="primary" @click="truncateStock" class="export-all">
+    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>
@@ -142,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, {