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

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);
       }
 
     },
@@ -454,7 +446,7 @@ export default {
 
     //权限范围人员单条删除
     readingRangeScPerDel(res, info) {
-      const index = this.treeUserValue.findIndex(item => {
+      let index = this.treeUserValue.findIndex(item => {
         return item.replace(',', ':') === info
       })
       if (index !== -1) {
@@ -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 == "成功" || resp.data.code == 1 || resp.data.code == 200) {
+            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 == "成功" || resp.data.code == 1 || resp.data.code == 200) {
+            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,
@@ -631,12 +623,14 @@ export default {
     //人员选中
     getReadingRangeUser(row) {
       let self = this
+      debugger
       self.userNum = '2'
       if (row.length > self.selectedKeys.length) {
         self.treeUserValue = row
         self.selectedKeys = row
-        row = row.reverse()
-        let organName = row[0].replace(',', ':') + ',2'
+        // row = row.reverse()
+        let index = row.length - 1
+        let organName = row[index].replace(',', ':') + ',2'
         self.countersignersTagsData.push(organName)
       } else if (row.length < self.selectedKeys.length) {
         let diff = ''
@@ -793,7 +787,10 @@ export default {
       if (item.organName) {
         return `(${item.organName} )`
       }
-    }
+    },
+    dataNameClick(data) {
+      this.dataName = data
+    },
   },
 
   watch: {
@@ -810,13 +807,12 @@ export default {
         let nameValue = []
         let users = []
         //倒着从treeUserValue遍历，保证顺序和显示的一样
-        this.treeUserValue.reduceRight((acc, item) => {
+        this.treeUserValue.forEach(item => {
           const parts = item.split(',');
           nameValue.push(parts[0]);
           names.push(parts[1]);
           users.push(parts[0] + ':' + parts[1]);
-          return acc;
-        }, []);
+        });
         let roleList = []
         let roles = []
         this.noticeRoleList.forEach(item => {