From 347db98551d8ca602e4880bb2110d2c8d9e2b97e 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, 11 Jun 2024 14:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=94=BE=E5=A4=A7=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/antd_color.less                   |  2 +-
 src/views/checkManage/Subsection.vue     |  5 +++-
 src/views/checkManage/checkOperation.vue | 29 ++++++++++++++++++------
 src/views/checkManage/index.vue          |  7 ++++++
 src/views/historyCheck/index.vue         |  2 +-
 5 files changed, 35 insertions(+), 10 deletions(-)

diff --git a/public/antd_color.less b/public/antd_color.less
index 791d9a1..b746b9c 100644
--- a/public/antd_color.less
+++ b/public/antd_color.less
@@ -1395,7 +1395,7 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;}
 .ant-tag-green-inverse {color: #fff;background: #52c41a;border-color: #52c41a;}
 .ant-tag-blue {color: #1890ff;background: #e6f7ff;border-color: #91d5ff;}
 .ant-tag-blue-inverse {color: #fff;background: #1890ff;border-color: #1890ff;}
-.ant-tag-geekblue {color: #2f54eb;background: color(~`colorPalette("@{text-color}", 2)`);border-color: #adc6ff;}
+.ant-tag-geekblue {color: #2f54eb;background: #f0f5ff;border-color: #adc6ff;}
 .ant-tag-geekblue-inverse {color: #fff;background: #2f54eb;border-color: #2f54eb;}
 .ant-tag-purple {color: #722ed1;background: #f9f0ff;border-color: #d3adf7;}
 .ant-tag-purple-inverse {color: #fff;background: #722ed1;border-color: #722ed1;}
diff --git a/src/views/checkManage/Subsection.vue b/src/views/checkManage/Subsection.vue
index 1d3c12c..cf8914e 100644
--- a/src/views/checkManage/Subsection.vue
+++ b/src/views/checkManage/Subsection.vue
@@ -13,6 +13,7 @@
                                 <a-icon type="info-circle" v-if="status.row[index] === 1" style="color: #FFD700"/>
                                 <a-icon type="close-circle" v-else-if="status.row[index] === 2" style="color: #d81e06"/>
                                 <a-icon type="check-circle" v-else-if="status.row[index] === 3" style="color: #1afa29" />
+                                <a-icon type="check-circle" v-else-if="status.row[index] === 4" style="color: #ede900" />
                                 <a-icon type="exclamation-circle" v-else style="color: #909399" />
                             </span>
                         </a-tab-pane>
@@ -243,7 +244,9 @@ export default {
                 color = '#1afa29'
             }else if(status == 1){
                 color = '#d81e06'
-            }else{
+            }else if(status == 4){ 
+                color = '#ede900'
+            }else{ 
                 color = '#bfbfbf'
             }
             dom.style.background = color
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index 8c617fe..ca08dc7 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -86,13 +86,13 @@
                         <a-row type="flex" justify="space-around"  style="height:300,margin-left:400">
                             <a-col :span="11">
                                 <p>顶部图片1</p>
-                                <viewer :images = "checkObj.topPic1">
+                                <viewer :images = "pics">
                                     <img class="historyImg" :src="checkObj.topPic1"/>
                                 </viewer>
                             </a-col>
                             <a-col :span="11">
                                 <p>顶部图片2</p>
-                                <viewer :images = "checkObj.topPic2">
+                                <viewer :images = "pics">
                                     <img class="historyImg" :src="checkObj.topPic2"/>
                                 </viewer>
                             </a-col>
@@ -100,13 +100,13 @@
                         <a-row type="flex" gutter="16px" justify="space-around" align="middle" style="height:300">
                             <a-col :span="11">
                                 <p>侧面图片1</p>
-                                <viewer :images = "checkObj.sidePic1">
+                                <viewer :images = "pics">
                                     <img class="historyImg" :src="checkObj.sidePic1"/>
                                 </viewer>
                             </a-col>
                             <a-col :span="11">
                                 <p>侧面图片2</p>
-                                <viewer :images = "checkObj.sidePic2">
+                                <viewer :images = "pics">
                                     <img class="historyImg" :src="checkObj.sidePic2"/>
                                 </viewer>
                             </a-col>
@@ -114,13 +114,13 @@
                         <a-row type="flex" justify="space-around" align="middle" style="height:300">
                             <a-col :span="11">
                                 <p>侧面图片3</p>
-                                <viewer :images = "checkObj.sidePic3">
+                                <viewer :images = "pics">
                                     <img class="historyImg" :src="checkObj.sidePic3"/>
                                 </viewer>
                             </a-col>
                             <a-col :span="11">
                                 <p>侧面图片4</p>
-                                <viewer :images = "checkObj.sidePic4">
+                                <viewer :images = "pics">
                                     <img class="historyImg" :src="checkObj.sidePic4"/>
                                 </viewer>
                             </a-col>
@@ -167,6 +167,7 @@ export default {
     data() {
         return {
             checkObj: {},
+            pics:[],
             row: 1,
             column: 1,
             streetName: "",
@@ -197,6 +198,7 @@ export default {
                 1: "盘点异常",
                 2: "核对正确",
                 3: "人工核对正确",
+                4: "需要人工核对",
             },
         };
     },
@@ -268,7 +270,13 @@ export default {
                     if (res.data) {
                         this.checkObj = res.data;
                         this.checkObj.checkPic2 =
-                            this.checkObj.checkPic + ".jpg";
+                        this.checkObj.checkPic + ".jpg";
+                        this.pics.push(this.checkObj.topPic1);
+                        this.pics.push(this.checkObj.topPic2);
+                        this.pics.push(this.checkObj.sidePic1);
+                        this.pics.push(this.checkObj.sidePic2);
+                        this.pics.push(this.checkObj.sidePic3);
+                        this.pics.push(this.checkObj.sidePic4);
                         //this.shelveId = res.data.shelveId;
                         //this.getScanAndCheck();
                     }
@@ -384,6 +392,13 @@ export default {
                         this.streetName = res.data.streetName;
                         this.checkObj.checkPic2 =
                             this.checkObj.checkPic + ".jpg";
+                            
+                        this.pics.push(this.checkObj.topPic1);
+                        this.pics.push(this.checkObj.topPic2);
+                        this.pics.push(this.checkObj.sidePic1);
+                        this.pics.push(this.checkObj.sidePic2);
+                        this.pics.push(this.checkObj.sidePic3);
+                        this.pics.push(this.checkObj.sidePic4);
                     } else {
                         message.info("全部盘点已完成");
                     }
diff --git a/src/views/checkManage/index.vue b/src/views/checkManage/index.vue
index 1efeb32..4135333 100644
--- a/src/views/checkManage/index.vue
+++ b/src/views/checkManage/index.vue
@@ -46,6 +46,13 @@
                 ></a-tag>
                 盘点正确
             </span>
+            <span class="info-text">
+                <a-tag
+                    color="#ede900"
+                    style="width: 30px; height: 20px; margin-right: 6px"
+                ></a-tag>
+                需要人工盘点
+            </span>
             <span class="info-text">
                 <a-tag
                     color="#bfbfbf"
diff --git a/src/views/historyCheck/index.vue b/src/views/historyCheck/index.vue
index 5023e45..1266dd9 100644
--- a/src/views/historyCheck/index.vue
+++ b/src/views/historyCheck/index.vue
@@ -132,7 +132,7 @@ export default {
     name: "historyCheck",
     data() {
         return {
-            statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"人工核对正确"},
+            statusMap: {0:"未盘点",1:"盘点异常",2:"核对正确",3:"人工核对正确",4: "需要人工核对",},
             queryParam: {
                 lotnum: '',
                 side : '',