From 2b10f6a18ba411938151ebb40fc5a5e052eacaf4 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 10 Feb 2026 11:15:12 +0800
Subject: [PATCH] =?UTF-8?q?2026-02-10=20=E7=94=9F=E4=BA=A7=E6=B4=BE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../searchProductionDispatchList.vue          | 102 +++++++++++-------
 1 file changed, 61 insertions(+), 41 deletions(-)

diff --git a/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue b/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
index be9e3c0..d3954b7 100644
--- a/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
+++ b/src/views/modules/shopOrder/productionOrderScheduling/searchProductionDispatchList.vue
@@ -28,9 +28,63 @@
 
         <!-- 查询条件 - 可展开/收起 -->
         <template v-if="searchExpanded">
+          <!-- 第二行 -->
+          <el-row :gutter="16">
+            <el-col :span="2">
+              <el-form-item>
+                <span slot="label" @click="getBaseList(18)"><a href="#">工厂编码</a></span>
+                <el-input v-model="searchData.site" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item>
+                <span slot="label" @click="getBaseList(24)"><a href="#">加工中心编码</a></span>
+                <el-input v-model="searchData.workCenterNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item>
+                <span slot="label" @click="getBaseList(88)"><a href="#">机台编号</a></span>
+                <el-input v-model="searchData.sResourceID" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item>
+                <span slot="label" @click="getBaseList(5)"><a href="#">产成品编码</a></span>
+                <el-input v-model="searchData.partNo" placeholder="请输入" clearable style="width: 120%"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item label="生产订单号">
+                <el-input v-model="searchData.orderNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item label="派工单单号">
+                <el-input v-model="searchData.seqNo" placeholder="请输入" clearable></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item label="是否关闭">
+                <el-select v-model="searchData.closedFlag" placeholder="请选择" clearable style="width: 100%">
+                  <el-option label="是" value="Y"></el-option>
+                  <el-option label="否" value="N"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="3">
+              <el-form-item label="是否暂停">
+                <el-select v-model="searchData.parkFlag" placeholder="请选择" clearable style="width: 100%">
+                  <el-option label="是" value="Y"></el-option>
+                  <el-option label="否" value="N"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
           <!-- 第一行：日期信息 -->
           <el-row :gutter="16">
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="录入日期">
                 <el-date-picker
                   v-model="searchData.date1"
@@ -49,7 +103,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="计划开工日期">
                 <el-date-picker
                   v-model="searchData.date3"
@@ -68,7 +122,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <el-form-item label="计划完工日期">
                 <el-date-picker
                   v-model="searchData.date5"
@@ -88,44 +142,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-
-          <!-- 第二行 -->
-          <el-row :gutter="16">
-            <el-col :span="4">
-              <el-form-item>
-                <span slot="label" @click="getBaseList(24)"><a href="#">加工中心编码</a></span>
-                <el-input v-model="searchData.workCenterNo" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item>
-                <span slot="label" @click="getBaseList(88)"><a href="#">机台编号</a></span>
-                <el-input v-model="searchData.sResourceID" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item>
-                <span slot="label" @click="getBaseList(5)"><a href="#">产成品编码</a></span>
-                <el-input v-model="searchData.partNo" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item label="生产订单号">
-                <el-input v-model="searchData.orderNo" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item label="派工单单号">
-                <el-input v-model="searchData.seqNo" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="4">
-              <el-form-item>
-                <span slot="label" @click="getBaseList(18)"><a href="#">工厂编码</a></span>
-                <el-input v-model="searchData.site" placeholder="请输入" clearable></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
         </template>
 
         <!-- 按钮行 - 始终显示 -->
@@ -287,6 +303,8 @@ export default {
         date4: '',
         date5: '',
         date6: '',
+        closedFlag: 'N', // 是否关闭，默认N
+        parkFlag: '', // 是否暂停，无默认
         user: this.$store.state.user.name
       },
       searchExpanded: true, // 查询条件展开状态
@@ -1173,6 +1191,8 @@ export default {
         date4: '',
         date5: '',
         date6: '',
+        closedFlag: 'N', // 重置时保持默认值N
+        parkFlag: '', // 重置时无默认
         user: this.$store.state.user.name
       }
       this.pageIndex = 1