From 7ab3649f9e1c32fdde7d9d2995216ee999523d74 Mon Sep 17 00:00:00 2001
From: yiming <wang.yiming@hzleaper.com>
Date: Thu, 12 May 2022 09:56:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=B0=E6=B9=BE=E7=9B=98?=
 =?UTF-8?q?=E7=82=B9=E7=9A=84=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/cameraManage/model.vue         |  4 +-
 src/views/checkManage/Subsection.vue     |  3 +-
 src/views/checkManage/checkOperation.vue | 54 ++++++++++++++----------
 src/views/historyCheck/index.vue         |  2 +-
 4 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/src/views/cameraManage/model.vue b/src/views/cameraManage/model.vue
index 85e9718..6bf2aa6 100644
--- a/src/views/cameraManage/model.vue
+++ b/src/views/cameraManage/model.vue
@@ -312,7 +312,7 @@ export default {
                             }).then(res => {
                                 if(res.code==200){
                                     this.$emit('sure',false)
-                                    this.$message.success('新增球机成功');
+                                    this.$message.success('新增球機成功');
                                 }
                             }).catch(err => {
 
@@ -324,7 +324,7 @@ export default {
                             }).then(res => {
                                 if(res.code==200){
                                     this.$emit('sure',false)
-                                    this.$message.success('编辑球机成功');
+                                    this.$message.success('编辑球機成功');
                                 }
                             }).catch(err => {
 
diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue
index 342b9b9..eb7d7dc 100644
--- a/src/views/checkManage/Subsection.vue
+++ b/src/views/checkManage/Subsection.vue
@@ -46,6 +46,7 @@
                         :key="index"
                     >
                             <span slot="tab">
+                                
                                 {{  getRandom(index, latticeColumn, nums.column, total.column) }}
                                 <!-- <a-icon :id="`${shelveId}-row-${getRandom(index,latticeRow,nums.row,total.row)}`"/> -->
                                 <a-icon type="close-circle" v-if="status.column[index] === 1" style="color: #d81e06" />
@@ -216,7 +217,7 @@ export default {
         
         getStatusBg(row,column,status) {
             var dom = document.getElementById(this.shelveId+"-"+row+'-'+column);
-            var color = status == 1 ?'#d81e06': status == 2 ? '#1afa29': '#bfbfbf';
+            var color = status == 1 ?'#d81e06': (status == 2 || status == 3 )? '#1afa29': '#bfbfbf';
             dom.style.background = color
         },
         getStatusTab(tab,status,rowColumn){
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index a24315c..91c158d 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -26,12 +26,12 @@
                         </ul>
                     </div>
                     <div class="img-box">
-                            <viewer v-if="checkObj.checkPic" style="height: 300px">
-                                <img :src="imgUrl+checkObj.checkPic"/>
-                            </viewer>
+                        <viewer v-if="checkObj.checkPic">
+                            <img :src="imgUrl+checkObj.checkPic"/>
+                        </viewer>
                         <div
                             v-else
-                            style="display: flex;align-items: center;justify-content: center;width:100px;height:400px;">
+                            style="display: flex;justify-content: left;width:100px;height:400px;float:left">
                             暫無圖片
                         </div>
                         <p>盤點圖</p>
@@ -39,14 +39,7 @@
                     
                 </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)"
-                >核对
-                </a-button>
-            </div>
+            
             <!-- <div class="bottom-btn"
                 >
                 <a-button class="btn" @click="prev()">＜上一个</a-button>
@@ -55,8 +48,15 @@
                 </a-button>
             </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)"
+            >核对
+            </a-button>
+        </div>
+            
         <Model
             :visible.sync="visible"
             :modelData.sync="modelData"
@@ -65,6 +65,7 @@
             @close="closeModel"
         />
     </div>
+    
 </template>
 <script>
 import Model from "./model.vue"
@@ -101,9 +102,18 @@ export default {
                     key: 'lotnum'
                 },
                 {
-                    label:'隨行工單號',
-                    key: 'orderNum'
+                    label:'貨架號',
+                    key: 'shelveId'
+                },
+                {
+                    label:'行',
+                    key: 'row'
                 },
+                {
+                    label:'列',
+                    key: 'column'
+                },
+                
                 {
                     label:'盤點任務號',
                     key: 'checkNum'
@@ -123,7 +133,7 @@ export default {
                 },
                 
             ],
-            statusMap: {0:"未盤點",1:"盤點異常",2:"核對正確",3:"核對正確"}
+            statusMap: {0:"未盤點",1:"盤點異常",2:"核對正確",3:"人工核對正確"}
             
         }
     },
@@ -416,7 +426,7 @@ export default {
                 &-content {
                     display: flex;
                     align-items: center;
-                    justify-content: space-between;
+                    justify-content: left;
                     padding-left: 25px;
 
                     .img-box {
@@ -425,17 +435,17 @@ export default {
                         justify-content: center;
                         flex-direction: column;
                         font-size: 17px;
-                        height: 400px;
+                        height: 800px;
                         margin-right: 10px;
-                        img {
-                            height: 100%
+                        viewer {
+                            width: 100%
                         }
 
                         p {
                             height: 25px;
                         }
                         ul {
-                            width: 100% / 4;
+                            width: 500px;
                             height: 100%;
                             margin-bottom: 0;
                             padding-inline-start: 0;
diff --git a/src/views/historyCheck/index.vue b/src/views/historyCheck/index.vue
index 7e539dd..6ecefb0 100644
--- a/src/views/historyCheck/index.vue
+++ b/src/views/historyCheck/index.vue
@@ -124,7 +124,7 @@ export default {
     name: "historyCheck",
     data() {
         return {
-            statusMap: {0:"未盤點",1:"盤點異常",2:"核對正確",3:"核對正確"},
+            statusMap: {0:"未盤點",1:"盤點異常",2:"核對正確",3:"人工核對正確"},
             queryParam: {
                 lotnum: '',
                 shelveId:'',