Browse Source

新增流程的编辑

695593266@qq.com 1 tháng trước cách đây
mục cha
commit
10112e52b6
2 tập tin đã thay đổi với 18 bổ sung3 xóa
  1. 16 1
      src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue
  2. 2 2
      vue.config.js

+ 16 - 1
src/views/bpm/taskAssignRule/taskAssignRuleDialog.vue

@@ -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 + ')';
       },

+ 2 - 2
vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
         // target: 'http://192.168.1.3:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.176:18086',
-        // target: 'http://192.168.1.125:18086',
+        target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:51005',
         // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.251:18086',
@@ -49,7 +49,7 @@ module.exports = {
         // target: 'http://192.168.1.116:18086', // 赵沙金
         // target: 'http://aiot.zoomwin.com.cn:51001/api',
         // target: 'http://f222326r53.imwork.net',
-        target: 'http://aiot.zoomwin.com.cn:51005/api',
+        // target: 'http://aiot.zoomwin.com.cn:51005/api',
 
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {