From c0f4b8c652ad7384768a765a46c1bb6926f603a9 Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Sat, 28 Sep 2024 17:04:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0=EF=BC=9A?=
 =?UTF-8?q?=201.=20=E9=9D=9E=E8=AE=A1=E5=88=92=E9=A2=86=E6=96=99=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=202.=20=E6=8B=A3=E9=80=89=E4=BB=BB=E5=8A=A1=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/clcNoPlan.vue       |  3 +++
 src/layout/doKitting.vue       |  2 +-
 src/layout/pickTaskMonitor.vue | 30 ++++++++++++++++++++++++++++--
 3 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/layout/clcNoPlan.vue b/src/layout/clcNoPlan.vue
index 796f39f..419a22a 100644
--- a/src/layout/clcNoPlan.vue
+++ b/src/layout/clcNoPlan.vue
@@ -241,6 +241,9 @@ export default {
     methods: {
         // 查询库存余量
         getStockNumOfGoodsIdMethod() {
+            if (this.workFormEntity.goodsId == '') {
+                return
+            }
             const request = {
                 goodsId: this.workFormEntity.goodsId,
                 userName: store.getters.getUserName
diff --git a/src/layout/doKitting.vue b/src/layout/doKitting.vue
index b058e56..8882f6a 100644
--- a/src/layout/doKitting.vue
+++ b/src/layout/doKitting.vue
@@ -178,7 +178,7 @@ export default {
         this.$refs.goodsId.focus()
         this.timer = setInterval(() => {
             this.queryFinish()
-        }, 3000)
+        }, 1000)
     },
     beforeUnmount() {
         clearInterval(this.timer)
diff --git a/src/layout/pickTaskMonitor.vue b/src/layout/pickTaskMonitor.vue
index 67939e0..117ce1f 100644
--- a/src/layout/pickTaskMonitor.vue
+++ b/src/layout/pickTaskMonitor.vue
@@ -3,10 +3,12 @@
         <el-config-provider :locale="zhCn">
             <div style="display: flex;justify-content: space-between;">
                 <el-row>
-                    <el-input v-model="vehicleIdQuery" style="width: 256px; margin-right: 10px;" placeholder="箱号"
+                    <el-input v-model="vehicleIdQuery" style="width: 158px; margin-right: 10px;" placeholder="箱号"
                         :suffix-icon="Search" />
-                    <el-input v-model="standQuery" style="width: 256px; margin-right: 10px;" placeholder="工站"
+                    <el-input v-model="standQuery" style="width: 158px; margin-right: 10px;" placeholder="工站"
                         :suffix-icon="Search" />
+                        <el-select-v2 v-model="pickStatusQuery" style="width: 158px; margin-right: 10px;"
+                        placeholder="请选择状态" :options="pickStatusOptions" @change="search()"></el-select-v2>
                     <el-button type="primary" @click="search()">搜索</el-button>
                     <el-button type="warning" @click="reset()">重置</el-button>
                 </el-row>
@@ -103,6 +105,7 @@ export default {
             total: 0,
             vehicleIdQuery: '',
             standQuery: '',
+            pickStatusQuery: -99,
             loading: true,
             dialogVisible: false,
             pickTaskId: '',
@@ -128,6 +131,28 @@ export default {
                     label: '已到达'
                 }
             ],
+            pickStatusOptions: [
+                {
+                    value: -99,
+                    label: '全部'
+                },
+                {
+                    value: -1,
+                    label: '暂存'
+                },
+                {
+                    value: 0,
+                    label: '待下发'
+                },
+                {
+                    value: 1,
+                    label: '已下发'
+                },
+                {
+                    value: 2,
+                    label: '已到达'
+                }
+            ],
         }
     },
     mounted() {
@@ -141,6 +166,7 @@ export default {
                 pageSize: this.pageSize,
                 vehicleId: this.vehicleIdQuery.trim(),
                 standId: this.standQuery.trim(),
+                pickStatus: this.pickStatusQuery == -99 ? null : this.pickStatusQuery,
                 userName: store.getters.getUserName
             }
             getPickTasksByPage(request).then(res => {