From 920040841ee09aa2ae2b6a790910312536c1ba3d Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 22 Dec 2025 16:58:26 +0800
Subject: [PATCH] =?UTF-8?q?2025-12-22=20=E8=BF=87=E7=AB=99=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E7=9A=84=E2=80=9C=E6=9C=BA=E5=8F=B0=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E2=80=9D=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BA=E5=BF=85=E5=A1=AB=EF=BC=8C=E4=B8=8D=E5=A1=AB=E4=B8=8D?=
 =?UTF-8?q?=E8=AE=A9=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/yieldReport/produce_order.vue     | 29 +++++++++++++------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 0335a24..4192cf1 100644
--- a/src/views/modules/yieldReport/produce_order.vue
+++ b/src/views/modules/yieldReport/produce_order.vue
@@ -23,7 +23,7 @@
         <el-input v-model="searchData.site" style="width: 85px"></el-input>
       </el-form-item>
       <el-form-item :label=labels.resourceId>
-        <span slot="label" @click="getBaseList(95)"><a herf="#">机台编号:</a></span>
+        <span slot="label" @click="getBaseList(95)"><a herf="#"><span style="color: red;">*</span>机台编号:</a></span>
         <el-input v-model="searchData.resourceId" clearable style="width: 110px"></el-input>
       </el-form-item>
       <el-form-item :label=labels.planStartTime>
@@ -1808,6 +1808,11 @@ export default {
 
     /* 查询派工单 */
     getProduceScheduleList() {
+      // 校验机台编号必填
+      if (!this.searchData.resourceId || this.searchData.resourceId.trim() === '') {
+        this.$message.warning('请输入机台编号！')
+        return
+      }
       // 开始真的查询;
       this.searchData.searchFlag = true
       getProduceScheduleList(this.searchData).then(({data}) => {
@@ -2224,6 +2229,11 @@ export default {
 
     //导出excel
     async createExportData() {
+      // 校验机台编号必填
+      if (!this.searchData.resourceId || this.searchData.resourceId.trim() === '') {
+        this.$message.warning('请输入机台编号！')
+        return []
+      }
       // 开始真的查询;
       this.searchData.searchFlag = true;
       this.searchData.exportFlag = "Y";
@@ -2258,14 +2268,15 @@ export default {
       }
 
       // 等待getResourceByUser执行完成后，再查询生产排程列表
-      this.searchData.searchFlag = true;
-      // 不查询
-      getProduceScheduleList(this.searchData).then(({data}) => {
-        // 设置查询数据
-        //this.searchData.searchFlag = false;
-        this.searchData.exportFlag = 'N';
-        this.produceScheduleList = data.rows
-      })
+      // 只有当机台编号有值时才查询
+      if (this.searchData.resourceId && this.searchData.resourceId.trim() !== '') {
+        this.searchData.searchFlag = true;
+        getProduceScheduleList(this.searchData).then(({data}) => {
+          // 设置查询数据
+          this.searchData.exportFlag = 'N';
+          this.produceScheduleList = data.rows
+        })
+      }
     })
 
     /* 获取报工的特殊权限 */