From 743aa13aa39dc608779c67b29e83fd4eb9387699 Mon Sep 17 00:00:00 2001
From: shaoyong <yorkshao@163.com>
Date: Mon, 18 Mar 2024 14:27:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E7=9B=AE=E6=A0=87=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E4=BA=BA=E5=91=98=E7=BA=BF=E4=BD=93=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/quality/material/index.vue      | 26 ++++++++++--------
 src/views/quality/material/userbind.vue   | 33 +++++++++++++++++------
 src/views/quality/qcGoal/distribution.vue |  1 -
 src/views/quality/qcGoal/index.vue        |  6 ++---
 4 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/src/views/quality/material/index.vue b/src/views/quality/material/index.vue
index 698d86d..5ab80c5 100644
--- a/src/views/quality/material/index.vue
+++ b/src/views/quality/material/index.vue
@@ -84,17 +84,18 @@
 			</el-form>
 			<el-tabs type="border-card" v-if="form.userCodes != null">
 				<el-tab-pane label="关联物料">
-					<UserBind v-if="form.userCodes != null"
-					:optType="optType"
+					<UserBind ref="userBind" 
+					v-if="form.userCodes != null"
 					:userCodes="form.userCodes"
 					:userNames="form.userNames"
+					:handleCode="handleCode"
 					>
 					</UserBind>
 				</el-tab-pane>
 			</el-tabs>
 			<div slot="footer" class="dialog-footer">
 				<el-button type="primary" @click="submitForm">确 定</el-button>
-				<el-button @click="cancel">取 消</el-button>
+				<!-- <el-button @click="cancel">取 消</el-button> -->
 			</div>
 		</el-dialog>
 	</div>
@@ -113,12 +114,14 @@ export default {
 			loading: true,
 			// 选中数组
 			ids: [],
+			names: [],
 			// 非单个禁用
 			single: true,
 			// 非多个禁用
 			multiple: true,
 			// 显示搜索条件
 			showSearch: true,
+			handleCode: '',
 			// 总条数
 			total: 0,
 			// 人员物料绑定表格数据
@@ -210,32 +213,33 @@ export default {
 		// 多选框选中数据
 		handleSelectionChange(selection) {
 			this.ids = selection.map(item => item.userCode)
+			this.names = selection.map(item => item.userName)
+			this.handleCode = names.toString();
 			this.single = selection.length!==1
 			this.multiple = !selection.length
+			
 		},
 		/** 新增按钮操作 */
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = "添加人员物料绑定";
+			this.title = "添加人员线体绑定";
 		},
 		/** 绑定按钮操作 */
 		handleUpdate(row) {
 			this.reset();
 			const userCodes = row.userCode || this.ids;
-			const userNames = row.userName;
+			const userNames = row.userName || this.names;
 			this.form.userCodes = userCodes;
 			this.form.userNames = userNames;
 			this.open = true;
-			this.title = "修改人员物料绑定";
-			this.optType = "edit";
-			// getMaterial(userCode).then(response => {
-
-			// });
+			this.title = "修改人员线体绑定";
 		},
 		/** 提交按钮 */
 		submitForm() {
 			this.open = false;
+			this.$refs.userBind.liftList = [];
+			this.$refs.userBind.rightList = [];
 			this.getList();
 			/* this.$refs["form"].validate(valid => {
 				if (valid) {
@@ -258,7 +262,7 @@ export default {
 		/** 删除按钮操作 */
 		handleDelete(row) {
 			const ids = row.userCode || this.ids;
-			this.$modal.confirm('是否确认删除人员物料绑定编号为"' + ids + '"的数据项？').then(function() {
+			this.$modal.confirm('是否确认删除人员线体绑定编号为"' + ids + '"的数据项？').then(function() {
 				return delMaterial(ids);
 			}).then(() => {
 				this.getList();
diff --git a/src/views/quality/material/userbind.vue b/src/views/quality/material/userbind.vue
index b56b227..5efc4e7 100644
--- a/src/views/quality/material/userbind.vue
+++ b/src/views/quality/material/userbind.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-loading.lock="loading">
     <div class="query">
       <el-input
         style="width: 351px; margin-bottom: 10px"
@@ -108,7 +108,7 @@
 import { getListProduct,getRightList ,addProduct} from "@/api/quality/userbind";
 
 export default {
-  name: "Routeprodproduct",
+  name: "userBind",
 
   data() {
     return {
@@ -136,8 +136,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        userCode: this.userCodes,
-        userName: this.userNames,
+        userCodes: this.userCodes,
+        userNames: this.userNames,
         itemId: null,
         itemCode: null,
         materialName: null,
@@ -187,14 +187,31 @@ export default {
     };
   },
   props: {
-    userCodes: undefined,
-    userNames: undefined,
-    optType: undefined,
+    userCodes: {
+      type: [Array],  
+      required: true  
+    },
+    userNames: {
+      type: [Array],  
+      required: true  
+    },
+    handleCode: {
+      type: [String],  
+      required: true  
+    }
   },
   created() {
     this.getList();
     this.getRightListFun();
   },
+  watch: {
+    handleCode(newVal,oldVal) {
+      if(newVal !== oldVal) {
+        this.getList();
+        this.getRightListFun();
+      }
+    }
+  },
   methods: {
     // // 穿梭框搜索
     // filterMethod(keyword, row) {
@@ -293,7 +310,7 @@ export default {
 
     /** 提交按钮 */
     handleChange(value, direction, movedKeys) {
-      if (this.queryParams.userCode != null) {
+      if (this.queryParams.userCodes != null) {
         this.queryParams.selectedValues = value;
         addProduct(this.queryParams).then((response) => {
           this.$modal.msgSuccess("关联成功");
diff --git a/src/views/quality/qcGoal/distribution.vue b/src/views/quality/qcGoal/distribution.vue
index db29cc4..e8d0c51 100644
--- a/src/views/quality/qcGoal/distribution.vue
+++ b/src/views/quality/qcGoal/distribution.vue
@@ -201,7 +201,6 @@ export default {
   },
   watch: {
     belongGoalId(newVal,oldVal) {
-      console.log(newVal);
       if(newVal !== oldVal) {
         this.getList();
         this.getRightListFun();
diff --git a/src/views/quality/qcGoal/index.vue b/src/views/quality/qcGoal/index.vue
index 760c6f8..997648e 100644
--- a/src/views/quality/qcGoal/index.vue
+++ b/src/views/quality/qcGoal/index.vue
@@ -321,7 +321,7 @@ export default {
 			showSearch: true,
 			// 总条数
 			total: 0,
-			// 检验方案维护表格数据
+			// 质量目标维护表格数据
 			qcGoalList: [],
 			checkTypeList: [],
 			checkTypes: [],
@@ -446,7 +446,7 @@ export default {
 		handleAdd() {
 			this.reset();
 			this.open = true;
-			this.title = "添加检验方案维护";
+			this.title = "添加质量目标";
 			// 新增时添加默认值
 			this.form.goalType="yyyy"
 		},
@@ -457,7 +457,7 @@ export default {
 			getQcGoal(id).then(response => {
 				this.form = response.data;
 				this.open = true;
-				this.title = "修改检验方案维护";
+				this.title = "修改质量目标";
 				this.handleCheckTypeList(this.form.typeCode);
 			});
 		},