From 64fac7457598b1824e59e151a12ef0094afc2fc9 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Thu, 11 Jan 2024 08:59:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../checkTypeProject/selectProject.vue        |  2 +-
 src/views/quality/qcProduce/index.vue         | 32 +++++++++++--------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/views/quality/checkTypeProject/selectProject.vue b/src/views/quality/checkTypeProject/selectProject.vue
index 4f51916..e04d452 100644
--- a/src/views/quality/checkTypeProject/selectProject.vue
+++ b/src/views/quality/checkTypeProject/selectProject.vue
@@ -20,7 +20,7 @@
           </el-form-item>
 
           <el-form-item label="检测方案名称">
-            <el-select v-model="queryParams.projectType" filterable placeholder="请选择检测方案">
+            <el-select v-model="queryParams.projectType" filterable clearable placeholder="请选择检测方案">
               <el-option
               v-for="item in projectTypeOptions"
               :key="item.projectTypeCode"
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index c17d427..3dc1d04 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -1,13 +1,15 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-			<el-form-item label="任务编号" prop="checkNo">
-				<el-input
-					v-model="queryParams.checkNo"
-					placeholder="请输入检验任务编号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
+			<el-form-item label="检验节点" prop="checkType">
+				<el-select v-model="queryParams.checkType" clearable placeholder="请选择检验节点">
+					<el-option
+						v-for="dict in checkTypes"
+						:key="dict.id"
+						:label="dict.checkName"
+						:value="dict.id"
+					></el-option>
+				</el-select>
 			</el-form-item>
 			<el-form-item label="批次号" prop="incomeBatchNo">
 				<el-input
@@ -163,7 +165,7 @@
 			<el-table-column label="checkType" align="center" prop="checkType" v-if="false"/>
 			<el-table-column label="任务编号" align="center" prop="checkNo" width="120"/>
 			<el-table-column label="批次号" align="center" prop="incomeBatchNo" width="200" :show-overflow-tooltip="true" />
-			<el-table-column label="订单号" align="center" prop="orderNo" width="120"/>
+			<el-table-column label="订单号" align="center" prop="orderNo" width="130"/>
 			<el-table-column label="物料号" align="center" prop="materialCode" width="170"/>
 			<el-table-column label="物料名称" align="center" prop="materialName" width="250" :show-overflow-tooltip="true" />
 			<el-table-column label="数量" align="center" prop="quality" />
@@ -171,10 +173,10 @@
 			<el-table-column label="不合格数量" align="center" prop="noOkQuality" width="120"/>
 			<el-table-column label="单位" align="center" prop="unit" />
 			<el-table-column label="车间编码" align="center" prop="supplierCode" width="120"/>
-			<el-table-column label="车间名称" align="center" prop="supplierName" width="240"/>
-			<el-table-column label="生产时间" align="center" prop="incomeTime" width="180">
+			<el-table-column label="车间名称" align="center" prop="supplierName" width="170"/>
+			<el-table-column label="生产时间" align="center" prop="incomeTime" width="150">
 				<template slot-scope="scope">
-					<span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+					<span>{{ parseTime(scope.row.incomeTime, '{y}-{m}-{d}') }}</span>
 				</template>
 			</el-table-column>
 			<el-table-column label="检测地点" align="center" prop="checkLoc" width="120"/>
@@ -186,8 +188,8 @@
 					/>
 				</template>
 			</el-table-column>
-			<el-table-column label="检测人工号" align="center" prop="checkManCode" width="180" :show-overflow-tooltip="true"/>
-			<el-table-column label="检测人姓名" align="center" prop="checkManName" width="180" :show-overflow-tooltip="true"/>
+			<el-table-column label="检测人工号" align="center" prop="checkManCode" width="100" />
+			<el-table-column label="检测人姓名" align="center" prop="checkManName" width="100"/>
 			<el-table-column label="检验时间" align="center" prop="checkTime" width="180">
 				<template slot-scope="scope">
 					<span>{{ parseTime(scope.row.checkTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -195,7 +197,7 @@
 			</el-table-column>
 			<el-table-column label="检验节点" align="center" prop="checkName" />
 			<el-table-column label="检验结果" align="center" prop="checkResult" />
-			<el-table-column label="是否启用" align="center" width="100">
+			<el-table-column label="是否启用" align="center" width="100" v-if="false">
 				<template slot-scope="scope">
 					<el-switch
 						v-model="scope.row.status"
@@ -437,6 +439,7 @@ export default {
 			total: 0,
 			// 生产过程检验任务表格数据
 			qcProduceList: [],
+			checkTypeList:[],
 			// 弹出层标题
 			title: "",
 			// 是否显示弹出层
@@ -517,6 +520,7 @@ export default {
 	},
 	methods: {
         /****/
+		//获取检验节点
 		getCheckTypes() {
            	getCheckTypes('produce').then(response => {
 				this.checkTypes = response;