diff --git a/src/api/quality/userbind.js b/src/api/quality/userbind.js
index 3c00e06..71c36a9 100644
--- a/src/api/quality/userbind.js
+++ b/src/api/quality/userbind.js
@@ -17,6 +17,13 @@ export function getProduct(userCode) {
});
}
+export function getInfoById(id) {
+ return request({
+ url: '/quality/material/getInfoById/' + id,
+ method: 'get'
+ });
+}
+
// 新增用户物料关联
export function addProduct(data) {
return request({
diff --git a/src/views/quality/checkType/index.vue b/src/views/quality/checkType/index.vue
index 63ada14..313b689 100644
--- a/src/views/quality/checkType/index.vue
+++ b/src/views/quality/checkType/index.vue
@@ -73,14 +73,6 @@
/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
import { listCheckType, getCheckType, delCheckType, addCheckType, updateCheckType } from "@/api/quality/checkType";
-import{ getSelectedUsers, addUserBind,deleteByMaterialCode} from "@/api/quality/userbind";
+import{ getSelectedUsers, addUserBind, getInfoById, updateProduct, deleteByMaterialCode} from "@/api/quality/userbind";
import ItemSelectUser from "./selectUser.vue";
export default {
name: "CheckType",
@@ -224,8 +229,11 @@ export default {
// 显示搜索条件
showSearch: true,
openUserBind: false,
+ msOpen: false,
+ msTitle: "",
materialCode: "",
materialName: "",
+ msShowButton: false,
attr1: "",
// 总条数
total: 0,
@@ -258,6 +266,7 @@ export default {
materialName: null,
phonenumber: null,
},
+ msForm:{},
// 表单参数
form: {},
// 表单校验
@@ -286,6 +295,10 @@ export default {
this.open = false;
this.reset();
},
+ msCancel() {
+ this.msOpen = false;
+ this.msReset();
+ },
// 表单重置
reset() {
this.form = {
@@ -304,6 +317,15 @@ export default {
};
this.resetForm("form");
},
+ msReset() {
+ this.msForm = {
+ id: null,
+ userCode: null,
+ userName: null,
+ attr1: null,
+ };
+ this.resetForm("msForm");
+ },
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
@@ -376,22 +398,54 @@ export default {
handleBind(row){
//this.reset();
this.userloading = true;
- let sr = row;
//赋值人员选择提交时使用
- this.materialCode = sr.orderCode;
- this.materialName = sr.checkName;
- this.attr1 = sr.attr1;
+ this.materialCode = row.orderCode;
+ this.materialName = row.checkName;
+ this.attr1 = row.attr1;
- this.getUserParams.materialCode = sr.orderCode;
+ this.getUserParams.materialCode = row.orderCode;
//查询绑定记录表
getSelectedUsers(this.getUserParams).then(response => {
this.userList = response.rows;
+ if(this.materialCode ==="checkTypeLL") {
+ this.msShowButton = true;
+ }else {
+ this.msShowButton = false;
+ }
this.openUserBind = true;
this.titleUserBind = "人员绑定详情";
this.userloading = false;
});
},
+ //来料类型修改
+ handleEdit(row) {
+ this.msReset();
+ const id = row.id;
+ getInfoById(id).then(response => {
+ this.msForm = response.data;
+ this.msOpen = true;
+ this.msTitle = "来料类型分配";
+ });
+ },
+ //来料类型提交
+ msSubmitForm() {
+ this.$refs["msForm"].validate(valid => {
+ if (valid) {
+ if (this.msForm.id != null) {
+ updateProduct(this.msForm).then(response => {
+ if(response.code === 200){
+ this.$modal.msgSuccess("分配成功");
+ }else{
+ this.$modal.msgError(response.msg);
+ }
+ this.msOpen = false;
+ this.getSelectUserList();
+ });
+ }
+ }
+ });
+ },
getSelectUserList() {
this.userloading = true;