@lambo-design/workflow-approve 1.0.0-beta.79 → 1.0.0-beta.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.79",
+  "version": "1.0.0-beta.80",
   "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.280"
+    "@lambo-design/shared": "^1.0.0-beta.283",
+    "@lambo-design/core": "^4.7.1-beta.167"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/components/assignee-box.vue

@@ -11,9 +11,9 @@
           </div>
         </div>
         <div class="org-detil">
-          <LamboPagingTable ref="selection" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams"
-                            @on-selection-change="onSelectionChange">
-            <div slot="search">
+          <LamboPagingTable ref="selection" :data="tableData" :dataUrl="dataUrl" :columns="tableColumn" :searchParams="tableSearchParams"
+                            @on-selection-change="onSelectionChange" :page-disable="useTransferRangeUsers">
+            <div slot="search" v-if="!useTransferRangeUsers">
               <Form :label-width="60">
                 <Row>
                   <Col span="6">
@@ -91,11 +91,14 @@ export default {
       id: '',
       helpBoxType: 'transferCurTask',
       ucAdapterType: 'x1',
+      useTransferRangeUsers: false,
+      useTransferRangeOrgan: false,
       loading: false,
       organTreeType: '00',
       permScope: 'all',
       modalBoxShow: false,
       dataUrl:'',
+      tableData:[],
       helpBoxColumns: [
         {
           title: "用户ID",
@@ -192,11 +195,55 @@ export default {
       //清除表格数据
       this.doSearch()
     },
-    toggleShowHelpBox(organTreeType, permScope, helpBoxType, id) {
+    toggleShowHelpBox(organTreeType, permScope, helpBoxType, id, data) {
       this.clearData()
       this.id = id
       this.helpBoxType = helpBoxType
       this.organTreeType = organTreeType
+      if (data && (data.orgList || data.userList)){
+        const {orgList, userList} = data
+        if (orgList && orgList.length > 0){
+          this.useTransferRangeOrgan = true
+          let childs = []
+          orgList.forEach(item => {
+            let obj = {}
+            obj.organId = item.orgId
+            obj.title = item.orgName
+            obj.name = item.orgName
+            obj.code = item.orgCode
+            obj.loading = false
+            obj.children = []
+            obj.hasChild = true
+            childs.push(obj)
+          })
+          this.treeData.push(childs)
+          const codesSeen = new Map();
+          this.treeData = this.treeData.reduce((acc, item, index) => {
+            if (!codesSeen.has(item.code)) {
+              codesSeen.set(item.code, index);
+              acc.push(item);
+            }
+            return acc;
+          }, []);
+          this.selectChange(this.treeData[0])
+          this.modalBoxShow = !this.modalBoxShow;
+          this.$forceUpdate()
+          return
+        }
+        if (userList && userList.length > 0){
+          this.useTransferRangeUsers = true
+          this.tableData = userList.map(item => {
+            return {
+              ...item,
+              organName: item.deptName,
+              status: '00'
+            }
+          })
+          this.modalBoxShow = !this.modalBoxShow;
+          this.$forceUpdate()
+          return
+        }
+      }
       this.permScope = permScope
       if (permScope && permScope !== 'all'){
         this.getOrgTreeByProType(this.permScope, this.organTreeType)
@@ -645,6 +692,10 @@ export default {
             permScopeList += 'O:' + self.currentNode.code
           }
           self.dataUrl =self.smartFlowServerContext+ '/manage/user/getAssigneeList?orgTreeType=' + self.organTreeType + "&permScopeList=" + permScopeList
+
+          if (this.useTransferRangeOrgan){
+            self.dataUrl = self.upmsServerContext+ '/manage/user/list'
+          }
           self.doSearch()
 
           if (node[0].children.length <= 0) {

package/src/portrait.vue

@@ -500,6 +500,7 @@ export default {
       isExpanded: true,
       showProcessInfo: true,
       portraitWidth: 0,
+      procType: '',
       requestSuccessCodes: [200, '200'],
       auditShow: true,
       historyShow: true,
@@ -979,6 +980,7 @@ export default {
           self.appointTask = todoData.delegateStatus ? todoData.delegateStatus === '20' : false
           if (self.revokeDelegateTask) self.disable = true
           let procType = todoData.procType
+          self.procType = todoData.procType
           ajax.get(self.smartFlowServerContext + '/manage/processType/lists?proType=' + procType)
             .then(resp => {
               let data = resp.data.data.rows
@@ -1285,7 +1287,21 @@ export default {
         self.assigneeBoxData = self.auditParams
         self.assigneeBoxData.auditResultName = self.handleButtonsNames[self.auditResult]
         self.assigneeBoxData.instanceId = self.instanceId
-        self.$refs.assigneeHelpBox.toggleShowHelpBox(self.organTreeType, '', 'transferCurTask')
+        const params = {
+          procType: self.procType,
+          procId: self.procId,
+          taskNode: self.taskNode
+        }
+        const url = self.smartFlowServerContext + '/manage/nodeConfig/getTransferRange';
+        ajax.post(url, params).then(resp => {
+          if (resp.data.code === '200'){
+            const data = resp.data.data
+            self.$refs.assigneeHelpBox.toggleShowHelpBox(self.organTreeType, '', 'transferCurTask', '', data)
+          }
+        }).catch(error => {
+          self.$Message.error('获取交接人员范围失败');
+          console.log(error)
+        })
       } else if (self.auditResult === '84') {
         //委派任务
         self.$refs.assigneeHelpBox.toggleShowHelpBox(self.organTreeType, '', 'delegateTask')