From 58d74d423ecbcfaa8323f23b4ecdcb2bfb763fde 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, 7 Aug 2024 16:03:15 +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=E4=BB=A5=E5=8F=8A=E6=9F=A5=E6=89=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logistics.conf                           |  2 +-
 public/antd_color.less                   |  4 +-
 src/views/checkManage/checkOperation.vue |  9 +---
 src/views/historyCheck/index.vue         | 66 ++++++++++++++----------
 vue.config.js                            |  6 +--
 5 files changed, 46 insertions(+), 41 deletions(-)

diff --git a/logistics.conf b/logistics.conf
index 7d0287e..5b2ffd0 100644
--- a/logistics.conf
+++ b/logistics.conf
@@ -4,7 +4,7 @@ server {
   client_max_body_size   90m;
 
   location /api {
-	proxy_pass http://192.168.77.91:8099/api;
+	proxy_pass http://127.0.0.1:8099/api;
   }
 
   location /{
diff --git a/public/antd_color.less b/public/antd_color.less
index b746b9c..08f0aa1 100644
--- a/public/antd_color.less
+++ b/public/antd_color.less
@@ -1373,9 +1373,9 @@ tr.ant-table-expanded-row:hover {background: #fbfbfb;}
 .ant-tag-checkable:active, .ant-tag-checkable-checked {color: #fff;}
 .ant-tag-checkable-checked {background-color: @primary-color;}
 .ant-tag-checkable:active {background-color: color(~`colorPalette("@{primary-color}", 7)`);}
-.ant-tag-pink {color: #eb2f96;background: #fff0f6;border-color: #ffadd2;}
+.ant-tag-pink {color: #eb2f96;background: color(~`colorPalette("@{text-color-secondary}", 1)`);border-color: #ffadd2;}
 .ant-tag-pink-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
-.ant-tag-magenta {color: #eb2f96;background: #fff0f6;border-color: #ffadd2;}
+.ant-tag-magenta {color: #eb2f96;background: color(~`colorPalette("@{text-color-secondary}", 1)`);border-color: #ffadd2;}
 .ant-tag-magenta-inverse {color: #fff;background: #eb2f96;border-color: #eb2f96;}
 .ant-tag-red {color: #f5222d;background: #fff1f0;border-color: #ffa39e;}
 .ant-tag-red-inverse {color: #fff;background: #f5222d;border-color: #f5222d;}
diff --git a/src/views/checkManage/checkOperation.vue b/src/views/checkManage/checkOperation.vue
index 494b380..b91995d 100644
--- a/src/views/checkManage/checkOperation.vue
+++ b/src/views/checkManage/checkOperation.vue
@@ -118,14 +118,7 @@ export default {
             index: 0,
             imgUrl: '',
             params:[
-                {
-                    label:'盘点批次号',
-                    key: 'lotnum'
-                },
-                {
-                    label:'随行工单号',
-                    key: 'orderNum'
-                },
+                
                 {
                     label:'盘点任务号',
                     key: 'checkNum'
diff --git a/src/views/historyCheck/index.vue b/src/views/historyCheck/index.vue
index 36ebf0c..25736c8 100644
--- a/src/views/historyCheck/index.vue
+++ b/src/views/historyCheck/index.vue
@@ -3,9 +3,9 @@
         <div class="ant-advanced-search-form">
             <a-form layout="inline" :form="queryParam">
                 <a-row :gutter="24">
-                    <a-col :span="4">
+                    <a-col :span="2">
                         <a-form-item label="巷道">
-                            <a-select  @change="handleChange" :value="select" style="width:250px">
+                            <a-select  @change="handleChange" :value="select" style="width:80px">
                                 <a-select-option v-for="i in listData" :key="i.name" :value="i.id">
                                     {{i.name}}
                                 </a-select-option>
@@ -29,27 +29,10 @@
                         </a-form-item>
                         
                     </a-col>
-                    <a-col :span="2">
-                        <a-form-item label="内外货架" v-if="queryParam.side >= 0">
-                            <a-select  style="width: 80px"  :key="queryParam.side"  >
-                                <a-select-option key="0">
-                                    未选择
-                                </a-select-option>
-                                <a-select-option key="1">
-                                    内
-                                </a-select-option>
-                                <a-select-option key="2">
-                                    外
-                                </a-select-option>
-                                
-                            </a-select>
-                        </a-form-item>
-                        
-                        
-                    </a-col>
+                   
                     <a-col :span="2" style="text-align: left">
                         <a-form-item label="行号">
-                            <a-input v-model="queryParam.row" placeholder="请输入" style="width:70px;" type="number"/>
+                            <a-input v-model="queryParam.row" placeholder="请输入" style="width:80px;" type="number"/>
                         </a-form-item>
                     </a-col>
                     <a-col :span="2" style="text-align: left">
@@ -57,9 +40,38 @@
                             <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-input v-model="queryParam.lotnum" placeholder="请输入" style="width:270px;"/>
+                    <a-col :span="2" style="text-align: left">
+                        <a-form-item label="盘点任务号">
+                            <a-input v-model="queryParam.checkNum" placeholder="请输入" style="width:130px;"/>
+                        </a-form-item>
+                    </a-col>
+                    
+                    <a-col :span="2" style="text-align: left">
+                        <a-form-item label="托盘号">
+                            <a-input v-model="queryParam.wmsCode" placeholder="请输入" style="width:130px;"/>
+                        </a-form-item>
+                    </a-col>
+                    <a-col
+                        :span="2"
+                        style="text-align: left"
+                    >
+                        <a-form-item label="状态">
+                            <a-select style="width: 100px"
+                                v-model="queryParam.status" allowClear
+                                @change="statusChange"
+                            >
+                                
+                                <a-select-option :value=1>
+                                    盘点异常
+                                </a-select-option>
+                                <a-select-option :value=2>
+                                    核对正常
+                                </a-select-option>
+                                
+                                <a-select-option :value=3>
+                                    人工核对正确
+                                </a-select-option>
+                            </a-select>
                         </a-form-item>
                     </a-col>
                     <a-col :span="4">
@@ -77,7 +89,7 @@
                             </a-range-picker>
                         </a-form-item>
                     </a-col>
-                    <a-col :span="4" style="text-align: right">
+                    <a-col :span="3" style="text-align: right">
                         <a-button type="primary" @click="handleSearch">搜索</a-button>
                         <a-button style="margin-left: 15px" @click="reset">重置</a-button>
                     </a-col>
@@ -153,8 +165,8 @@ export default {
             imgUrl: imgUrl,
             columns: [
                 {
-                    title: "盘点批次号",
-                    dataIndex: "lotnum",
+                    title: "盘点任务号",
+                    dataIndex: "checkNum",
                 },
                 {
                     title: "货位({货架}-{行}-{列})",
diff --git a/vue.config.js b/vue.config.js
index 34f1c5d..2b1e927 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -32,21 +32,21 @@ module.exports = {
                 }
             },
             '/api/pic': {
-                target: 'http://192.168.77.91:9007/api/pic',
+                target: 'http://127.0.0.1:9007/api/pic',
                 logLevel:'debug',
                 pathRewrite:{
                     '/api/pic':''
                 }
             },
             '/api/mp4': {
-                target: 'http://192.168.77.91:9007/api/mp4',
+                target: 'http://127.0.0.1:9007/api/mp4',
                 logLevel:'debug',
                 pathRewrite:{
                     '/api/mp4':''
                 }
             },
             '/api': {
-                target: 'http://192.168.77.91:8099',
+                target: 'http://127.0.0.1:8099',
                 // target: 'http://115.236.65.98:13001/monitor',
                 // target: 'http://127.0.0.1:9007',
                 logLevel:'debug',   //控制台终端打印代理前的真实地址