@lambo-design/workflow-approve 1.0.0-beta.43 → 1.0.0-beta.45

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.43",
+  "version": "1.0.0-beta.45",
   "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.149",
-    "@lambo-design/shared": "^1.0.0-beta.237"
+    "@lambo-design/shared": "^1.0.0-beta.246",
+    "@lambo-design/core": "^4.7.1-beta.154"
   },
   "dependencies": {
     "bpmn-js": "^7.3.1",

package/src/components/assignee-box.vue

@@ -4,7 +4,10 @@
       <div class="org-info">
         <div class="org-tree">
           <div class="tree-content">
-            <Tree :data="treeData" :load-data="loadData" @on-select-change="selectChange"></Tree>
+            <div v-if="treeData.length === 0">暂无数据</div>
+            <Tree v-else v-for="(item,index) in treeData" :key="index" :data="item" ref="treeBM"
+                  :load-data="loadData" @on-select-change="selectChange"></Tree>
+<!--            <Tree :data="treeData" :load-data="loadData" @on-select-change="selectChange"></Tree>-->
           </div>
         </div>
         <div class="org-detil">
@@ -74,6 +77,7 @@ export default {
     return {
       id: '',
       helpBoxType: 'transferCurTask',
+      ucAdapterType: 'x1',
       loading: false,
       organTreeType: '00',
       permScope: 'all',
@@ -110,9 +114,9 @@ export default {
       tableSearchParams: {},
     };
   },
- /* created () {
-    this.init()
-  },*/
+  created () {
+    this.getSystemConfig()
+  },
   computed: {
 
     tableColumn () {
@@ -174,15 +178,13 @@ export default {
       this.id = id
       this.helpBoxType = helpBoxType
       this.organTreeType = organTreeType
+      this.permScope = permScope
       if (permScope && permScope !== 'all'){
-        let userPermScope = permScope.substring(permScope.indexOf("U:"))
-        userPermScope = userPermScope.substring(2, userPermScope.indexOf(","))
-        if (userPermScope.length > 0) {
-          userPermScope = userPermScope.split(';')
-          this.permScope = userPermScope
-        }
+        this.getOrgTreeByProType(this.permScope, this.organTreeType)
+      } else {
+        this.permScopeList = 'all'
+        this.getRootData(organTreeType)
       }
-      this.getRootData(organTreeType)
       this.modalBoxShow = !this.modalBoxShow;
     },
 
@@ -202,7 +204,6 @@ export default {
             name: self.data.auditResultName,
           }
           self.data.selectedUserId=idSelectedArr[0];
-          console.log("self.data:",self.data);
           let url = this.smartFlowServerContext + '/manage/processTodo/audit'
           ajax.post(url, self.data).then(function (resp) {
             let result = resp.data
@@ -251,36 +252,181 @@ export default {
     },
     getRootData (organTreeType) {
       let self = this
-      let childs = []
-      let params = {
-        treeTypeId: organTreeType
+      let hostChilds = []
+      if (self.ucAdapterType === 'x1'){
+        let parentId = organTreeType == '00' ? 'rootId' : '0'
+        ajax.get(self.smartFlowServerContext + '/manage/organ/getOrgSubNodes', {
+          params: {
+            code: parentId,
+            orgTreeType: organTreeType
+          }
+        }).then(resp => {
+          if (resp.data.code === 200) {
+            let data = resp.data.data
+            if (data.length > 0) {
+              data.forEach(item => {
+                let obj = {}
+                obj.type = item.organType
+                obj.id = item.id
+                obj.organId = item.organId
+                obj.orders = item.orders
+                obj.title = item.organName
+                obj.name = item.organName
+                obj.com = item.com
+                obj.code = item.organCode
+                obj.loading = false
+                obj.children = []
+                obj.hasChild = true
+                hostChilds.push(obj)
+              })
+              self.treeData.push(hostChilds)
+              const codesSeen = new Map();
+              self.treeData = self.treeData.reduce((acc, item, index) => {
+                if (!codesSeen.has(item.code)) {
+                  codesSeen.set(item.code, index);
+                  acc.push(item);
+                }
+                return acc;
+              }, []);
+              self.selectChange(self.treeData[0])
+            }
+          }
+        }).catch(err => {
+          console.log(err);
+        })
+      } else {
+        ajax.get(self.smartFlowServerContext + '/manage/bizorgan/getOrgRootTree?bizOrganTreeType=' + organTreeType).then(resp => {
+          if (resp.data.code === 200) {
+            let data = resp.data.data
+            if (data.length > 0) {
+              for (let i = 0; i < data.length; i++) {
+                {
+                  let obj = {}
+                  obj.type = data[i].bizOrganType
+                  obj.id = data[i].id
+                  obj.organId = data[i].bizOrganId
+                  obj.orders = data[i].orders
+                  obj.title = data[i].bizOrganName
+                  obj.name = data[i].bizOrganName
+                  obj.com = data[i].bizOrganId
+                  obj.code = data[i].bizOrganCode
+                  obj.loading = false
+                  obj.children = []
+                  obj.hasChild = true
+                  hostChilds.push(obj)
+                  self.treeData.push(hostChilds);
+                  const codesSeen = new Map();
+                  self.treeData = self.treeData.reduce((acc, item, index) => {
+                    if (!codesSeen.has(item.code)) {
+                      codesSeen.set(item.code, index);
+                      acc.push(item);
+                    }
+                    return acc;
+                  }, []);
+                }
+              }
+              self.selectChange(self.treeData[0])
+            }
+          }
+        }).catch(err => {
+          console.log(err);
+        })
       }
-      ajax.get(this.upmsServerContext + '/manage/ucOrgan/getOrgRootTree', {params: params}).then(function (resp) {
-        if (resp.data.code === 1) {
-          let data = resp.data.data
-          if (data.length > 0) {
-            data.forEach(item => {
-              let obj = {}
-              obj.type = item.organType
-              obj.id = item.id
-              obj.organId = item.organId
-              obj.orders = item.orders
-              obj.title = item.organName
-              obj.name = item.organName
-              obj.com = item.com
-              obj.code = item.organCode
-              obj.loading = false
-              obj.children = []
-              obj.hasChild = true
-              childs.push(obj)
+    },
+    async getOrgTreeByProType(permScope, organTreeType){
+      let self = this
+      let userPermScope = permScope.substring(permScope.indexOf("U:"))
+      userPermScope = userPermScope.substring(2, userPermScope.indexOf(","))
+      let permScopeTwo = userPermScope.split(';')
+      if (permScopeTwo.length > 0 && permScopeTwo[0]){
+        self.permScopeList = 'U:' + userPermScope + ','
+        let promises = []
+        for (let i = 0; i < permScopeTwo.length; i++) {
+          let promise = ajax.get(self.smartFlowServerContext + "/manage/user/get/" + permScopeTwo[i] + '?treeType=' + organTreeType)
+            .then(resp => {
+              if (resp.data.code === 200) {
+                return resp.data.data.organCode
+              }
             })
+          promises.push(promise)
+        }
+        Promise.all(promises).then(async (result) => {
+          const uniqueResults = [...new Set(result.filter(Boolean))];
+          permScope = uniqueResults.join(';');
+          self.treeData = await this.getOrganTreeByProType(permScope, permScope, organTreeType);
+          self.selectChange(self.treeData[0])
+        })
+      } else {
+        //对于流程类型中没有规定人员范围但规定组织范围的情况
+        self.treeData = await this.getOrganTreeByProType(permScope, permScope.substring(2, permScope.indexOf(",")), organTreeType);
+        self.selectChange(self.treeData[0])
+      }
+    },
+    getOrganTreeByProType(row, permScope, organTreeType) {
+      return new Promise((resolve, reject) => {
+        let organTree = [];
+        let childsTree = [];
+        if (permScope && permScope.length > 0) {
+          let params = {
+            orgTreeType: organTreeType,
+          };
+          permScope = permScope.split(';');
 
-            childs[0].selected = true
-            self.selectChange(childs)
-          }
-          self.treeData = childs
+          const requests = permScope.map(perm => {
+            return ajax.get(self.smartFlowServerContext + '/manage/organ/get/' + perm, { params: params })
+              .then(resp => {
+                if (resp.data.code === 200) {
+                  return resp.data.data;
+                } else {
+                  return [];
+                }
+              })
+              .catch(err => {
+                console.error(err);
+                return [];
+              });
+          });
+
+          Promise.all(requests)
+            .then(results => {
+              results.forEach(data => {
+                if (data && data.organCode) {
+                  let obj = {
+                    type: data.organType,
+                    id: data.id,
+                    organId: data.organId,
+                    orders: data.orders,
+                    title: data.organName,
+                    name: data.organName,
+                    com: data.organId,
+                    code: data.organCode,
+                    loading: false,
+                    checked: false,
+                    children: [],
+                    hasChild: true,
+                  };
+                  childsTree.push(obj);
+                }
+              });
+
+              organTree.push(childsTree);
+              const codesSeen = new Map();
+              organTree = organTree.reduce((acc, item, index) => {
+                if (!codesSeen.has(item.code)) {
+                  codesSeen.set(item.code, index);
+                  acc.push(item);
+                }
+                return acc;
+              }, []);
+              resolve(organTree);
+            })
+            .catch(err => {
+              reject(err);
+            });
+        } else {
+          resolve([]);
         }
-      })
+      });
     },
     getData (node, callback) {
       let self = this
@@ -335,8 +481,11 @@ export default {
           self.form.organId = self.currentNode.organId
           self.form.organTitle = self.currentNode.title
 
-          let permScope = self.permScope ? self.permScope : 'all'
-          self.dataUrl =self.smartFlowServerContext+ '/manage/processDesign/getAssigneeList?orgTreeType=' + self.organTreeType + "&permScopeList=" + permScope
+          let permScopeList = self.permScopeList
+          if (permScopeList !== 'all'){
+            permScopeList += 'O:' + self.currentNode.code
+          }
+          self.dataUrl =self.smartFlowServerContext+ '/manage/user/getAssigneeList?orgTreeType=' + self.organTreeType + "&permScopeList=" + permScopeList
           self.doSearch()
 
           if (node[0].children.length <= 0) {
@@ -360,6 +509,17 @@ export default {
 
     },
 
+    getSystemConfig(){
+      const self = this
+      ajax.get(self.smartFlowServerContext + '/anon/systemConfig/getSystemConfig').then(function (resp) {
+        const result = resp.data;
+        if (result && result.code === '200') {
+          self.ucAdapterType = result.data.ucAdapterType
+        }
+      }).catch(err => {
+        console.log(err);
+      })
+    },
 
   },
 };
@@ -368,6 +528,7 @@ export default {
 <style lang="less" scope>
 .org-info{
   display: flex;
+  max-height: 700px;
   .org-tree {
     width: 265px;
     min-height: 450px;