From 9ca802bd4c1426b3e7b1735d2620ca0b8aa7b3d9 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 12 Jan 2024 15:50:25 +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

---
 src/views/quality/produceReport/index.vue | 49 ++++++++++++-----------
 src/views/quality/qcProduce/index.vue     | 10 +++--
 src/views/quality/unqualified/index.vue   |  4 +-
 3 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/src/views/quality/produceReport/index.vue b/src/views/quality/produceReport/index.vue
index 3487d87..f46cd73 100644
--- a/src/views/quality/produceReport/index.vue
+++ b/src/views/quality/produceReport/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="orderNo">
-				<el-input
-					v-model="queryParams.orderNo"
-					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="materialCode">
 				<el-input
@@ -102,7 +104,7 @@
 				</template>
 			</el-table-column>
 		</el-table>
-		
+
 		<pagination
 			v-show="total>0"
 			:total="total"
@@ -115,7 +117,7 @@
 		<el-dialog :title="title" :visible.sync="open" width="1370px" append-to-body>
 			<el-row>
 				<el-col :span="20">
-					<el-button 
+					<el-button
 						    class="print-btn"
 							size="mini"
 							type="primary"
@@ -189,11 +191,11 @@
 					<el-row class="my-print-foot">
 						<el-col :offset="1" :span="3">检查人:</el-col>
 						<el-col :offset="2" :span="3">品质主管:</el-col>
-	
+
 					</el-row>
 					</el-form>
 			</div>
-			
+
 			<div slot="footer" class="dialog-footer">
 				<el-button @click="cancel">取 消</el-button>
 			</div>
@@ -203,7 +205,7 @@
 		<el-dialog :title="title" :visible.sync="firstReportOpen" width="1000px" append-to-body>
 			<el-row>
 				<el-col :span="20">
-					<el-button 
+					<el-button
 						    class="print-btn"
 							size="mini"
 							type="primary"
@@ -252,14 +254,14 @@
 								</el-input>
 							</el-form-item>
 						</el-col>
-						<el-col :span="16">	
+						<el-col :span="16">
 							<el-form-item label="首检原因" >
 								<el-input   disabled/>
 							</el-form-item>
 						</el-col>
-					</el-row>	
+					</el-row>
 					<el-row>
-						<el-col :span="24">	
+						<el-col :span="24">
 							<!-- 检验项目明细 -->
 							<el-table v-loading="loading" :data="checkProjectList" >
 								<el-table-column type="selection" width="55" align="center" />
@@ -278,7 +280,7 @@
 								    <template slot-scope="scope">
 										<dict-tag :options="dict.type.check_result" :value="scope.row.status"/>
 									</template>
-								</el-table-column>	
+								</el-table-column>
 							</el-table>
 						</el-col>
 					</el-row>
@@ -312,7 +314,7 @@
 					</el-row>
 				</el-form>
 			</div>
-			
+
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="handleDone">确 定</el-button>
 			</div>
@@ -427,8 +429,9 @@ export default {
 			return index + 1;
 		},
 		/****/
+		//获取检验节点
 		getCheckTypes() {
-           	getCheckTypes('material').then(response => {
+           	getCheckTypes('produce').then(response => {
 				this.checkTypes = response;
 			});
 		},
@@ -499,7 +502,7 @@ export default {
 				updateTime: null,
 				factoryCode: null,
 				delFlag: null,
-				
+
 			};
 			this.resetForm("form");
 		},
@@ -529,7 +532,7 @@ export default {
 		handleLook(row) {
 			this.reset();
 			const recordId = row.recordId || this.ids
-			
+
 			if(row.checkType =='checkTypeSC') {
 				getProduce(recordId).then(response => {
 					this.form = response.data;
@@ -555,7 +558,7 @@ export default {
 					this.newWorkerLoading = false // 设置加载状态为false，表示加载完成
 				})
 			}
-			
+
 		},
 		/** 提交按钮 */
 		submitForm() {
@@ -630,11 +633,11 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
-.center-text {  
+.center-text {
   text-align: center;
 }
 .my-print-nav {
   margin-top: 15px;
   margin-bottom: 15px;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/quality/qcProduce/index.vue b/src/views/quality/qcProduce/index.vue
index 5a275f7..8bedf17 100644
--- a/src/views/quality/qcProduce/index.vue
+++ b/src/views/quality/qcProduce/index.vue
@@ -122,7 +122,7 @@
 					v-hasPermi="['quality:qcProduce:add']"
 				>新增</el-button>
 			</el-col>
-			
+
 			<el-col :span="1.5">
 				<el-button
 					type="success"
@@ -327,7 +327,7 @@
 					</el-col>
 				</el-row>
 				<el-row>
-					<el-col :span="6">	
+					<el-col :span="6">
 						<el-form-item label="抽样数量" prop="sampleQuality">
 							<el-input type="number" v-model="form.sampleQuality" placeholder="请输入抽样数量" />
 						</el-form-item>
@@ -622,7 +622,7 @@ export default {
 			this.form.defects = this.defectTypeList;
 			this.open = true;
 			this.title = "添加生产过程检验任务";
-			
+
 		},
 		/** 修改按钮操作 */
 		handleUpdate(row) {
@@ -632,6 +632,10 @@ export default {
 				this.form = response.data;
 				this.open = true;
 				this.title = "修改生产过程检验任务";
+
+				getBatchList(response.data.orderNo).then(response => {
+					this.batchList = response;
+				});
 			});
 		},
 		/** 提交按钮 */
diff --git a/src/views/quality/unqualified/index.vue b/src/views/quality/unqualified/index.vue
index f2a6792..b6bcc7c 100644
--- a/src/views/quality/unqualified/index.vue
+++ b/src/views/quality/unqualified/index.vue
@@ -128,8 +128,8 @@
 					/>
 				</template>
 			</el-table-column>
-			<el-table-column label="下一节点编码" align="center" prop="nextNodeCode" width="120"/>
-			<el-table-column label="下一节点名称" align="center" prop="nextNodeName" width="120"/>
+			<el-table-column label="抽样数量" align="center" prop="sampleQuality" width="100"/>
+			<el-table-column label="不合格数量" align="center" prop="noOkQuality" width="100"/>
 			<el-table-column label="流程发起时间" align="center" prop="createTime" width="150">
 			  <template slot-scope="scope">
 					<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>