From b894ecc328e4c34b6203a4e158ea25ba83f86758 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 4 Dec 2023 13:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A3=80=E6=B5=8B=E9=A1=B9?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=A4=E4=B8=AA=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/checkType/index.vue         | 21 ++++--
 .../checkTypeProject/MaterialGroupAdd.vue     |  5 +-
 src/views/quality/project/index.vue           | 69 +++++++++++--------
 3 files changed, 55 insertions(+), 40 deletions(-)

diff --git a/src/views/quality/checkType/index.vue b/src/views/quality/checkType/index.vue
index 26b8a43..8551442 100644
--- a/src/views/quality/checkType/index.vue
+++ b/src/views/quality/checkType/index.vue
@@ -1,10 +1,10 @@
 <template>
 	<div class="app-container">
 		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-			<el-form-item label="名称" prop="checkName">
+			<el-form-item label="节点名称" prop="checkName">
 				<el-input
 					v-model="queryParams.checkName"
-					placeholder="请输入名称"
+					placeholder="请输入检验节点名称"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
@@ -63,9 +63,9 @@
 
 		<el-table v-loading="loading" :data="checkTypeList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
-			<el-table-column label="流程编号" align="center" type="index" width="100"/>
-			<el-table-column label="名称" align="center" prop="checkName" />
-			<el-table-column label="类型名称" align="center" prop="typeCode" >
+			<el-table-column label="检验节点编码" align="center" prop="orderCode" width="150"/>
+			<el-table-column label="检验节点名称" align="center" prop="checkName"/>
+			<el-table-column label="类型名称" align="center" prop="typeCode" width="150">
 				<template slot-scope="scope">
 					<dict-tag
 						:options="dict.type.check_type"
@@ -106,8 +106,15 @@
 			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
 				<el-row>
 					<el-col :span="15">
-						<el-form-item label="名称" prop="checkName">
-							<el-input v-model="form.checkName" placeholder="请输入名称" />
+						<el-form-item label="节点编码" prop="orderCode">
+							<el-input v-model="form.orderCode" placeholder="请输入检验节点编码" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+			    <el-row>
+					<el-col :span="15">
+						<el-form-item label="节点名称" prop="checkName">
+							<el-input v-model="form.checkName" placeholder="请输入检验节点名称" />
 						</el-form-item>
 					</el-col>
 				</el-row>
diff --git a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
index de43968..c0df205 100644
--- a/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
+++ b/src/views/quality/checkTypeProject/MaterialGroupAdd.vue
@@ -308,9 +308,8 @@ export default {
     },
      //物料选择确认
 		onSelectMaterial(obj) {
-       debugger
-       this.form.materialCode = obj.code[0];
-		   this.form.materialName = obj.name[0];
+       this.form.materialCode = obj.code;
+		   this.form.materialName = obj.name;
        console.log(this.form.groupId);
        if(this.form.materialCode != null) {
         addMaterialGroupDetail(this.form).then((response) => {
diff --git a/src/views/quality/project/index.vue b/src/views/quality/project/index.vue
index 46b2468..d04c6ec 100644
--- a/src/views/quality/project/index.vue
+++ b/src/views/quality/project/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<div class="app-container">
-		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+		<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
 			<el-form-item label="检验规则名称" prop="ruleName">
 				<el-input
 					v-model="queryParams.ruleName"
@@ -93,8 +93,8 @@
 		<el-table v-loading="loading" :data="projectList" @selection-change="handleSelectionChange">
 			<el-table-column type="selection" width="55" align="center" />
 			<el-table-column label="检验规则编号" align="center" prop="orderNum" width="100"/>
-			<el-table-column label="检验规则名称" align="center" prop="ruleName" />
-			<el-table-column label="检验规则属性" align="center" prop="propertyCode" >
+			<el-table-column label="检验规则名称" align="center" prop="ruleName" width="100"/>
+			<el-table-column label="检验规则属性" align="center" prop="propertyCode" width="100">
 				<template slot-scope="scope">
 					<dict-tag
 						:options="dict.type.qc_rule_prop"
@@ -102,18 +102,16 @@
 					/>
 				</template>
 			</el-table-column>
-			<el-table-column label="检验方式" align="center" prop="checkMode" />
+			<el-table-column label="检验方式" align="center" prop="checkMode" :show-overflow-tooltip="true" width="200"/>
 			<el-table-column label="检验工具" align="center" prop="checkTool" />
+			<el-table-column label="检验标准" align="center" prop="checkStandard" :show-overflow-tooltip="true" width="200"/>
 			<el-table-column label="单位" align="center" prop="unitCode" >
-				<template slot-scope="scope">
-					<dict-tag
-						:options="dict.type.unit"
-						:value="scope.row.unitCode"
-					/>
-				</template>
+				<template slot-scope="scope"><dict-tag :options="dict.type.unit" :value="scope.row.unitCode"/></template>
 			</el-table-column>
-			<el-table-column label="检验标准" align="center" prop="checkStandard" />
-			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+			<el-table-column label="检验标准" align="center" prop="checkStandard" :show-overflow-tooltip="true" width="200"/>
+			<el-table-column label="抽样方案" align="center" prop="samplePlan" :show-overflow-tooltip="true" width="200"/>
+			<el-table-column label="合格判定" align="center" prop="judge" :show-overflow-tooltip="true" width="200"/>
+			<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
 				<template slot-scope="scope">
 					<el-button
 						size="mini"
@@ -145,16 +143,16 @@
 		<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="100px" >
 				<el-row>
-					<el-col :span="15">
+					<el-col>
 						<el-form-item label="检验规则名称" prop="ruleName">
 							<el-input v-model="form.ruleName" placeholder="请输入检验规则名称" />
 						</el-form-item>
 					</el-col>
 				</el-row>
 				<el-row>
-					<el-col :span="15">
+					<el-col>
 						<el-form-item label="检验规则属性" prop="propertyCode">
-							<el-select v-model="form.propertyCode" placeholder="请选择检验规则属性" >
+							<el-select v-model="form.propertyCode" placeholder="请选择检验规则属性" style="width:100%">
 								<el-option
 									v-for="dict in dict.type.qc_rule_prop"
 									:key="dict.value"
@@ -165,32 +163,30 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-				<template v-if="form.propertyCode === '0'">
-					<el-row>
-						<el-col :span="15">
-							<el-form-item label="检验标准" prop="checkStandard">
-								<el-input v-model="form.checkStandard" placeholder="请输入检验标准" />
-							</el-form-item>
-						</el-col>
-					</el-row>
-				</template>
+				<el-row>
+					<el-col>
+						<el-form-item label="检验标准" prop="checkStandard">
+							<el-input type='textarea' v-model="form.checkStandard" placeholder="请输入检验标准" />
+						</el-form-item>
+					</el-col>
+				</el-row>
 				<template v-if="form.propertyCode === '1'">
 					<el-row>
-						<el-col :span="15">
+						<el-col>
 							<el-form-item label="检验方式" prop="checkMode">
-								<el-input v-model="form.checkMode" placeholder="请输入检验方式" />
+								<el-input type='textarea' v-model="form.checkMode" placeholder="请输入检验方式" />
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row>
-						<el-col :span="15">
+						<el-col>
 							<el-form-item label="检验工具" prop="checkTool">
-								<el-input v-model="form.checkTool" placeholder="请输入检验工具" />
+								<el-input type='textarea' v-model="form.checkTool" placeholder="请输入检验工具" />
 							</el-form-item>
 						</el-col>
 					</el-row>
 					<el-row>
-						<el-col :span="15">
+						<el-col>
 							<el-form-item label="单位" prop="unitCode">
 								<el-select v-model="form.unitCode" placeholder="请选择单位" >
 									<el-option
@@ -204,7 +200,20 @@
 						</el-col>
 					</el-row>
 				</template>
-				
+				<el-row>
+					<el-col>
+						<el-form-item label="抽样方案" prop="samplePlan">
+							<el-input type='textarea' v-model="form.samplePlan" placeholder="抽样方案" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col>
+						<el-form-item label="合格判定" prop="judge">
+							<el-input type='textarea' v-model="form.judge" placeholder="合格判定" />
+						</el-form-item>
+					</el-col>
+				</el-row>	
 				
 			</el-form>
 			<div slot="footer" class="dialog-footer">