|
@@ -654,6 +654,7 @@
|
|
|
]
|
|
]
|
|
|
},
|
|
},
|
|
|
executorList: [],
|
|
executorList: [],
|
|
|
|
|
+ defaultExecuteUsers: [],
|
|
|
uerList: [],
|
|
uerList: [],
|
|
|
// 执行方式列表
|
|
// 执行方式列表
|
|
|
executeMethodList: [],
|
|
executeMethodList: [],
|
|
@@ -673,7 +674,7 @@
|
|
|
},
|
|
},
|
|
|
computed: {
|
|
computed: {
|
|
|
dispatchStatus() {
|
|
dispatchStatus() {
|
|
|
- return (this.addForm.autoOrder && (this.type == 'add' || this.type == 'edit' || this.type == 'detail')) || (!this.addForm.autoOrder && this.type == 'dispatch')
|
|
|
|
|
|
|
+ return (this.addForm.autoOrder && (this.type == 'add' || this.type == 'edit' || this.type == 'detail' || this.type == 'dispatch')) || (!this.addForm.autoOrder && this.type == 'dispatch')
|
|
|
},
|
|
},
|
|
|
// 当前用户信息
|
|
// 当前用户信息
|
|
|
loginUser() {
|
|
loginUser() {
|
|
@@ -837,6 +838,7 @@
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
created() {
|
|
created() {
|
|
|
|
|
+ this.getDefaultExecuteUsers();
|
|
|
// 获取审核人列表、巡点检人员
|
|
// 获取审核人列表、巡点检人员
|
|
|
this.getUserList();
|
|
this.getUserList();
|
|
|
// 获取所有班组
|
|
// 获取所有班组
|
|
@@ -969,6 +971,12 @@
|
|
|
this.addForm.groupId = null;
|
|
this.addForm.groupId = null;
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
+ getDefaultExecuteUsers() {
|
|
|
|
|
+ let data = { pageNum: 1, size: -1 };
|
|
|
|
|
+ getUserPage(data).then(res => {
|
|
|
|
|
+ this.defaultExecuteUsers = res.list;
|
|
|
|
|
+ });
|
|
|
|
|
+ },
|
|
|
// 获取审核人列表、巡点检人员
|
|
// 获取审核人列表、巡点检人员
|
|
|
async getUserList(params) {
|
|
async getUserList(params) {
|
|
|
try {
|
|
try {
|
|
@@ -1217,7 +1225,7 @@
|
|
|
// 负责人变更 同步执行人列表
|
|
// 负责人变更 同步执行人列表
|
|
|
executeIdListChange() {
|
|
executeIdListChange() {
|
|
|
this.addForm.executeUsers = this.addForm.executeIdList.map((userId) => {
|
|
this.addForm.executeUsers = this.addForm.executeIdList.map((userId) => {
|
|
|
- const user = this.executorList.find((u) => u.id === userId);
|
|
|
|
|
|
|
+ const user = this.defaultExecuteUsers.find((u) => u.id === userId);
|
|
|
return {
|
|
return {
|
|
|
userId: user.id,
|
|
userId: user.id,
|
|
|
userName: user.name,
|
|
userName: user.name,
|