界面调整

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
+	});
+}

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'}"

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" ? "停用" : "启用";