From c01ce52351209175ef5f9d43af9b2b9cf12accf0 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Tue, 9 Apr 2024 14:29:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E8=8A=82=E7=82=B9=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/checkType/index.vue | 33 ++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/src/views/quality/checkType/index.vue b/src/views/quality/checkType/index.vue
index 2536efd..63ada14 100644
--- a/src/views/quality/checkType/index.vue
+++ b/src/views/quality/checkType/index.vue
@@ -73,6 +73,14 @@
 					/>
 				</template>
 			</el-table-column>
+      <el-table-column label="二级类型" align="center" prop="attr1" width="150">
+				<template slot-scope="scope">
+					<dict-tag
+						:options="dict.type.order_type_ll"
+						:value="scope.row.attr1"
+					/>
+				</template>
+			</el-table-column>
 			<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
 				<template slot-scope="scope">
 					<el-button
@@ -138,6 +146,20 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
+        <el-row>
+					<el-col :span="15">
+						<el-form-item v-if="form.typeCode=='material'" label="来料类别" prop="attr1">
+							<el-select v-model="form.attr1" placeholder="请输入来料类别" >
+								<el-option
+									v-for="dict in dict.type.order_type_ll"
+									:key="dict.value"
+									:label="dict.label"
+									:value="dict.value"
+								></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -184,7 +206,7 @@ import{ getSelectedUsers, addUserBind,deleteByMaterialCode} from "@/api/quality/
 import ItemSelectUser from "./selectUser.vue";
 export default {
 	name: "CheckType",
-	dicts: ["check_type"],
+	dicts: ["check_type","order_type_ll"],
   components: {
     ItemSelectUser
   },
@@ -202,6 +224,9 @@ export default {
 			// 显示搜索条件
 			showSearch: true,
       openUserBind: false,
+      materialCode: "",
+      materialName: "",
+      attr1: "",
 			// 总条数
 			total: 0,
 			// 检验节点维护表格数据
@@ -352,12 +377,13 @@ export default {
       //this.reset();
       this.userloading = true;
       let sr = row;
-      //赋值备用
+      //赋值人员选择提交时使用
       this.materialCode = sr.orderCode;
       this.materialName = sr.checkName;
+      this.attr1 = sr.attr1;
 
 			this.getUserParams.materialCode = sr.orderCode;
-			//查询母工单报工记录列表
+			//查询绑定记录表
 			getSelectedUsers(this.getUserParams).then(response => {
 				this.userList = response.rows;
 				this.openUserBind = true;
@@ -398,6 +424,7 @@ export default {
       let data = {
         materialCode: this.materialCode,
         materialName: this.materialName,
+        attr1: this.attr1,
         userCodes: [],
         userNames: [],
       }