@lambo-design/workflow-approve 1.0.0-beta.42 → 1.0.0-beta.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/workflow-approve",
-  "version": "1.0.0-beta.42",
+  "version": "1.0.0-beta.44",
   "description": "",
   "main": "index.js",
   "author": "lambo",
@@ -13,7 +13,7 @@
     "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.240"
   },
   "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;

package/src/components/candidate-groups-box.vue

@@ -398,13 +398,13 @@ export default {
       let organTree = []
       if (self.ucAdapterType == 'x1'){
         let parentId = organTreeType == '00' ? 'rootId' : '0'
-        ajax.get(self.upmsServerContext + '/manage/ucOrgan/getOrgSubNodes', {
+        ajax.get(self.smartFlowServerContext + '/manage/organ/getOrgSubNodes', {
           params: {
-            organCode: 'rootId',
+            code: parentId,
             orgTreeType: organTreeType
           }
         }).then(resp => {
-          if (resp.data.code === 1) {
+          if (resp.data.code === 200) {
             let data = resp.data.data
             if (data.length > 0) {
               data.forEach(item => {
@@ -439,24 +439,24 @@ export default {
           }
         })
       } else {
-        ajax.get(self.upmsServerContext + '/manage/ucOrgan/getOrgRootTree', {
+        ajax.get(self.smartFlowServerContext + '/manage/bizorgan/getOrgRootTree', {
           params: {
-            treeTypeId: organTreeType
+            bizOrganTreeType: organTreeType
           }
         }).then(resp => {
-          if (resp.data.code === 1) {
+          if (resp.data.code === 200) {
             let data = resp.data.data
             if (data.length > 0) {
               data.forEach(item => {
                 let obj = {}
-                obj.type = item.organType
+                obj.type = item.bizOrganType
                 obj.id = item.id
-                obj.organId = item.organId
+                obj.organId = item.bizOrganId
                 obj.orders = item.orders
-                obj.title = item.organName
-                obj.name = item.organName
-                obj.com = item.com
-                obj.code = item.organCode
+                obj.title = item.bizOrganName
+                obj.name = item.bizOrganName
+                obj.com = item.bizOrganId
+                obj.code = item.bizOrganCode
                 obj.loading = false
                 obj.children = []
                 obj.hasChild = true
@@ -475,181 +475,107 @@ export default {
             }, []);
             self.readingRangeBM = JSON.parse(JSON.stringify(organTree))
             self.readingRange = JSON.parse(JSON.stringify(organTree))
-            self.readingRangePost = JSON.parse(JSON.stringify(organTree))
           }
         })
       }
     },
     //获取组织
-    getReadingRangeBM(row, info, organTreeType) {
+    async getReadingRangeBM(row, info, organTreeType) {
       let self = this
-      let childsTree = []
-      let permScopeTwo = row.substring(2, row.indexOf(","))
-      if (permScopeTwo.length > 0) {
-        permScopeTwo = permScopeTwo.split(';')
-        for (let i = 0; i < permScopeTwo.length; i++) {
-          ajax.get(self.upmsServerContext + '/manage/ucOrgan/getParentOrgInfo?organCode=' + permScopeTwo[i] + '&orgTreeType=' + self.organTreeType)
+      self.readingRangeBM = await self.getOrganTreeByProType(row, row.substring(2, row.indexOf(",")), organTreeType);
+    },
+    getOrganTreeByProType(row, permScope, organTreeType) {
+      const self = this;
+      return new Promise((resolve, reject) => {
+        let organTree = [];
+        let childsTree = [];
+        if (permScope && permScope.length > 0) {
+          let params = {
+            orgTreeType: organTreeType,
+          };
+          permScope = permScope.split(';');
+
+          const requests = permScope.map(perm => {
+            return ajax.get(self.smartFlowServerContext + '/manage/organ/get/' + perm, { params: params })
               .then(resp => {
-                if (resp.data.code === 1 || resp.data.code === 200){
-                  let orgCode = resp.data.data.organCode
-                  ajax.get(self.upmsServerContext + '/manage/ucOrgan/getOrgSubNodes?organCode=' + orgCode + '&orgTreeType=' + organTreeType).then(function (resp) {
-                    if (resp.data.code === 1) {
-                      let data = resp.data.data
-                      if (data && data.length > 0) {
-                        data.forEach(item => {
-                          if (item.organCode === permScopeTwo[i]) {
-                            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
-                            childsTree.push(obj)
-                          }
-                        })
-                      }
-                    }
-                  })
-                }  else if (resp.data.data === '11006'){
-                  //当前组织无父节点
-                  let params = {
-                    orgTreeType: organTreeType,
-                  }
-                  ajax.post(self.upmsServerContext + "/manage/org/get/" + permScopeTwo[i], params)
-                      .then(resp => {
-                        let data = resp.data.data
-                        let obj = {}
-                        obj.type = data.organType
-                        obj.id = data.organId
-                        obj.orders = data.orders
-                        obj.title = data.organName
-                        obj.name = data.organName
-                        obj.com = data.com
-                        obj.code = data.organCode
-                        obj.loading = false
-                        obj.children = []
-                        obj.hasChild = true
-                        childsTree.push(obj)
-                      })
+                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([]);
         }
-        self.readingRangeBM.push(childsTree)
-        const codesSeen = new Map();
-        self.readingRangeBM = self.readingRangeBM.reduce((acc, item, index) => {
-          if (!codesSeen.has(item.code)) {
-            codesSeen.set(item.code, index);
-            acc.push(item);
-          }
-          return acc;
-        }, []);
-      }
+      });
     },
     //获取人员树信息
-    getReadingRange(row, organTreeType) {
+    async getReadingRange(row, organTreeType) {
       let self = this
-      let childsTree = []
-      let treeValue = []
-      var permScope = row.substring(row.indexOf("U:"))
-      permScope = permScope.substring(2, permScope.indexOf(","))
-      let permScopeTwo = permScope.split(';')
-      for (let i = 0; i < permScopeTwo.length; i++) {
-        ajax.get(self.upmsServerContext + "/manage/user/get/" + permScopeTwo[i] + '?treeType=' + organTreeType)
+      let permScope
+      let userPermScope = row.substring(row.indexOf("U:"))
+      userPermScope = userPermScope.substring(2, userPermScope.indexOf(","))
+      let permScopeTwo = userPermScope.split(';')
+      if (permScopeTwo.length > 0 && permScopeTwo[0]){
+        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 == 1) {
-                let organCode = resp.data.data.organCode
-                ajax.get(self.upmsServerContext + '/manage/ucOrgan/getParentOrgInfo?organCode=' + organCode + '&orgTreeType=' + organTreeType)
-                    .then(resp => {
-                      if (resp.data.code === 1 || resp.data.code === 200){
-                        let orgCode = resp.data.data.organCode
-                        ajax.get(self.upmsServerContext + '/manage/ucOrgan/getOrgSubNodes?organCode=' + orgCode + '&orgTreeType=' + organTreeType).then(function (resp) {
-                          if (resp.data.code === 1) {
-                            let data = resp.data.data
-                            if (data && data.length > 0) {
-                              data.forEach(item => {
-                                if (item.organCode == organCode) {
-                                  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.organId
-                                  obj.code = item.organCode
-                                  obj.loading = false
-                                  obj.checked = false
-                                  obj.children = []
-                                  obj.hasChild = true
-                                  childsTree.push(obj)
-                                }
-                              })
-                            }
-                            const map = new Map()
-                            treeValue = childsTree.filter((item) => {
-                              return !map.has(item.code) && map.set(item.code, true)
-                            })
-                            if (i === permScopeTwo.length - 1) {
-                              self.readingRange.push(treeValue)
-                              const codesSeen = new Map();
-                              self.readingRange = self.readingRange.reduce((acc, item, index) => {
-                                if (!codesSeen.has(item.code)) {
-                                  codesSeen.set(item.code, index);
-                                  acc.push(item);
-                                }
-                                return acc;
-                              }, []);
-                            }
-                          }
-                        })
-                      } else if (resp.data.data === 11006){
-                        //当前组织无父节点
-                        let params = {
-                          orgTreeType: organTreeType,
-                        }
-                        ajax.post(self.upmsServerContext + "/manage/org/get/" + organCode, params)
-                            .then(resp => {
-                              let data = resp.data.data
-                              let obj = {}
-                              obj.type = data.organType
-                              obj.id = data.organId
-                              obj.orders = data.orders
-                              obj.title = data.organName
-                              obj.name = data.organName
-                              obj.com = data.organId
-                              obj.code = data.organCode
-                              obj.loading = false
-                              obj.checked = false
-                              obj.children = []
-                              obj.hasChild = true
-                              childsTree.push(obj)
-
-                              const map = new Map()
-                              treeValue = childsTree.filter((item) => {
-                                return !map.has(item.code) && map.set(item.code, true)
-                              })
-                              if (i === permScopeTwo.length-1){
-                                self.readingRange.push(treeValue)
-                                const codesSeen = new Map();
-                                self.readingRange = self.readingRange.reduce((acc, item, index) => {
-                                  if (!codesSeen.has(item.code)) {
-                                    codesSeen.set(item.code, index);
-                                    acc.push(item);
-                                  }
-                                  return acc;
-                                }, []);
-                              }
-                            })
-                      }
-                    })
+              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.readingRange = await this.getOrganTreeByProType(row, permScope, organTreeType);
+        })
+      } else {
+        //对于流程类型中没有规定人员范围但规定组织范围的情况
+        self.readingRange = await this.getOrganTreeByProType(row, row.substring(2, row.indexOf(",")), organTreeType);
       }
 
     },
@@ -659,7 +585,7 @@ export default {
       self.roleList = []
       if (row == 'undefined' || row == "all") {
         self.optionRoleArr = [];
-        ajax.get(self.smartFlowServerContext + "/manage/processDesign/getrolesbyUserId")
+        ajax.get(self.smartFlowServerContext + "/manage/role/getrolesbyUserId")
           .then(function (resp) {
             if (resp.data.data.code === 200) {
               resp.data.data.data.forEach(role => {
@@ -681,103 +607,68 @@ export default {
         permScope = permScope.substring(2, permScope.indexOf(","))
         permScope = permScope.split(';')
         self.optionRoleArr = [];
-        ajax.get(self.smartFlowServerContext + "/manage/processDesign/getrolesbyUserId")
-          .then(function (resp) {
-            if (resp.data.data.code === 200) {
-              resp.data.data.data.forEach(role => {
-                permScope.forEach(perm => {
-                  if (role.roleId == perm) {
-                    self.roleList.push(role);
-                    const codesSeen = new Map();
-                    self.roleList = self.roleList.reduce((acc, item, index) => {
-                      if (!codesSeen.has(item.roleId)) {
-                        codesSeen.set(item.roleId, index);
-                        acc.push(item);
-                      }
-                      return acc;
-                    }, []);
-                  }
-                })
+        if (permScope.length > 0) {
+          ajax.get(self.smartFlowServerContext + "/manage/role/getrolesbyUserId")
+            .then(function (resp) {
+              if (resp.data.data.code === 200) {
+                resp.data.data.data.forEach(role => {
+                  permScope.forEach(perm => {
+                    if (role.roleId == perm) {
+                      self.roleList.push(role);
+                      const codesSeen = new Map();
+                      self.roleList = self.roleList.reduce((acc, item, index) => {
+                        if (!codesSeen.has(item.roleId)) {
+                          codesSeen.set(item.roleId, index);
+                          acc.push(item);
+                        }
+                        return acc;
+                      }, []);
+                    }
+                  })
 
-              })
+                })
 
-            }
-          });
+              }
+            }).catch(err => {
+            console.log(err);
+          })
+        }
       }
     },
     //获取岗位
-    getReadingRangePost(row, organTreeType) {
+    async getReadingRangePost(row, organTreeType) {
       let self = this
-      let childsTree = []
-      let treeValue = []
-      var permScope = row.substring(row.indexOf("P:"))
-      permScope = permScope.substring(2, permScope.indexOf(","))
-      if (permScope.length > 0) {
-        let permScopeTwo = permScope.split(';')
+      let permScope
+      let postPermScope = row.substring(row.indexOf("P:"))
+      postPermScope = postPermScope.substring(2, postPermScope.indexOf(","))
+      let permScopeTwo = postPermScope.split(';')
+      if (permScopeTwo.length > 0 && permScopeTwo[0]){
+        let promises = []
         for (let i = 0; i < permScopeTwo.length; i++) {
-          ajax.get(self.smartFlowServerContext + "/manage/position/get?positionId=" + permScopeTwo[i])
+          let promise = ajax.get(self.smartFlowServerContext + "/manage/position/get?positionId=" + permScopeTwo[i])
             .then(resp => {
               if (resp.data.code == 200) {
-                let organCode = resp.data.data.orgCode
-                if (organCode) {
-                  ajax.get(self.upmsServerContext + '/manage/ucOrgan/getParentOrgInfo?organCode=' + organCode + '&orgTreeType=' + organTreeType)
-                    .then(resp => {
-                      let orgCode = resp.data.data.organCode
-                      ajax.get(self.upmsServerContext + '/manage/ucOrgan/getOrgSubNodes?organCode=' + orgCode + '&orgTreeType=' + organTreeType).then(function (resp) {
-                        if (resp.data.code === 1) {
-                          let data = resp.data.data
-                          if (data.length > 0) {
-                            data.forEach(item => {
-                              if (item.organCode == organCode) {
-                                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.organId
-                                obj.code = item.organCode
-                                obj.loading = false
-                                obj.checked = false
-                                obj.children = []
-                                obj.hasChild = true
-                                const isExist = childsTree.find(item => item.code === obj.code)
-                                if (!isExist) {
-                                  childsTree.push(obj)
-                                }
-                              }
-                            })
-                          }
-                          const map = new Map()
-                          treeValue = childsTree.filter((item) => {
-                            return !map.has(item.code) && map.set(item.code, true)
-                          })
-                          if (i === permScopeTwo.length - 1) {
-                            self.readingRangePost.push(treeValue)
-                            const codesSeen = new Map();
-                            self.readingRangePost = self.readingRangePost.reduce((acc, item, index) => {
-                              if (!codesSeen.has(item.code)) {
-                                codesSeen.set(item.code, index);
-                                acc.push(item);
-                              }
-                              return acc;
-                            }, []);
-                          }
-                        }
-                      })
-                    })
-                } else {
-                  //适配云庭选择岗位
-                  if (i === permScopeTwo.length - 1) {
-                    const data = resp.data.data
-                    let array = [{code: data.orgCode}]
-                    self.selectReRaYHChangePost(array, array)
-                  }
-                }
+                return resp.data.data.orgCode ? resp.data.data.orgCode : resp.data.data
               }
+            }).catch(err => {
+              console.log(err);
             })
+          promises.push(promise)
         }
+        Promise.all(promises).then(async (result) => {
+          if (result.length > 0 && result[0] && result[0].hasOwnProperty('orgCode')) {
+            self.readingRangePost = await this.getOrganTreeByProType(row, permScope, organTreeType);
+            let array = [{code: result[0].orgCode}]
+            self.selectReRaYHChangePost(array, array)
+          } else {
+            const uniqueResults = [...new Set(result.filter(Boolean))];
+            permScope = uniqueResults.join(';');
+            self.readingRangePost = await this.getOrganTreeByProType(row, permScope, organTreeType);
+          }
+        })
+      } else {
+        //对于流程类型中没有规定岗位范围但规定组织范围的情况
+        self.readingRangePost = await this.getOrganTreeByProType(row, row.substring(2, row.indexOf(",")), organTreeType);
       }
     },
     //获取组织类型
@@ -788,8 +679,8 @@ export default {
         let params = {
           orgTreeType: organTreeType
         }
-        ajax.get(self.upmsServerContext + "/manage/bizorgan/qryOrgTypeList", {params: params}).then(function (resp) {
-          if (resp.data.code === 1 || resp.data.code === 200) {
+        ajax.get(self.smartFlowServerContext + "/manage/bizorgan/qryOrgTypeList", {params: params}).then(function (resp) {
+          if (resp.data.code === 200) {
             let data = resp.data.data;
             if (data.length > 0) {
               data.forEach(item => {
@@ -810,8 +701,8 @@ export default {
               organTypeCode: permScopeTwo[i],
               orgTreeType: organTreeType
             }
-            ajax.get(self.upmsServerContext + "/manage/bizorgan/qryOrgTypeByCode",{params : params}).then(resp => {
-              if (resp.data.code === 1 || resp.data.code === 200) {
+            ajax.get(self.smartFlowServerContext + "/manage/bizorgan/qryOrgTypeByCode",{params : params}).then(resp => {
+              if (resp.data.code === 200) {
                 let data = resp.data.data
                 if (data) {
                   self.formatOrgTypeData(resp.data.data, childsTree)
@@ -856,39 +747,6 @@ export default {
       childsTree.push(obj)
     },
 
-    loadTreeSelectData(data, callback) {
-      const self = this
-      const result = [];
-      if (this.organTreeType === '00') {
-        ajax.get(self.upmsServerContext + '/manage/orgType/qryOrgTypeList?parentType=' + data.value).then(function (resp) {
-          if (resp.data.code == 1 && resp.data.data.rows.length > 0) {
-            resp.data.data.rows.forEach(item => {
-              const {typeName, organType} = item;
-              result.push({title: typeName, value: organType, loading: false, children: []})
-            })
-            data.children = result
-            callback(result);
-          }
-        }).catch(err => {
-          console.log(err);
-        })
-      } else {
-        ajax.get(self.upmsServerContext + '/manage/bizorgan/getOrgTree?bizOrganTreeType=' + this.organTreeType + '&parentId=' + data.value).then(function (resp) {
-          if (resp.data.code == 1 && resp.data.data.length > 0) {
-            resp.data.data.forEach(item => {
-              const {bizOrganId, bizOrganName} = item;
-              result.push({title: bizOrganName, value: bizOrganId, loading: false, children: []})
-            })
-            data.children = result
-            callback(result);
-          }
-        }).catch(err => {
-          console.log(err);
-        })
-      }
-      self.$delete(data, 'loading')
-    },
-
     //权限范围组织部门单条删除
     readingRangeDepDel(res, info) {
       this.treeValueBM[res].checked = false;
@@ -1014,14 +872,14 @@ export default {
     },
     getDataBm(node, callback) {
       let self = this
-      ajax.get(self.upmsServerContext + "/manage/org/getOrgSubNodes", {
+      ajax.get(self.smartFlowServerContext + "/manage/organ/getOrgSubNodes", {
         params: {
           code: node.code,
           orgTreeType: self.organTreeType
         }
       }).then(function (resp) {
         const childs = [];
-        if (resp.data.code == 1 || resp.data.code === 200) {
+        if (resp.data.code === 200) {
           let nodeDatas = resp.data.data
           if (nodeDatas && nodeDatas.length > 0) {
             nodeDatas.forEach(item => {
@@ -1077,14 +935,14 @@ export default {
     },
     getDataOrgType(node, callback){
       let self = this
-      ajax.get(self.upmsServerContext + "/manage/bizorgan/qrySubOrgTypeList", {
+      ajax.get(self.smartFlowServerContext + "/manage/bizorgan/qrySubOrgTypeList", {
         params: {
           orgTreeType: self.organTreeType,
           typeId: node.bizTypeId
         }
       }).then(function (resp) {
         const childs = [];
-        if (resp.data.code == 1 || resp.data.code === 200) {
+        if (resp.data.code == 200) {
           let nodeDatas = resp.data.data
           if (nodeDatas && nodeDatas.length > 0) {
             nodeDatas.forEach(item => {
@@ -1216,21 +1074,21 @@ export default {
     //获取用户信息（懒加载）
     loadReadingRangeData(node, callback) {
       this.getReadingRangeData(node, function (data) {
-        if (data.length > 0) {
+        if (data && data.length > 0) {
           callback(data)
         }
       })
     },
     getReadingRangeData(node, callback) {
       let self = this
-      ajax.get(self.upmsServerContext + "/manage/ucOrgan/getOrgSubNodes", {
+      ajax.get(self.smartFlowServerContext + "/manage/organ/getOrgSubNodes", {
         params: {
-          organCode: node.code,
+          code: node.code,
           orgTreeType: self.organTreeType
         }
       }).then(function (resp) {
         const childs = [];
-        if (resp.data.code === 1) {
+        if (resp.data.code === 200) {
           let nodeDatas = resp.data.data
           if (nodeDatas.length > 0) {
             nodeDatas.forEach(item => {
@@ -1303,14 +1161,14 @@ export default {
     },
     getReadingRangeDataPost(node, callback) {
       let self = this
-      ajax.get(self.upmsServerContext + "/manage/org/getOrgSubNodes", {
+      ajax.get(self.smartFlowServerContext + "/manage/organ/getOrgSubNodes", {
         params: {
           code: node.code,
           orgTreeType: self.organTreeType
         }
       }).then(function (resp) {
         const childs = [];
-        if (resp.data.code === 1 || resp.data.code === 200) {
+        if (resp.data.code === 200) {
           let nodeDatas = resp.data.data
           if (nodeDatas.length > 0) {
             nodeDatas.forEach(item => {
@@ -1362,21 +1220,11 @@ export default {
       //self.selectUserChange(data)
       let treeUserCenters = [];
 
-      /*if (info.checked == true) {
-          self.$set(info, 'expand', true)
-      } else {
-          self.$set(info, 'expand', false)
-      }*/
-      /*if ((jsonArray.orgCode || jsonArray.organCode) != info.code) {
-          self.getReadingRangeData(info, function (data) {
-              self.$set(info, 'children', data)
-          })
-      }*/
       if (self.permScope == "all" || self.permScope == "undefined") {
         let userIdSet = new Set()
         data.forEach(itemCom => {
 
-          ajax.get(self.upmsServerContext + "/manage/user/getList", {
+          ajax.get(self.smartFlowServerContext + "/manage/user/getList", {
             params: {
               organId: itemCom.organId,
               orgTreeType: self.organTreeType,
@@ -1384,7 +1232,7 @@ export default {
               directChild: true,
             }
           }).then(function (resp) {
-            if (resp.data.message == "成功") {
+            if (resp.data.code == 200) {
               let nodeUser = resp.data.data.rows ? resp.data.data.rows : resp.data.data;
               nodeUser.forEach(item => {
                 if (!userIdSet.has(item.userId)) {
@@ -1405,7 +1253,7 @@ export default {
         let userIdSet = new Set()
         data.forEach(itemCom => {
 
-          ajax.get(self.upmsServerContext + "/manage/user/getList", {
+          ajax.get(self.smartFlowServerContext + "/manage/user/getList", {
             params: {
               organId: itemCom.organId,
               orgTreeType: self.organTreeType,
@@ -1413,10 +1261,10 @@ export default {
               directChild: true,
             }
           }).then(function (resp) {
-            if (resp.data.message == "成功") {
-              let nodeUser = resp.data.data
+            if (resp.data.code == 200) {
+              let nodeUser = resp.data.data.rows ? resp.data.data.rows : resp.data.data
               nodeUser.forEach(item => {
-                if (!userIdSet.has(item.userId) && userPermScope.includes(item.userId)) {
+                if ((!userIdSet.has(item.userId) && userPermScope.includes(item.userId)) || userPermScope.length <= 0 || !userPermScope[0]) {
                   userIdSet.add(item.userId)
                   treeUserCenters.push({
                     userId: item.userId,
@@ -1444,16 +1292,6 @@ export default {
       const jsonArray = JSON.parse(user);
       let nodePost = []
       let treePostCenter = [];
-      /*if (info.checked == true) {
-          self.$set(info, 'expand', true)
-      } else {
-          self.$set(info, 'expand', false)
-      }*/
-      /*if (j(jsonArray.orgCode || jsonArray.organCode) != info.code) {
-          self.getReadingRangeDataPost(info, function (data) {
-              self.$set(info, 'children', data)
-          })
-      }*/
       if ((jsonArray.orgCode || jsonArray.organCode) != info.code) {
         self.getReadingRangeDataPost(info, function (data) {
           self.$set(info, 'children', data)
@@ -1484,7 +1322,7 @@ export default {
           ajax.get(self.smartFlowServerContext + "/manage/position/qryPositionList?organCode=" + itemCom.code).then(function (resp) {
             nodePost = resp.data.data;
             nodePost.forEach(item => {
-              if (postPermScope.includes(item.positionId) && !addedPositionIds.has(item.positionId)) {
+              if ((postPermScope.includes(item.positionId) && !addedPositionIds.has(item.positionId)) || postPermScope.length <= 0 || !postPermScope[0]) {
                 item.nameItem = item.organName !== '' ? item.organName : item.positionName;
                 treePostCenter.push(item);
                 addedPositionIds.add(item.positionId);

package/src/components/countersigners-box.vue

@@ -260,13 +260,13 @@ export default {
       let organTree = []
       if (self.ucAdapterType == 'x1') {
         let parentId = organTreeType == '00' ? 'rootId' : '0'
-        ajax.get(self.upmsServerContext + '/manage/ucOrgan/getOrgSubNodes', {
+        ajax.get(self.smartFlowServerContext + '/manage/organ/getOrgSubNodes', {
           params: {
-            organCode: 'rootId',
+            code: parentId,
             orgTreeType: organTreeType
           }
         }).then(resp => {
-          if (resp.data.code === 1) {
+          if (resp.data.code === 200) {
             let data = resp.data.data
             if (data.length > 0) {
               data.forEach(item => {
@@ -301,24 +301,24 @@ export default {
           }
         })
       } else {
-        ajax.get(self.upmsServerContext + '/manage/ucOrgan/getOrgRootTree', {
+        ajax.get(self.smartFlowServerContext + '/manage/bizorgan/getOrgRootTree', {
           params: {
-            treeTypeId: organTreeType
+            bizOrganTreeType: organTreeType
           }
         }).then(resp => {
-          if (resp.data.code === 1) {
+          if (resp.data.code === 200) {
             let data = resp.data.data
             if (data.length > 0) {
               data.forEach(item => {
                 let obj = {}
-                obj.type = item.organType
+                obj.type = item.bizOrganType
                 obj.id = item.id
-                obj.organId = item.organId
+                obj.organId = item.bizOrganId
                 obj.orders = item.orders
-                obj.title = item.organName
-                obj.name = item.organName
-                obj.com = item.com
-                obj.code = item.organCode
+                obj.title = item.bizOrganName
+                obj.name = item.bizOrganName
+                obj.com = item.bizOrganId
+                obj.code = item.bizOrganCode
                 obj.loading = false
                 obj.children = []
                 obj.hasChild = true
@@ -337,111 +337,103 @@ export default {
             }, [])
             self.readingRangeBM = JSON.parse(JSON.stringify(organTree))
             self.readingRange = JSON.parse(JSON.stringify(organTree))
-            self.readingRangePost = JSON.parse(JSON.stringify(organTree))
           }
         })
       }
     },
 
+    getOrganTreeByProType(row, permScope, organTreeType) {
+      const self = this
+      return new Promise((resolve, reject) => {
+        let organTree = [];
+        let childsTree = [];
+        if (permScope && permScope.length > 0) {
+          let params = {
+            orgTreeType: organTreeType,
+          };
+          permScope = permScope.split(';');
+
+          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) {
+                    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([]);
+        }
+      });
+    },
     //获取人员树信息(数据初始化)
-    getReadingRange(row, organTreeType) {
+    async getReadingRange(row, organTreeType) {
       let self = this
-      let childsTree = []
-      let treeValue = []
       var permScope = row.substring(row.indexOf('U:'))
       permScope = permScope.substring(2, permScope.indexOf(','))
       let permScopeTwo = permScope.split(';')
-      for (let i = 0; i < permScopeTwo.length; i++) {
-        ajax.get(self.upmsServerContext + '/manage/user/get/' + permScopeTwo[i] + '?treeType=' + organTreeType)
-          .then(resp => {
-            if (resp.data.code == 1) {
-              let organCode = resp.data.data.organCode
-              ajax.get(self.upmsServerContext + '/manage/ucOrgan/getParentOrgInfo?organCode=' + organCode + '&orgTreeType=' + organTreeType)
-                .then(resp => {
-                  if (resp.data.code === 1 || resp.data.code === 200) {
-                    let orgCode = resp.data.data.organCode
-                    ajax.get(self.upmsServerContext + '/manage/ucOrgan/getOrgSubNodes?organCode=' + orgCode + '&orgTreeType=' + organTreeType).then(function (resp) {
-                      if (resp.data.code === 1) {
-                        let data = resp.data.data
-                        if (data && data.length > 0) {
-                          data.forEach(item => {
-                            if (item.organCode == organCode) {
-                              let obj = {}
-                              obj.type = item.organType
-                              obj.id = item.id
-                              obj.orders = item.orders
-                              obj.title = item.organName
-                              obj.name = item.organName
-                              obj.com = item.organId
-                              obj.organId = item.organId
-                              obj.code = item.organCode
-                              obj.loading = false
-                              obj.checked = false
-                              obj.children = []
-                              obj.hasChild = true
-                              childsTree.push(obj)
-                            }
-                          })
-                        }
-                        const map = new Map()
-                        treeValue = childsTree.filter((item) => {
-                          return !map.has(item.code) && map.set(item.code, true)
-                        })
-                        if (i === permScopeTwo.length - 1) {
-                          self.readingRange.push(treeValue)
-                          const codesSeen = new Map()
-                          self.readingRange = self.readingRange.reduce((acc, item, index) => {
-                            if (!codesSeen.has(item.code)) {
-                              codesSeen.set(item.code, index)
-                              acc.push(item)
-                            }
-                            return acc
-                          }, [])
-                        }
-                      }
-                    })
-                  } else if (resp.data.data === 11006) {
-                    //当前组织无父节点
-                    let params = {
-                      orgTreeType: organTreeType,
-                    }
-                    ajax.post(self.upmsServerContext + '/manage/org/get/' + organCode, params)
-                      .then(resp => {
-                        let data = resp.data.data
-                        let obj = {}
-                        obj.type = data.organType
-                        obj.id = data.organId
-                        obj.orders = data.orders
-                        obj.title = data.organName
-                        obj.name = data.organName
-                        obj.com = data.organId
-                        obj.code = data.organCode
-                        obj.loading = false
-                        obj.checked = false
-                        obj.children = []
-                        obj.hasChild = true
-                        childsTree.push(obj)
-
-                        const map = new Map()
-                        treeValue = childsTree.filter((item) => {
-                          return !map.has(item.code) && map.set(item.code, true)
-                        })
-                        if (i === permScopeTwo.length - 1) {
-                          self.readingRange.push(treeValue)
-                          const codesSeen = new Map()
-                          self.readingRange = self.readingRange.reduce((acc, item, index) => {
-                            if (!codesSeen.has(item.code)) {
-                              codesSeen.set(item.code, index)
-                              acc.push(item)
-                            }
-                            return acc
-                          }, [])
-                        }
-                      })
-                  }
-                })
-            }
-          })
+      if (permScopeTwo.length > 0 && permScopeTwo[0]){
+        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.readingRange = await this.getOrganTreeByProType(row, permScope, organTreeType);
+        })
+      } else {
+        //对于流程类型中没有规定人员范围但规定组织范围的情况
+        self.readingRange = await this.getOrganTreeByProType(row, row.substring(2, row.indexOf(",")), organTreeType);
       }
 
     },
@@ -504,14 +496,14 @@ export default {
     },
     getReadingRangeData(node, callback) {
       let self = this
-      ajax.get(self.upmsServerContext + '/manage/ucOrgan/getOrgSubNodes', {
+      ajax.get(self.smartFlowServerContext + '/manage/organ/getOrgSubNodes', {
         params: {
-          organCode: node.code,
+          code: node.code,
           orgTreeType: self.organTreeType
         }
       }).then(function (resp) {
         const childs = []
-        if (resp.data.code === 1) {
+        if (resp.data.code === 200) {
           let nodeDatas = resp.data.data
           if (nodeDatas.length > 0) {
             nodeDatas.forEach(item => {
@@ -568,7 +560,7 @@ export default {
         let userIdSet = new Set()
         data.forEach(itemCom => {
 
-          ajax.get(self.upmsServerContext + '/manage/user/getList', {
+          ajax.get(self.smartFlowServerContext + '/manage/user/getList', {
             params: {
               organId: itemCom.organId,
               orgTreeType: self.organTreeType,
@@ -576,7 +568,7 @@ export default {
               directChild: true,
             }
           }).then(function (resp) {
-            if (resp.data.message == '成功') {
+            if (resp.data.code === 200) {
               let nodeUser = resp.data.data.rows ? resp.data.data.rows : resp.data.data;
               nodeUser.forEach(item => {
                 if (!userIdSet.has(item.userId)) {
@@ -596,7 +588,7 @@ export default {
       } else {
         let userIdSet = new Set()
         data.forEach(itemCom => {
-          ajax.get(self.upmsServerContext + '/manage/user/getList', {
+          ajax.get(self.smartFlowServerContext + '/manage/user/getList', {
             params: {
               organId: itemCom.organId,
               orgTreeType: self.organTreeType,
@@ -604,10 +596,10 @@ export default {
               directChild: true,
             }
           }).then(function (resp) {
-            if (resp.data.message == '成功') {
-              let nodeUser = resp.data.data
+            if (resp.data.code === 200) {
+              let nodeUser = resp.data.data.rows ? resp.data.data.rows : resp.data.data;
               nodeUser.forEach(item => {
-                if (!userIdSet.has(item.userId) && userPermScope.includes(item.userId)) {
+                if ((!userIdSet.has(item.userId) && userPermScope.includes(item.userId)) || userPermScope.length <= 0 || !userPermScope[0]) {
                   userIdSet.add(item.userId)
                   treeUserCenters.push({
                     userId: item.userId,
@@ -793,7 +785,10 @@ export default {
       if (item.organName) {
         return `(${item.organName} )`
       }
-    }
+    },
+    dataNameClick(data) {
+      this.dataName = data
+    },
   },
 
   watch: {