@lambo-design/workflow-approve 1.0.0-beta.89 → 1.0.0-beta.90

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.89",
+  "version": "1.0.0-beta.90",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -12,8 +12,8 @@
   "devDependencies": {
     "axios": "^0.24.0",
     "axios-cache-plugin": "^0.1.0",
-    "@lambo-design/core": "^4.7.1-beta.167",
-    "@lambo-design/shared": "^1.0.0-beta.292"
+    "@lambo-design/shared": "^1.0.0-beta.293",
+    "@lambo-design/core": "^4.7.1-beta.168"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/components/assignee-box.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Modal v-model="modalBoxShow" width="1217" title="选择办理人"  @on-ok="onOk" @on-cancel="onCancel" loading>
+    <Modal v-model="modalBoxShow" width="1217" :title="title"  @on-ok="onOk" @on-cancel="onCancel" loading>
       <div class="org-info">
         <div class="org-tree" v-if="!useTransferRangeUsers">
           <div class="tree-content">
@@ -89,6 +89,7 @@ export default {
   data() {
     return {
       id: '',
+      title: '选择办理人',
       helpBoxType: 'auditTo82',
       ucAdapterType: 'x1',
       useTransferRangeUsers: false,
@@ -219,6 +220,9 @@ export default {
       this.id = id
       this.helpBoxType = helpBoxType
       this.organTreeType = organTreeType
+      if (helpBoxType === 'appointHandlerWithCandGroups'){
+        this.title = '选择候选人'
+      }
       if (data && (data.orgList || data.userList)){
         const {orgList, userList} = data
         if (orgList && orgList.length > 0){
@@ -287,6 +291,9 @@ export default {
         idSelectedArr = [...new Set(idSelectedArr)]
         const assingeeList = idSelectedArr.map(item => item.split(',')[0])
         self.$emit('add-multitask-instance', assingeeList);
+      }else if (self.helpBoxType ==='appointHandlerWithCandGroups'){
+        idSelectedArr = [...new Set(idSelectedArr)]
+        self.$emit('appoint-handler-with-candGroups', idSelectedArr, self.id);
       } else {
         if (idSelectedArr.length > 1) {
           self.loading = false
@@ -334,7 +341,7 @@ export default {
     onSelectionChange: function (selection) {
       let self = this
       // self.idSelectedArr = []
-      if (self.helpBoxType !== 'addMultitaskInstance' && selection.length > 1) {
+      if (self.helpBoxType !== 'addMultitaskInstance' && self.helpBoxType !== 'appointHandlerWithCandGroups' && selection.length > 1) {
         self.$Message.info('只能选择一条记录！')
         this.$refs.selection.selectAll(false);
       }

package/src/portrait.vue

@@ -143,6 +143,7 @@
     <assigneeBox ref="assigneeHelpBox" :execution-completed="executionCompleted"
                  @update-selected="handleSelectedUser" @update-next-node-assignee="updateNextNodeAssignee"
                  @add-multitask-instance="addMultitaskInstance" @delegate-task-assignee="delegateTask"
+                 @appoint-handler-with-candGroups="updateNextNodeCandGroups"
                  :data="assigneeBoxData" :smart-flow-server-context="smartFlowServerContext"
                  :upms-server-context="upmsServerContext"/>
     <!--  流程跟踪图弹框  -->
@@ -1933,14 +1934,14 @@ export default {
           const oldStr = oldIdList.join(',')
           const newStr = newIds.join(',')
           return oldStr !== newStr
-        }else {
+        } else {
           const allInString = oldIdList.every(item => newIds.includes(item));
           const hasExtra = newIds.some(item => !oldIdList.includes(item));
           return !allInString || hasExtra
         }
 
       }
-      return false
+      return !oldSetting !== !newSetting
     },
     checkTimeLimitUpdate(oldSetting, newSetting) {
       if (oldSetting && newSetting) {
@@ -1959,7 +1960,31 @@ export default {
     candidateGroupsReadingRangeClick(item) {
       let permScope = item.orgTreeType === this.defaultOrganTreeType ? this.permScope : 'all'
       let orgTreeType = item.orgTreeType ? item.orgTreeType : this.defaultOrganTreeType
-      this.$refs.candidateGroupsHelpBox.toggleShowHelpBox(permScope, item.candidates, orgTreeType, item.id)
+      const self = this
+      const params = {
+        procType: self.procType,
+        procId: self.procId,
+        taskNode: self.taskNode,
+        applyId: self.applyId,
+        taskId: self.curTaskId,
+        processInstanceId: self.instanceId,
+        auditGroup: self.auditGroup,
+        actionType: 'appointHandlerWithCandGroups',
+      }
+      const url = self.smartFlowServerContext + '/manage/nodeConfig/getTransferRange';
+      ajax.post(url, params).then(resp => {
+        if (resp.data.code === '200'){
+          const data = resp.data.data
+          if (data && (data.orgList || data.userList)){
+            self.$refs.assigneeHelpBox.toggleShowHelpBox(orgTreeType, permScope, 'appointHandlerWithCandGroups', item.id, data)
+          } else {
+            this.$refs.candidateGroupsHelpBox.toggleShowHelpBox(permScope, item.candidates, orgTreeType, item.id)
+          }
+        }
+      }).catch(error => {
+        self.$Message.error('获取人员范围失败');
+        console.log(error)
+      })
     },
     updateCandGroups(newCandGroups, nameStr, detail, nodeId) {
       let oldSettings = this.nextNodesOldSettings.filter(item => item.id === nodeId)[0]
@@ -1972,6 +1997,17 @@ export default {
         this.$forceUpdate()
       }
     },
+    updateNextNodeCandGroups(idSelectedArr, nodeId) {
+      const userStr = idSelectedArr.map(item => item.split(',')[0]).join(';')
+      const nameStr = idSelectedArr.map(item => item.split(',')[1]).join(',')
+      const detail = { users: idSelectedArr }
+      let node = this.nextNodesFormList.filter(item => item.id === nodeId)[0]
+      node.candidateGroups = `O:,U:${userStr},P:,R:,RP:,T:`
+      node.candidateNames = nameStr
+      node.candidates = detail
+      node.needUpdate = true
+      this.$forceUpdate()
+    },
     updateNextNodeAssignee(selectedAssigneeId, selectedAssigneeName, nodeId) {
       let oldSettings = this.nextNodesOldSettings.filter(item => item.id === nodeId)[0]
       if (oldSettings.assignee != selectedAssigneeId) {
@@ -2087,7 +2123,7 @@ export default {
           self.$refs.assigneeHelpBox.toggleShowHelpBox(organTreeType, permScope, actionType, id, data)
         }
       }).catch(error => {
-        self.$Message.error('获取交接人员范围失败');
+        self.$Message.error('获取人员范围失败');
         console.log(error)
       })
     },