|
|
@@ -538,7 +538,7 @@ export default {
|
|
|
return this.$store.state.theme.styleResponsive;
|
|
|
},
|
|
|
dispatchStatus() {
|
|
|
- return ((this.addForm.autoOrder && (this.model == 'add' || this.model == 'edit')) || (((!this.addForm.autoOrder && this.addForm.planStatus == 0) || (this.addForm.autoOrder &&this.addForm.planStatus == 4)) && this.model == 'dispatch'))
|
|
|
+ return ((this.addForm.autoOrder && (this.model == 'add' || this.model == 'edit')) || (((!this.addForm.autoOrder && this.addForm.planStatus == 0) || (this.addForm.autoOrder && this.addForm.planStatus == 4)) && this.model == 'dispatch'))
|
|
|
}
|
|
|
},
|
|
|
watch: {
|
|
|
@@ -830,12 +830,11 @@ export default {
|
|
|
// 处理回显数据
|
|
|
if (data.executeUserType === 0) {
|
|
|
// 个人
|
|
|
- data.executeIdList = data.executeUsers.map(
|
|
|
+ data.executeIdList = data.executeUsers?.map(
|
|
|
(item) => item.userId
|
|
|
);
|
|
|
|
|
|
- let groupIds = data.executeUsers
|
|
|
- .map((i) => i.groupId)
|
|
|
+ let groupIds = data.executeUsers?.map((i) => i.groupId)
|
|
|
.filter((i) => i);
|
|
|
groupIds = Array.from(new Set(groupIds));
|
|
|
|
|
|
@@ -843,7 +842,7 @@ export default {
|
|
|
// 包含全部部门,置空
|
|
|
data.groupId = '1';
|
|
|
} else {
|
|
|
- data.groupId = data.executeUsers[0]?.groupId || '1';
|
|
|
+ data.groupId = data.executeUsers?.[0]?.groupId || '1';
|
|
|
}
|
|
|
|
|
|
groupIds.map((item) => {
|