|
|
@@ -116,7 +116,11 @@
|
|
|
/>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
- <el-form-item v-if="form.typeS === 10" label="指定角色" prop="roleIds">
|
|
|
+ <el-form-item
|
|
|
+ v-if="form.typeS === 10 || form.typeS === 11"
|
|
|
+ label="指定角色"
|
|
|
+ prop="roleIds"
|
|
|
+ >
|
|
|
<el-select
|
|
|
v-model="form.roleIds"
|
|
|
multiple
|
|
|
@@ -604,6 +608,8 @@
|
|
|
let res = row.variableName ? JSON.parse(row.variableName) : {};
|
|
|
this.$set(this.form, 'direction', res.direction);
|
|
|
this.$set(this.form, 'topLevel', res.topLevel);
|
|
|
+ } else if (row.type === 11) {
|
|
|
+ this.form.roleIds.push(...row.options);
|
|
|
}
|
|
|
this.open = true;
|
|
|
},
|
|
|
@@ -639,6 +645,8 @@
|
|
|
direction: form.direction,
|
|
|
topLevel: form.topLevel
|
|
|
});
|
|
|
+ } else if (form.type === 11) {
|
|
|
+ form.options = form.roleIds;
|
|
|
}
|
|
|
form.roleIds = undefined;
|
|
|
form.deptIds = undefined;
|
|
|
@@ -739,6 +747,7 @@
|
|
|
this.resetForm('taskAssignRuleForm');
|
|
|
},
|
|
|
getAssignRuleOptionName(row, option) {
|
|
|
+ console.log('row', row, option);
|
|
|
if (row.type === 10) {
|
|
|
for (const roleOption of this.roleOptions) {
|
|
|
if (roleOption.id === option) {
|
|
|
@@ -791,6 +800,12 @@
|
|
|
} else if (row.type === 80) {
|
|
|
let data = JSON.parse(row.variableName);
|
|
|
return topLevel3.find((item) => item.value == data.topLevel)?.label;
|
|
|
+ } else if (row.type === 11) {
|
|
|
+ for (const roleOption of this.roleOptions) {
|
|
|
+ if (roleOption.id === option) {
|
|
|
+ return roleOption.name;
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
return '未知(' + option + ')';
|
|
|
},
|