From 6ce2a2fad1c4ce4e4f20cf696756673a998052e0 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: Wed, 3 Jul 2024 11:40:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=9B=98=E7=82=B9=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/antd_color.less           |  2 +-
 src/views/historyCheck/index.vue | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/public/antd_color.less b/public/antd_color.less
index b746b9c..08c925d 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("@{heading-color}", 1)`);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/historyCheck/index.vue b/src/views/historyCheck/index.vue
index e7217de..3e74eb4 100644
--- a/src/views/historyCheck/index.vue
+++ b/src/views/historyCheck/index.vue
@@ -3,7 +3,7 @@
         <div class="ant-advanced-search-form">
             <a-form layout="inline" :form="queryParam">
                 <a-row :gutter="24">
-                    <a-col :span="4">
+                    <a-col :span="3">
                         <a-form-item label="巷道">
                             <a-select  @change="handleChange" :value="select" style="width:100px">
                                 <a-select-option v-for="i in listData" :key="i.name" :value="i.id">
@@ -49,19 +49,20 @@
                     </a-col>
                     <a-col :span="2" style="text-align: left">
                         <a-form-item label="行号">
-                            <a-input v-model="queryParam.row" placeholder="请输入" style="width:50px;" type="number"/>
+                            <a-input v-model="queryParam.row" placeholder="请输入" style="width:70px;" type="number"/>
                         </a-form-item>
                     </a-col>
                     <a-col :span="2" style="text-align: left">
                         <a-form-item label="列号">
-                            <a-input v-model="queryParam.column" placeholder="请输入" style="width:50px;" type="number"/>
+                            <a-input v-model="queryParam.column" placeholder="请输入" style="width:70px;" type="number"/>
                         </a-form-item>
                     </a-col>
                     <a-col :span="4" style="text-align: left">
-                        <a-form-item label="盘点号">
+                        <a-form-item label="盘点批次号">
                             <a-input v-model="queryParam.lotnum" placeholder="请输入" />
                         </a-form-item>
                     </a-col>
+                    
                     <a-col :span="4">
                         <a-form-item label="时间">
                             <a-range-picker
@@ -151,6 +152,10 @@ export default {
                     title: "盘点批次号",
                     dataIndex: "lotnum",
                 },
+                {
+                    title: "盘点任务号",
+                    dataIndex: "taskId",
+                },
                 {
                     title: "巷道名",
                     dataIndex: "streetName",