flowable-engine-web/src/views/common/process/config/ApprovalNodeConfig.vue

@@ -6,8 +6,9 @@
           <el-radio v-for="item in approvalTypes" :label="item.type" :key="item.type">{{ item.name }}</el-radio>
         </el-radio-group>
         <div v-if="nodeProps.assignedType === 'ASSIGN_USER'">
-          <el-button size="mini" icon="el-icon-plus" type="primary" @click="selectUser" round>选择人员</el-button>
+          <el-button size="mini" icon="el-icon-plus" type="primary" @click="$refs.userPicker.showUserPicker()" round>选择人员</el-button>
-          <avatar-ellipsis :row="3" :user-info="nodeProps.assignedUser"/>
+          <user-picker title="请选择系统角色" :multiple="false" ref="userPicker" :v-model="assignedUser" @ok="selectedUser"/>
+          <avatar-ellipsis :row="3" :user-info="assignedUser"/>
         </div>
         <div v-else-if="nodeProps.assignedType === 'SELF_SELECT'">
           <el-radio-group size="mini" v-model="nodeProps.selfSelect.multiple">
@@ -40,7 +41,8 @@
           </el-form-item>
         </div>
         <div v-else-if="nodeProps.assignedType === 'ROLE'">
-          <el-button size="mini" icon="el-icon-plus" type="primary" @click="selectRole" round>选择系统角色</el-button>
+          <el-button size="mini" icon="el-icon-plus" type="primary" @click="$refs.rolePicker.showRolePicker()" round>选择系统角色</el-button>
+          <role-picker title="请选择人员" :multiple="false" ref="rolePicker" :v-model="roleList" @ok="selectedRole"/>
           <role-items v-model="nodeProps.roleList"/>
         </div>
         <div v-else-if="nodeProps.assignedType === 'FORM_USER'">
@@ -64,12 +66,11 @@
           <el-radio label="TO_ADMIN">转交审批管理员</el-radio>
           <el-radio label="TO_USER">转交到指定人员</el-radio>
         </el-radio-group>
-
         <div style="margin-top: 10px" v-if="nodeProps.nobody.handler === 'TO_USER'">
-          <el-button size="mini" icon="el-icon-plus" type="primary" @click="selectNoSetUser" round>选择人员</el-button>
+          <el-button size="mini" icon="el-icon-plus" type="primary" @click="$refs.toUserPicker.showUserPicker()" round>选择人员</el-button>
-          <org-items v-model="nodeProps.assignedUser"/>
+          <user-picker title="请指定用户" :multiple="false" ref="toUserPicker" :v-model="nobodyAssignedUser" @ok="selectNoSetUser"/>
+          <avatar-ellipsis :row="3" :user-info="nobodyAssignedUser"/>
         </div>
-
       </el-form-item>
 
       <div v-if="showMode">
@@ -134,8 +135,6 @@
       </el-form-item>
     </el-form>
 
-    <role-picker title="请选择人员" multiple ref="rolePicker" :v-model="roleList" @ok="selectedRole"/>
-    <user-picker title="请选择系统角色" multiple ref="userPicker" :v-model="assignedUser" @ok="selectedUser"/>
 
   </div>
 </template>
@@ -144,12 +143,11 @@
 import RolePicker from "@/components/common/RolePicker";
 import UserPicker from "@/components/common/UserPicker";
 import RoleItems from "../RoleItems";
-import OrgItems from "../OrgItems";
 
 
 export default {
   name: "ApprovalNodeConfig",
-  components: {RoleItems, OrgItems, RolePicker, UserPicker},
+  components: {RoleItems, RolePicker, UserPicker},
   props: {
     config: {
       type: Object,
@@ -185,6 +183,14 @@ export default {
         this.config.assignedUser = val
       }
     },
+    nobodyAssignedUser: {
+      get() {
+        return this.config.nobody.assignedUser || [];
+      },
+      set(val) {
+        this.config.nobody.assignedUser = val
+      }
+    },
     roleList: {
       get() {
         return this.config.roleList || [];
@@ -217,7 +223,6 @@ export default {
         case "LEADER_TOP":
           return this.nodeProps.formUser !== "";
         case "FORM_USER":
-          return true;
         case "ROLE":
           return true;
         default:
@@ -226,15 +231,17 @@ export default {
     }
   },
   methods: {
-    selectUser() {
+    selectNoSetUser(select) {
-      this.$refs.userPicker.showUserPicker()
+      let userInfoList = []
-    },
+      for (let val of select) {
-    selectNoSetUser() {
+        let userInfo = {
-
+          id: val.id,
-    },
+          name: val.name,
-    //弹出角色选择器,选择系统角色
+          avatar: val.avatar,
-    selectRole() {
+        }
-      this.$refs.rolePicker.showRolePicker();
+        userInfoList.push(userInfo)
+      }
+      this.nobodyAssignedUser = userInfoList
     },
     selectedRole(select) {
       this.roleList = select