From 24fe4fe3f613451f3f9c394c023a389a83b06321 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Fri, 5 Jun 2026 14:56:33 +0800
Subject: [PATCH] =?UTF-8?q?2026-06-05=20=E5=B7=A5=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=B1=87=E6=80=BB=E9=A1=B5=E9=9D=A2=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=97=A5=E6=9C=9F=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../workOrderAlloc/searchWorkOrderAlloc.vue   | 51 ++++++++++++++++++-
 1 file changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/views/modules/shopOrder/workOrderAlloc/searchWorkOrderAlloc.vue b/src/views/modules/shopOrder/workOrderAlloc/searchWorkOrderAlloc.vue
index 6e1e4f0..2a827ab 100644
--- a/src/views/modules/shopOrder/workOrderAlloc/searchWorkOrderAlloc.vue
+++ b/src/views/modules/shopOrder/workOrderAlloc/searchWorkOrderAlloc.vue
@@ -49,7 +49,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item label="生产订单号">
-                <el-input v-model="searchData.orderNo" placeholder="请输入订单号" clearable></el-input>
+                <el-input v-model="searchData.orderNo" placeholder="请输入订单号" clearable @input="handleOrderNoChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="4">
@@ -87,6 +87,7 @@
                   v-model="searchData.date1"
                   type="date"
                   value-format="yyyy-MM-dd"
+                  @change="handleEnterDateChange"
                   placeholder="开始日期"
                   style="width: 45%">
                 </el-date-picker>
@@ -95,6 +96,7 @@
                   v-model="searchData.date2"
                   type="date"
                   value-format="yyyy-MM-dd"
+                  @change="handleEnterDateChange"
                   placeholder="结束日期"
                   style="width: 45%">
                 </el-date-picker>
@@ -119,6 +121,27 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="报工日期">
+                <el-date-picker
+                  v-model="searchData.reportDate1"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="开始日期"
+                  @change="handleReportDateChange"
+                  style="width: 45%">
+                </el-date-picker>
+                <span style="margin: 0 6px; color: #DCDFE6;">~</span>
+                <el-date-picker
+                  v-model="searchData.reportDate2"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="结束日期"
+                  @change="handleReportDateChange"
+                  style="width: 45%">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
           </el-row>
         </template>
 
@@ -339,6 +362,8 @@ export default {
         partDescription: '',
         orderNo: '',
         status: '',
+        reportDate1: '',
+        reportDate2: '',
         date1: '',
         date2: '',
         date3: '',
@@ -464,6 +489,28 @@ export default {
       this.searchData.date1 = formatDate(firstDay);
       this.searchData.date2 = formatDate(lastDay);
     },
+    // 选择报工日期后，清空生产订单号和录入日期
+    handleReportDateChange() {
+      if (this.searchData.reportDate1 || this.searchData.reportDate2) {
+        this.searchData.orderNo = '';
+        this.searchData.date1 = '';
+        this.searchData.date2 = '';
+      }
+    },
+    // 录入生产订单号后，清空报工日期
+    handleOrderNoChange(val) {
+      if (val) {
+        this.searchData.reportDate1 = '';
+        this.searchData.reportDate2 = '';
+      }
+    },
+    // 选择录入日期后，清空报工日期
+    handleEnterDateChange() {
+      if (this.searchData.date1 || this.searchData.date2) {
+        this.searchData.reportDate1 = '';
+        this.searchData.reportDate2 = '';
+      }
+    },
     // 计算表格高度
     calculateTableHeight() {
       this.$nextTick(() => {
@@ -487,6 +534,8 @@ export default {
         partDescription: '',
         orderNo: '',
         status: '',
+        reportDate1: '',
+        reportDate2: '',
         date1: '',
         date2: '',
         date3: '',