From 50a8bc835144cc7155d768cda5af9acd74389d03 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: Thu, 30 May 2024 14:31:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E5=AF=B9=E5=93=81=E8=A7=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/antd_color.less                   |  2 +-
 src/views/checkManage/checkOperation.vue | 27 ++++++++++++++++++------
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/public/antd_color.less b/public/antd_color.less
index b746b9c..791d9a1 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: #f0f5ff;border-color: #adc6ff;}
+.ant-tag-geekblue {color: #2f54eb;background: color(~`colorPalette("@{text-color}", 2)`);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/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index ac53f0f..8c617fe 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -25,7 +25,7 @@
                             </li>
                             <li>
                                 <span class="img-box-title">
-                                    品规:
+                                    品规选择:
                                 </span>
                                 <span class="img-box-value">
 
@@ -45,16 +45,26 @@
                             </li>
                             <li>
                                 <span class="img-box-title">
-                                    个数:
+                                    上位个数:
                                 </span>
                                 <span class="img-box-value">
+                                    {{this.checkObj.wmsCount}}
+                                </span>
+                            </li>
+                            <li>
+                                <span class="img-box-title">
+                                    识别+顶部个数：
+                                </span>
+                                <span class="img-box-value">
+                                    {{this.checkObj.count}}+
                                     <a-input-number
                                         id="inputNumber"
-                                        style="width: 100%"
-                                        v-model="checkObj.count"
+                                        style="width: 50%"
+                                        v-model="checkObj.countTop"
                                         :min="0"
                                         :max="150"
                                     />
+                                    ={{getCountAdd()}}
 
                                 </span>
                             </li>
@@ -125,7 +135,7 @@
                     type="primary"
                     style="background:#29c12b;border-color:#29c12b;"
                     @click="checkSure(checkObj.row,checkObj.column,checkObj.shelveId,index)"
-                >核对品规
+                >核对上传
                 </a-button>
 
                 <a-button
@@ -292,7 +302,9 @@ export default {
             this.column = 1;
             this.getStockInfo(1, 1);
         },
-
+        getCountAdd(){
+            return this.checkObj.count + this.checkObj.countTop
+        },
         checkSure(row, column, shelveId, index) {
             this.$api.httpApi
                 .stockCheckCorrect({
@@ -302,7 +314,7 @@ export default {
                         side: Number(this.side),
                         streetId: Number(this.streetId),
                         direction: Number(this.direction),
-                        conut: this.checkObj.count,
+                        countTop: this.checkObj.countTop,
                         category: this.checkObj.category,
 
                         ok: 1,
@@ -337,6 +349,7 @@ export default {
                 .catch((err) => {});
         },
         showModel(checkObj, index) {
+            console.log("1111");
             this.visible = true;
             this.modelData = checkObj;
             this.index = index;