From 41e0fb12339447a2206c81d95db7c283fefd6261 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 13 Jan 2025 10:19:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reportWork/index.vue        |  7 ++++++-
 src/views/quality/produceReport/index.vue | 18 ++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 6d676e3..791f988 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -136,6 +136,11 @@
 			<el-table-column label="SAP报工时间" align="center" prop="uploadTime" width="150" />
 			<el-table-column label="SAP报工信息" align="center" prop="uploadMsg" width="150"
 				:show-overflow-tooltip="true" />
+      <el-table-column label="工单状态" align="center" prop="status" width="90">
+            <template slot-scope="scope">
+              <dict-tag :options="dict.type.workorder_type" :value="scope.row.status"/>
+            </template>
+      </el-table-column>
 		</el-table>
 
 		<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
@@ -704,7 +709,7 @@ import moment from "moment";
 import { getlistCK } from "@/api/wms/outorder";
 export default {
   name: "ReportWork",
-  dicts: ["report_type", "report_sap_status"],
+  dicts: ["report_type", "report_sap_status", 'workorder_type'],
   components: {
     ReportWorkConsume,
     ItemSelectUser,
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index f1b70bc..d1940c4 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -852,6 +852,7 @@ export default {
 			},
             spanArr: [],
             position: 0,
+			excelFlag:''
 		};
 	},
 	created() {
@@ -991,6 +992,7 @@ export default {
 		// 多选框选中数据
 		handleSelectionChange(selection) {
 			this.selectRow = selection
+			this.excelFlag = selection[0].checkName
 			this.ids = selection.map(item => item.recordId)
 			this.single = selection.length!==1
 			this.multiple = !selection.length
@@ -1087,19 +1089,31 @@ export default {
 		},
 		/** 导出报告按钮操作 */
 		handleSCReportExport() {
+            if(this.excelFlag!='首件检验'){
+				this.$modal.msgSuccess("请选择首件检验任务");
+				return
+			}
 			const recordId =this.ids[0];
 			this.queryParams.recordId = recordId;
 			this.download('quality/qcProduceReport/SCReportExport', {
 				...this.queryParams
-			}, `SCReportExport_${new Date().getTime()}.xlsx`)
+			}, `SCReportExport_${new Date().getTime()}.xlsx`);
+			this.queryParams.recordId = '';
+
 		},
 		/** 导出报告按钮操作 */
 		handleSCXJReportExport() {
+			 if(this.excelFlag!='巡检检验'){
+				this.$modal.msgSuccess("请选择巡检任务");
+				return
+			}
 			this.queryParams.orderNo = this.selectRow[0].orderNo;
 			this.queryParams.shiftId = this.selectRow[0].shiftId;
 			this.download('quality/qcProduceReport/SCXJReportExport', {
 				...this.queryParams
-			}, `SCXJReportExport_${new Date().getTime()}.xlsx`)
+			}, `SCXJReportExport_${new Date().getTime()}.xlsx`);
+			this.queryParams.orderNo = '';
+			this.queryParams.shiftId = '';
 		},
 		/**获取检验项目列表 */
 		getCheckedProjectList(){