From f82ec137e511729b91e648ee00c3eb92faef8ad8 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Wed, 25 Oct 2023 16:11:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=BB=91=E5=AE=9A=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/checkType/index.vue        | 14 +++----------
 src/views/quality/checkTypeProject/index.vue | 17 +++------------
 src/views/quality/material/index.vue         | 22 +++++++++-----------
 src/views/quality/material/userbind.vue      |  2 +-
 4 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/src/views/quality/checkType/index.vue b/src/views/quality/checkType/index.vue
index 10aac8a..26b8a43 100644
--- a/src/views/quality/checkType/index.vue
+++ b/src/views/quality/checkType/index.vue
@@ -1,14 +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-item label="流程编号" prop="order">
-				<el-input
-					v-model="queryParams.order"
-					placeholder="请输入流程编号"
-					clearable
-					@keyup.enter.native="handleQuery"
-				/>
-			</el-form-item>
 			<el-form-item label="名称" prop="checkName">
 				<el-input
 					v-model="queryParams.checkName"
@@ -17,8 +9,8 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="类型名称" prop="typeName">
-				<el-select v-model="form.typeName" placeholder="请输入类型名称" >
+			<el-form-item label="类型名称" prop="typeCode">
+				<el-select v-model="queryParams.typeCode" clearable placeholder="请输入类型名称" >
 					<el-option
 						v-for="dict in dict.type.check_type"
 						:key="dict.value"
@@ -121,7 +113,7 @@
 				</el-row>
 				<el-row>
 					<el-col :span="15">
-						<el-form-item label="类型名称" prop="typeName">
+						<el-form-item label="类型名称" prop="typeCode">
 							<el-select v-model="form.typeCode" placeholder="请输入类型名称" >
 								<el-option
 									v-for="dict in dict.type.check_type"
diff --git a/src/views/quality/checkTypeProject/index.vue b/src/views/quality/checkTypeProject/index.vue
index 04a5d88..396713c 100644
--- a/src/views/quality/checkTypeProject/index.vue
+++ b/src/views/quality/checkTypeProject/index.vue
@@ -24,18 +24,10 @@
           v-show="showSearch"
           label-width="100px"
         >
-          <el-form-item label="预留字段1" prop="attr1">
+          <el-form-item label="检验规则名称" prop="ruleName">
             <el-input
-              v-model="queryParams.attr1"
-              placeholder="请输入预留字段1"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="工厂编码" prop="factoryCode">
-            <el-input
-              v-model="queryParams.factoryCode"
-              placeholder="请输入工厂编码"
+              v-model="queryParams.ruleName"
+              placeholder="请输入检验规则名称"
               clearable
               @keyup.enter.native="handleQuery"
             />
@@ -286,9 +278,6 @@ export default {
         projectId: [
           { required: true, message: "检验项目id不能为空", trigger: "blur" },
         ],
-        factoryCode: [
-          { required: true, message: "工厂编码不能为空", trigger: "blur" },
-        ],
       },
     };
   },
diff --git a/src/views/quality/material/index.vue b/src/views/quality/material/index.vue
index 4c54cc3..9f29016 100644
--- a/src/views/quality/material/index.vue
+++ b/src/views/quality/material/index.vue
@@ -9,10 +9,10 @@
 					@keyup.enter.native="handleQuery"
 				/>
 			</el-form-item>
-			<el-form-item label="物料名称" prop="materialName">
+			<el-form-item label="联系方式" prop="phonenumber">
 				<el-input
-					v-model="queryParams.materialName"
-					placeholder="请输入物料名称"
+					v-model="queryParams.phonenumber"
+					placeholder="请输入联系方式"
 					clearable
 					@keyup.enter.native="handleQuery"
 				/>
@@ -79,11 +79,8 @@
 		<!-- 添加或修改人员物料绑定对话框 -->
 		<el-dialog :title="title" :visible.sync="open" width="960px" append-to-body>
 			<el-form ref="form" :model="form" :rules="rules" label-width="80px">
-				<el-form-item label="员工编码" prop="userCodes">
-					<el-input v-model="form.userCodes" placeholder="请输入员工编码" />
-				</el-form-item>
-				<el-form-item label="员工名称" prop="userName">
-					<el-input v-model="form.userName" placeholder="请输入员工名称" />
+				<el-form-item label="用户编码" prop="userCodes">
+					<el-input v-model="form.userCodes" disabled placeholder="请输入用户编码" />
 				</el-form-item>
 			</el-form>
 			<el-tabs type="border-card" v-if="form.userCodes != null">
@@ -101,11 +98,11 @@
 
 <script>
 import { listMaterial, getMaterial, delMaterial, addMaterial, updateMaterial } from "@/api/quality/material";
-import Userbind from "./UserBind.vue";
+import UserBind from "./UserBind.vue";
 
 export default {
 	name: "Material",
-	components: {Userbind},
+	components: {UserBind},
 	data() {
 		return {
 			// 遮罩层
@@ -136,10 +133,10 @@ export default {
 				materialCode: null,
 				materialName: null,
 				materialNames: null,
+				phonenumber: null,
 				attr1: null,
 				attr2: null,
 				attr3: null,
-				attr4: null,
 				factoryCode: null,
 			},
 			// 表单参数
@@ -169,6 +166,7 @@ export default {
 		cancel() {
 			this.open = false;
 			this.reset();
+			this.getList();
 		},
 		// 表单重置
 		reset() {
@@ -180,10 +178,10 @@ export default {
 				materialCode: null,
 				materialName: null,
 				materialNames: null,
+				phonenumber: null,
 				attr1: null,
 				attr2: null,
 				attr3: null,
-				attr4: null,
 				createBy: null,
 				createTime: null,
 				updateBy: null,
diff --git a/src/views/quality/material/userbind.vue b/src/views/quality/material/userbind.vue
index 1a0ca33..4bd731d 100644
--- a/src/views/quality/material/userbind.vue
+++ b/src/views/quality/material/userbind.vue
@@ -84,7 +84,7 @@
 import { getListProduct,getRightList ,addProduct, updateProduct, getProduct, delProduct} from "@/api/quality/userbind";
 
 export default {
-  name: "Userbind",
+  name: "UserBind",
 
   data() {
     return {