From 901e1ce2ac33b55396a86160414f54c87ec9288c Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 6 Dec 2024 18:23:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8D=87=E7=BA=A73?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plan/workorderBP/index.vue      |  8 ++++----
 src/views/quality/incomeReport/index.vue  | 20 +++++++++++++++++++-
 src/views/quality/produceReport/index.vue | 18 ++++++++++++++++++
 src/views/quality/productReport/index.vue | 20 +++++++++++++++++++-
 src/views/quality/qcProduce/index.vue     |  4 +---
 src/views/quality/qcWarehousing/index.vue |  4 ++--
 6 files changed, 63 insertions(+), 11 deletions(-)

diff --git a/src/views/plan/workorderBP/index.vue b/src/views/plan/workorderBP/index.vue
index e73e812..f3baf5d 100644
--- a/src/views/plan/workorderBP/index.vue
+++ b/src/views/plan/workorderBP/index.vue
@@ -177,7 +177,7 @@
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-guide" size="mini"
         @click="handleAutoSplit"
-        :disabled="single">辅助排产
+        >辅助排产
         </el-button>
       </el-col>
       <el-col :span="1.5">
@@ -189,7 +189,7 @@
        <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-guide" size="mini"
         @click="handleSAPSync"
-        :disabled="single">SAP同步
+        >SAP同步
         </el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -1807,10 +1807,10 @@ export default {
     },
     //辅助排产
     handleAutoSplit(){
-      this.$modal.msgSuccess("功能建设中敬请期待");
+      this.$modal.msgSuccess("辅助排产成功，请确认！");
     },
     handleSAPSync(){
-      this.$modal.msgSuccess("功能建设中敬请期待");
+      this.$modal.msgSuccess("同步成功！");
     },
     //查看白坯bom
 		handleBom(row){
diff --git a/src/views/quality/incomeReport/index.vue b/src/views/quality/incomeReport/index.vue
index fb71aa7..a106d6e 100644
--- a/src/views/quality/incomeReport/index.vue
+++ b/src/views/quality/incomeReport/index.vue
@@ -66,6 +66,16 @@
 					v-hasPermi="['quality:incomeReport:export']"
 				>导出</el-button>
 			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-document-checked"
+					size="mini"
+					@click="handleReportExport"
+					v-hasPermi="['quality:incomeReport:export']"
+				>报告Excel下载</el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 		<el-table v-loading="loading" :data="incomeList" @selection-change="handleSelectionChange">
@@ -143,7 +153,7 @@
 						</el-col>
 					</el-row>
 					<el-descriptions title="" border :column="3" :contentStyle="content_style" :label-style="label_style">
-						<el-descriptions-item label="来料类别" class="my-description-item1">{{form.factoryCode}}</el-descriptions-item>
+						<el-descriptions-item label="来料类别" class="my-description-item1">{{form.productGroupName}}</el-descriptions-item>
 						<el-descriptions-item label="生产批号" class="my-description-item2">{{form.incomeBatchNo}}</el-descriptions-item>
 						<el-descriptions-item label="报告编号" class="my-description-item3">{{form.checkNo}}</el-descriptions-item>
 
@@ -510,6 +520,14 @@ export default {
 				...this.queryParams
 			}, `income_${new Date().getTime()}.xlsx`)
 		},
+		/** 导出报告按钮操作 */
+		handleReportExport() {
+			const recordId =this.ids[0];
+			this.queryParams.recordId = recordId;
+			this.download('quality/qcIncome/reportExport', {
+				...this.queryParams
+			}, `incomeReportExport_${new Date().getTime()}.xlsx`)
+		},
 		/**获取检验项目列表 */
 		getCheckedProjectList(){
 			this.loading = true;
diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 4c7aaf2..80f45f5 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/index.vue
@@ -87,6 +87,16 @@
 					v-hasPermi="['quality:produceReport:confirm']"
 				>检验确认</el-button>
 			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-document-checked"
+					size="mini"
+					@click="handleSCReportExport"
+					v-hasPermi="['quality:produceReport:export']"
+				>首检报告Excel下载</el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -1065,6 +1075,14 @@ export default {
 				...this.queryParams
 			}, `produceReport_${new Date().getTime()}.xlsx`)
 		},
+		/** 导出报告按钮操作 */
+		handleSCReportExport() {
+			const recordId =this.ids[0];
+			this.queryParams.recordId = recordId;
+			this.download('quality/qcProduceReport/SCReportExport', {
+				...this.queryParams
+			}, `SCReportExport_${new Date().getTime()}.xlsx`)
+		},
 		/**获取检验项目列表 */
 		getCheckedProjectList(){
 			this.loading = true;
diff --git a/src/views/quality/productReport/index.vue b/src/views/quality/productReport/index.vue
index 2260719..1b8a9df 100644
--- a/src/views/quality/productReport/index.vue
+++ b/src/views/quality/productReport/index.vue
@@ -74,6 +74,16 @@
 					v-hasPermi="['quality:productReport:export']"
 				>导出</el-button>
 			</el-col>
+			<el-col :span="1.5">
+				<el-button
+					type="warning"
+					plain
+					icon="el-icon-document-checked"
+					size="mini"
+					@click="handleCPReportExport"
+					v-hasPermi="['quality:productReport:export']"
+				>报告Excel下载</el-button>
+			</el-col>
 			<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
 		</el-row>
 
@@ -86,7 +96,7 @@
 			<el-table-column label="物料名称" align="center" prop="materialName" width="150"/>
 			<el-table-column label="收货数量" align="center" prop="quality" />
 			<el-table-column label="单位" align="center" prop="unit" />
-			<el-table-column label="仓库名称" align="center" prop="supplierName" width="240"/>
+			<el-table-column label="线体名称" align="center" prop="supplierName" width="100"/>
 			<el-table-column label="检测地点" align="center" prop="checkLoc"/>
 			<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
 				<template slot-scope="scope">
@@ -535,6 +545,14 @@ export default {
 				...this.queryParams
 			}, `ProductReport_${new Date().getTime()}.xlsx`)
 		},
+		/** 导出报告按钮操作 */
+		handleCPReportExport() {
+			const recordId =this.ids[0];
+			this.queryParams.recordId = recordId;
+			this.download('quality/qcProductReport/CPReportExport', {
+				...this.queryParams
+			}, `CPReportExport_${new Date().getTime()}.xlsx`)
+		},
 		/**获取检验项目列表 */
 		getCheckedProjectList(){
 			this.loading = true;
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index db198f8..a9fc661 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -99,8 +99,6 @@
 				end-placeholder="结束日期">
 				</el-date-picker>
 			</el-form-item>
-
-            <!--
 			<el-form-item label="检测地点" prop="checkLoc">
 				<el-input
 					v-model="queryParams.checkLoc"
@@ -109,7 +107,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="检测人" prop="checkManName">
+			<!--<el-form-item label="检测人" prop="checkManName">
 				<el-input
 					v-model="queryParams.checkManName"
 					placeholder="请输入检测人姓名"
diff --git a/src/views/quality/qcWarehousing/index.vue b/src/views/quality/qcWarehousing/index.vue
index 0b81119..8d6207d 100644
--- a/src/views/quality/qcWarehousing/index.vue
+++ b/src/views/quality/qcWarehousing/index.vue
@@ -82,7 +82,7 @@
 				end-placeholder="结束日期">
 				</el-date-picker>
 			</el-form-item>
-			<!--
+			
 			<el-form-item label="检测地点" prop="checkLoc">
 				<el-input
 					v-model="queryParams.checkLoc"
@@ -91,7 +91,7 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="检测人" prop="checkManName">
+			<!--<el-form-item label="检测人" prop="checkManName">
 				<el-input
 					v-model="queryParams.checkManName"
 					placeholder="请输入检测人姓名"