From 8892813b4bc8455ae2f08cf47a3feb55fa801435 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 27 Jan 2026 10:10:14 +0800
Subject: [PATCH] =?UTF-8?q?2026-01-27=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../searchMaterialOnMachineRecord.vue         |  2 +-
 .../modules/yieldReport/produce_order.vue     | 26 ++++++++++++-------
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/views/modules/schedule/searchMaterialOnMachineRecord.vue b/src/views/modules/schedule/searchMaterialOnMachineRecord.vue
index 4375076..4ceb7c3 100644
--- a/src/views/modules/schedule/searchMaterialOnMachineRecord.vue
+++ b/src/views/modules/schedule/searchMaterialOnMachineRecord.vue
@@ -196,7 +196,7 @@
         label="操作">
         <template slot-scope="scope">
           <el-link style="cursor: pointer; margin-right: 8px" @click="printMaterialLabel(scope.row)">打印</el-link>
-          <el-link style="cursor: pointer" v-if="scope.row.finishedFlag == 'N' && scope.row.histType == '发料'" @click="showReturnMaterialDialog(scope.row)">异常退料</el-link>
+          <el-link style="cursor: pointer" @click="showReturnMaterialDialog(scope.row)">异常退料</el-link>
         </template>
       </el-table-column>
       <el-table-column
diff --git a/src/views/modules/yieldReport/produce_order.vue b/src/views/modules/yieldReport/produce_order.vue
index 4192cf1..3b554e3 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="#"><span style="color: red;">*</span>机台编号:</a></span>
+        <span slot="label" @click="getBaseList(95)"><a herf="#">机台编号:</a></span>
         <el-input v-model="searchData.resourceId" clearable style="width: 110px"></el-input>
       </el-form-item>
       <el-form-item :label=labels.planStartTime>
@@ -46,7 +46,7 @@
         <el-input v-model="searchData.orderNo" style="width: 120px" @keyup.enter.native="refreshPageTables"></el-input>
       </el-form-item>
       <el-form-item :label=labels.seqNo>
-        <el-input v-model="searchData.seqNo" style="width: 120px" @keyup.enter.native="refreshPageTables"></el-input>
+        <el-input v-model="searchData.seqNo" clearable style="width: 120px" @keyup.enter.native="refreshPageTables"></el-input>
       </el-form-item>
       <el-form-item :label="''" style="margin-left: -5px;">
         <el-checkbox style="margin-top: 20px;" true-label="Y" false-label="N" v-model="searchData.closedFlag">{{ labels.showFinishedSeqNo }}
@@ -1808,9 +1808,11 @@ export default {
 
     /* 查询派工单 */
     getProduceScheduleList() {
-      // 校验机台编号必填
-      if (!this.searchData.resourceId || this.searchData.resourceId.trim() === '') {
-        this.$message.warning('请输入机台编号！')
+      // 校验：派工单号和机台必须填一个
+      const hasResourceId = this.searchData.resourceId && this.searchData.resourceId.trim() !== ''
+      const hasSeqNo = this.searchData.seqNo && this.searchData.seqNo.trim() !== ''
+      if (!hasResourceId && !hasSeqNo) {
+        this.$message.warning('派工单号和机台必须填一个！')
         return
       }
       // 开始真的查询;
@@ -2229,9 +2231,11 @@ export default {
 
     //导出excel
     async createExportData() {
-      // 校验机台编号必填
-      if (!this.searchData.resourceId || this.searchData.resourceId.trim() === '') {
-        this.$message.warning('请输入机台编号！')
+      // 校验：派工单号和机台必须填一个
+      const hasResourceId = this.searchData.resourceId && this.searchData.resourceId.trim() !== ''
+      const hasSeqNo = this.searchData.seqNo && this.searchData.seqNo.trim() !== ''
+      if (!hasResourceId && !hasSeqNo) {
+        this.$message.warning('派工单号和机台必须填一个！')
         return []
       }
       // 开始真的查询;
@@ -2268,8 +2272,10 @@ export default {
       }
 
       // 等待getResourceByUser执行完成后，再查询生产排程列表
-      // 只有当机台编号有值时才查询
-      if (this.searchData.resourceId && this.searchData.resourceId.trim() !== '') {
+      // 只有当机台编号或派工单号有值时才查询
+      const hasResourceId = this.searchData.resourceId && this.searchData.resourceId.trim() !== ''
+      const hasSeqNo = this.searchData.seqNo && this.searchData.seqNo.trim() !== ''
+      if (hasResourceId || hasSeqNo) {
         this.searchData.searchFlag = true;
         getProduceScheduleList(this.searchData).then(({data}) => {
           // 设置查询数据