From 48f819d9cbf63aa43259eb2d155a0b7e84ab255d Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 8 Jan 2024 14:01:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E8=89=AF=E7=8E=87=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/quality/qcTable.js                    | 12 +++--
 src/views/quality/qcProduceAnalysis/index.vue | 44 +++++++++----------
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js
index 3eb6652..445b7e8 100644
--- a/src/api/quality/qcTable.js
+++ b/src/api/quality/qcTable.js
@@ -61,7 +61,13 @@ export function getQmsRateTable(query) {
 export function getCheckTypeList(typeCode) {
 	return request({
 		url: '/quality/staticTable/getCheckTypeList/' + typeCode,
-		method: 'get',
-		params: query
+		method: 'get'
 	});
-}
\ No newline at end of file
+}
+
+export function getSupplierList(typeCode) {
+	return request({
+		url: '/quality/staticTable/getSupplierList/' + typeCode,
+		method: 'get'
+	});
+}
diff --git a/src/views/quality/qcProduceAnalysis/index.vue b/src/views/quality/qcProduceAnalysis/index.vue
index 015fce6..bdfbfcb 100644
--- a/src/views/quality/qcProduceAnalysis/index.vue
+++ b/src/views/quality/qcProduceAnalysis/index.vue
@@ -25,16 +25,6 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="生产车间" prop="supplierCode">
-				<el-select v-model="queryParams.supplierCode" clearable placeholder="请选择生产车间" filterable clearable>
-					<el-option
-						v-for="dict in workCenterList"
-						:key="dict.factoryCode"
-						:label="dict.factoryName"
-						:value="dict.factoryCode"
-					></el-option>
-				</el-select>
-			</el-form-item>
 			<el-form-item label="检验类型" prop="typeCode">
 				<el-select v-model="queryParams.typeCode" clearable placeholder="请选择检验类型" @change="getCheckTypeList">
 					<el-option
@@ -45,6 +35,16 @@
 					></el-option>
 				</el-select>
 			</el-form-item>
+			<el-form-item label="统计单位" prop="supplierCode">
+				<el-select v-model="queryParams.supplierCode" clearable placeholder="请选择统计单位" filterable clearable>
+					<el-option
+						v-for="dict in workCenterList"
+						:key="dict.supplierCode"
+						:label="dict.supplierName"
+						:value="dict.supplierCode"
+					></el-option>
+				</el-select>
+			</el-form-item>
 			<el-form-item label="检验节点" prop="checkType">
 				<el-select v-model="queryParams.checkType" clearable placeholder="请选择检验节点">
 					<el-option
@@ -87,15 +87,8 @@
 
 		<el-table v-loading="loading" :data="tableList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="车间编码" align="center" prop="supplierCode" width="80">
-				 <template slot-scope="scope">
-					<el-button
-						type="text"
-						@click="handleDetail(scope.row)"
-					>{{scope.row.supplierCode}}</el-button>
-				</template>
-			</el-table-column>
-			<el-table-column prop="supplierName" label="车间名称" width="100" align="center"/>
+			<el-table-column label="单位编码" align="center" prop="supplierCode" width="80"/>
+			<el-table-column prop="supplierName" label="单位名称" width="100" align="center"/>
 			<el-table-column prop="orderNo" label="订单编码" width="160" align="center"/>
 			<el-table-column prop="incomeBatchNo" label="批次" width="220" align="center"/>
 			<el-table-column prop="materialName" label="产品名称"align="center" width="180" :show-overflow-tooltip="true"/>
@@ -119,7 +112,7 @@
 </template>
 
 <script>
-import { getQmsRateTable,getWorkcenterList,getCheckTypeList} from "@/api/quality/qcTable";
+import { getQmsRateTable,getWorkcenterList,getCheckTypeList,getSupplierList} from "@/api/quality/qcTable";
 import moment from "moment/moment";
 export default {
 	name: "qcAnalysis",
@@ -209,9 +202,14 @@ export default {
 			})
 		},
 		getCheckTypeList(val){
+			//获取检验节点
 			getCheckTypeList(val).then(response => {
 				this.checkTypeList = response
-			})
+			});
+			//获取统计单位
+            getSupplierList(val).then(response => {
+				this.workCenterList = response
+			});
 		},
 		indexMethod(index){
 			return index+1 ;
@@ -335,9 +333,9 @@ export default {
 		},
 		/** 导出按钮操作 */
 		handleExport() {
-			this.download('mes/prepare/export', {
+			this.download('quality/staticTable/exportProduceAnalysis', {
 				...this.queryParams
-			}, `prepare_${new Date().getTime()}.xlsx`)
+			}, `noOkRate_${new Date().getTime()}.xlsx`)
 		}
 	}
 };