From 5aef4e4582251e25de7f11c6f7b28a30364f4318 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 2 Sep 2024 08:59:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/income.js              | 13 +++++++++++++
 src/views/mes/dailyReportNew/index.vue |  1 +
 src/views/quality/qcIncome/index.vue   | 26 ++++++++++++++++++++++++--
 3 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/src/api/quality/income.js b/src/api/quality/income.js
index 2e91c29e..93473e68 100644
--- a/src/api/quality/income.js
+++ b/src/api/quality/income.js
@@ -211,3 +211,16 @@ export function getCkeckProjectXJList(query) {
       method: 'get'
     })
   }
+
+  //合并来料检验
+export function togetherTask(recordId,factoryCode) {
+	const data = {
+		recordId,
+		factoryCode
+	}
+	return request({
+		url: '/quality/qcIncome/togetherTask',
+		method: 'post',
+		data: data
+	});
+}
\ No newline at end of file
diff --git a/src/views/mes/dailyReportNew/index.vue b/src/views/mes/dailyReportNew/index.vue
index 7d16276f..54fdbc59 100644
--- a/src/views/mes/dailyReportNew/index.vue
+++ b/src/views/mes/dailyReportNew/index.vue
@@ -78,6 +78,7 @@
 		</el-row>
 
 		<el-table v-loading="loading" :data="prepareList"
+		 height="500"
 		  :summary-method="getSummaries"
 		  :header-cell-style="{'text-align':'center'}"
       :cell-style="{'text-align':'center'}"
diff --git a/src/views/quality/qcIncome/index.vue b/src/views/quality/qcIncome/index.vue
index 0f63f913..2a962b62 100644
--- a/src/views/quality/qcIncome/index.vue
+++ b/src/views/quality/qcIncome/index.vue
@@ -134,6 +134,17 @@
 					v-hasPermi="['quality:qcIncome:export']"
 				>导出</el-button>
 			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="success"
+					plain
+					icon="el-icon-paperclip"
+					size="mini"
+					:disabled="multiple"
+					@click="handleTogether"
+					v-hasPermi="['quality:qcIncome:edit']"
+				>合并任务</el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -390,7 +401,9 @@
 </template>
 
 <script>
-import { listIncome, getIncome, delIncome, addIncome, updateIncome ,changeIncomeStatus} from "@/api/quality/income";
+import { listIncome, getIncome, delIncome, addIncome, 
+updateIncome ,changeIncomeStatus,togetherTask
+} from "@/api/quality/income";
 import { getCheckTypes } from "@/api/quality/qcProduce";
 import ItemSelectWorkOrder from "./selectLLWorkOrder.vue";
 import ItemSelectSupplier from "./selectSupplier.vue";
@@ -664,7 +677,16 @@ export default {
 				...this.queryParams
 			}, `income_${new Date().getTime()}.xlsx`)
 		},
-
+		/** 合并按钮操作 */
+		handleTogether(row) {
+			const recordIds = row.recordId || this.ids;
+			this.$modal.confirm('是否确认合并来料检验任务的数据项？').then(function() {
+				return togetherTask(recordIds.join(','),null);
+			}).then(() => {
+				this.getList();
+				this.$modal.msgSuccess("合并成功");
+			}).catch(() => {});
+		},
 		// 数据状态修改
 		handleStatusChange(row) {
 			let text = row.status === "0" ? "停用" : "启用";