@lambo-design/workflow-approve 1.0.0-beta.52 → 1.0.0-beta.54

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

@@ -287,108 +287,119 @@ export default {
   },
   methods: {
     getOrgan(row) {
-      let self = this
-      self.organModel = []
-      let organs = row.organs
-      let organList = organs.split(",")
-      if (organs && organList.length > 0) {
-        organList.forEach(item => {
-          let organ = {
-            code: item.split(':')[0],
-            name: item.split(':')[1],
-          }
-          self.treeValueBM.push(organ)
-          self.orgList.push(organ)
-          self.organModel.push(item + ',1')
-          self.userNum = "1"
-          self.updateLength()
-        })
+      if (row.organs){
+        let self = this
+        self.organModel = []
+        let organs = row.organs
+        let organList = organs.split(",")
+        if (organs && organList.length > 0) {
+          organList.forEach(item => {
+            let organ = {
+              code: item.split(':')[0],
+              name: item.split(':')[1],
+            }
+            self.treeValueBM.push(organ)
+            self.orgList.push(organ)
+            self.organModel.push(item + ',1')
+            self.userNum = "1"
+            self.updateLength()
+          })
+        }
       }
     },
     getUser(row) {
-      let self = this
-      self.selectedKeys = []
-      self.treeUserValue = []
-      self.treeUserNameCenterValue = []
-      let users = row.users
-      let userList = users.split(",")
-      if (users && userList.length > 0) {
-        userList.forEach(item => {
-          let userId = item.split(':')[0]
-          let userName = item.split(':')[1]
-          let user = {
-            userId: userId,
-            userName: userName,
-          }
-          let userStr = userId + "," + userName
-          self.treeUserValue.push(userStr)
-          self.treeUserNameCenterValue.push(user)
-          self.selectedKeys.push(userStr)
-          self.organModel.push(item + ",2")
-          self.userNum = "1"
-          self.updateLength()
-        })
+      if (row.users){
+        let self = this
+        self.selectedKeys = []
+        self.treeUserValue = []
+        self.treeUserNameCenterValue = []
+        let users = row.users
+        let userList = users.split(",")
+        if (users && userList.length > 0) {
+          userList.forEach(item => {
+            let userId = item.split(':')[0]
+            let userName = item.split(':')[1]
+            let user = {
+              userId: userId,
+              userName: userName,
+            }
+            let userStr = userId + "," + userName
+            self.treeUserValue.push(userStr)
+            self.treeUserNameCenterValue.push(user)
+            self.selectedKeys.push(userStr)
+            self.organModel.push(item + ",2")
+            self.userNum = "1"
+            self.updateLength()
+          })
+        }
       }
     },
     getRole(row) {
-      let self = this
-      self.noticeRoleList = []
-      self.noticeList = []
-      self.noticeRoleNameList = []
-      let roles = row.roles
-      let roleList = roles.split(",")
-      if (roles && roleList.length > 0) {
-        roleList.forEach(item => {
-          let roleId = item.split(':')[0]
-          let roleName = item.split(':')[1]
-          self.noticeRoleNameList.push(roleName)
-          self.organModel.push(item + ',3')
-          let roles = roleId + "," + roleName
-          self.noticeRoleList.push(roles)
-          self.noticeList.push(roles)
-          self.updateLength()
-        })
+      if (row.roles){
+        let self = this
+        self.noticeRoleList = []
+        self.noticeList = []
+        self.noticeRoleNameList = []
+        let roles = row.roles
+        let roleList = roles.split(",")
+        if (roles && roleList.length > 0) {
+          roleList.forEach(item => {
+            let roleId = item.split(':')[0]
+            let roleName = item.split(':')[1]
+            self.noticeRoleNameList.push(roleName)
+            self.organModel.push(item + ',3')
+            let roles = roleId + "," + roleName
+            self.noticeRoleList.push(roles)
+            self.noticeList.push(roles)
+            self.updateLength()
+          })
+        }
       }
     },
     getPost(row) {
-      let self = this
-      self.treePostValue = []
-      self.postKeys = []
-      self.treePostNameCenterValue = []
-      let positions = row.positions
-      let positionList = positions.split(",")
-      if (positions && positionList.length > 0) {
-        positionList.forEach(item => {
-          let positionId = item.split(':')[0]
-          let positionName = item.split(':')[1]
-          let position = {
-            positionId: positionId,
-            positionName: positionName,
-          }
-          let post = positionId + "," + positionName
-          self.treePostValue.push(post)
-          self.postKeys.push(post)
-          // resp.data.data.code = resp.data.data.orgCode
-          // self.treePostNameCenterValue.push(resp.data.data)
-          self.treePostNameCenterValue.push(position)
-          self.organModel.push(item + ',4')
-          self.updateLength()
-        })
+      if (row.posts){
+        let self = this
+        self.treePostValue = []
+        self.postKeys = []
+        self.treePostNameCenterValue = []
+        let positions = row.positions
+        let positionList = positions.split(",")
+        if (positions && positionList.length > 0) {
+          positionList.forEach(item => {
+            let positionId = item.split(':')[0]
+            let positionName = item.split(':')[1]
+            let position = {
+              positionId: positionId,
+              positionName: positionName,
+            }
+            let post = positionId + "," + positionName
+            self.treePostValue.push(post)
+            self.postKeys.push(post)
+            // resp.data.data.code = resp.data.data.orgCode
+            // self.treePostNameCenterValue.push(resp.data.data)
+            self.treePostNameCenterValue.push(position)
+            self.organModel.push(item + ',4')
+            self.updateLength()
+          })
+        }
       }
+
     },
     getOrgType(row) {
-      let self = this
-      let types = row.types
-      let typeList = types.split(",")
-      if (types && typeList.length > 0) {
-        typeList.forEach(item => {
-          let type = {
-            bizTypeCode: item.split(':')[0],
-            typeName: item.split(':')[1],
-          }
-          self.treeOrgTypeValue.push(type)
-          self.updateLength()
-        })
+      if (row.types){
+        let self = this
+        let types = row.types
+        let typeList = types.split(",")
+        if (types && typeList.length > 0) {
+          typeList.forEach(item => {
+            let type = {
+              bizTypeCode: item.split(':')[0],
+              typeName: item.split(':')[1],
+            }
+            self.treeOrgTypeValue.push(type)
+            self.updateLength()
+          })
+        }
       }
     },
 
@@ -512,25 +523,15 @@ export default {
 
           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);
-                }
-              });
+              let tree
+              if (self.ucAdapterType === 'x1'){
+                tree = self.x1OrganTree(results)
+              } else {
+                tree = self.scOrganTree(results)
+              }
+              for (let value of tree) {
+                self.formatOrganTree(value, childsTree, organTreeType)
+              }
               organTree.push(childsTree);
               const codesSeen = new Map();
               organTree = organTree.reduce((acc, item, index) => {
@@ -550,6 +551,133 @@ export default {
         }
       });
     },
+    x1OrganTree(results){
+      const nodeMap = new Map();
+      results.forEach(item => {
+        const organCode = item.organCode
+        const organStruPath = item.organStruPath
+        const parts = organStruPath.split('#').filter(p => p);
+        let currentNode = nodeMap.get(organCode) || { organCode, organStruPath, item, children: []};
+        currentNode.parts = parts;
+        nodeMap.set(organCode, currentNode);
+      });
+      nodeMap.forEach(node => {
+        const { organCode, parts } = node;
+        let parentCode = null;
+        for (let i = 0; i < parts.length - 1; i++) {
+          parentCode = parts[i];
+          const parentNode = nodeMap.get(parentCode);
+
+          if (parentNode) {
+            if (parentNode.organId === node.item.parentId && !parentNode.children.some(child => child.organCode === organCode)) {
+              parentNode.children.push(node);
+            } else {
+              // 如果直接父节点不在流程类型范围内但祖宗节点在
+              let children = parentNode.children;
+              for (let j = i + 1; j < parts.length - 1; j++) {
+                const partCode = parts[j];
+                let existingChild = children.find(child => child.organCode === partCode);
+
+                if (!existingChild) {
+                  existingChild = { organCode: partCode, children: [] };
+                  children.push(existingChild);
+                }
+                children = existingChild.children;
+              }
+              // 将当前节点添加到最后一个子节点的 children 中
+              children.push(node);
+            }
+            nodeMap.delete(organCode);
+            break;
+          }
+        }
+
+      });
+      return nodeMap.values()
+    },
+    scOrganTree(results){
+      const nodeMap = new Map();
+      results.forEach(item => {
+        const organId = item.organId
+        const parentId = item.parentId
+        let currentNode = nodeMap.get(organId) || { organId, parentId, item, children: []};
+        nodeMap.set(organId, currentNode);
+      });
+      const tree = [];
+      nodeMap.forEach((node, organId) => {
+        const parentId = node.parentId;
+
+        // 如果有父节点，则将当前节点添加到父节点的 children 数组中
+        if (parentId && nodeMap.has(parentId)) {
+          const parentNode = nodeMap.get(parentId);
+          parentNode.children.push(node);
+        } else {
+          tree.push(node);
+        }
+      });
+      return tree
+    },
+    formatOrganTree(nodeMap, childsTree, organTreeType){
+      const self = this
+      let obj = {}
+      if (nodeMap.item){
+        obj = {
+          type: nodeMap.item.organType,
+          id: nodeMap.item.id,
+          organId: nodeMap.item.organId,
+          orders: nodeMap.item.orders,
+          title: nodeMap.item.organName,
+          name: nodeMap.item.organName,
+          com: nodeMap.item.organId,
+          code: nodeMap.item.organCode,
+          loading: false,
+          checked: false,
+          hasChild: true,
+          children: [],
+        };
+        if (nodeMap.children && nodeMap.children.length > 0){
+          for (let child of nodeMap.children){
+            self.formatOrganTree(child, obj.children, organTreeType)
+          }
+        }
+        childsTree.push(obj);
+      } else {
+        let params = {
+          orgTreeType: organTreeType,
+        }
+        ajax.get(self.smartFlowServerContext + '/manage/organ/get/' + nodeMap.organCode, { params: params })
+          .then(resp => {
+            if (resp.data.code === 200) {
+              let data = resp.data.data
+              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,
+                disabled: true,
+                checked: false,
+                hasChild: true,
+                children: [],
+              }
+              if (nodeMap.children && nodeMap.children.length > 0){
+                for (let child of nodeMap.children){
+                  self.formatOrganTree(child, obj.children, organTreeType)
+                }
+              }
+              childsTree.push(obj);
+            }
+          })
+          .catch(err => {
+            console.error(err);
+            return [];
+          })
+      }
+    },
     //获取人员树信息
     async getReadingRange(row, organTreeType) {
       let self = this
@@ -1766,7 +1894,7 @@ export default {
       this.permScope = permScope
       this.organTreeType = organTreeType
       this.organTreeRedis(this.permScope)
-      if (inputValue){
+      if (inputValue) {
         this.getOrgan(inputValue)
         this.getUser(inputValue)
         this.getRole(inputValue)

package/src/components/countersigners-box.vue

@@ -1,16 +1,17 @@
 <template>
   <div style="min-height: 300px;">
-    <div v-if="organTree.userMap && Object.keys(organTree.userMap).length > 0"  class="searchable-select-wrapper">
-    <Select  v-model="countersignersTagsData"
-            filterable multiple
-            @on-change="organChange($event)"
-            class="custom-select"
-               >
-      <Option v-for="(value, key) in organTree.userMap" :key="key" :value="`${key},${value.split('（')[0]}`" :label="value.split('（')[0]">
-        <span>{{ value }}</span>
-      </Option>
-    </Select>
-      <Icon type="ios-search" class="search-icon" />
+    <div v-if="organTree.userMap && Object.keys(organTree.userMap).length > 0" class="searchable-select-wrapper">
+      <Select v-model="countersignersTagsData"
+              filterable multiple
+              @on-change="organChange($event)"
+              class="custom-select"
+      >
+        <Option v-for="(value, key) in organTree.userMap" :key="key" :value="`${key},${value.split('（')[0]}`"
+                :label="value.split('（')[0]">
+          <span>{{ value }}</span>
+        </Option>
+      </Select>
+      <Icon type="ios-search" class="search-icon"/>
     </div>
     <Tag v-else v-for="(item, index) in countersignersTagsData" :key="item.id" closable
          @on-close="closeTags(index, item)"
@@ -161,23 +162,25 @@ export default {
   methods: {
     //把已选择的数据放入到已选列表中展示
     getUser(row) {
-      let self = this
-      self.selectedKeys = []
-      self.treeUserValue = []
-      let users = row.users
-      let userList = users.split(',')
-      if (users && userList.length > 0) {
-        userList.forEach(item => {
-          let [userId, userName] = item.split(':')
-          let userStr = `${userId},${userName}`
-          self.selectedData.push(userStr)
-          self.treeUserValue.push(userStr)
-          self.selectedKeys.push(userStr)
-          if (!self.countersignersTagsData.includes(userStr)) {
-            self.countersignersTagsData.push(userStr)
-          }
-          self.userNum = '1'
-        })
+      if (row.users) {
+        let self = this
+        self.selectedKeys = []
+        self.treeUserValue = []
+        let users = row.users
+        let userList = users.split(',')
+        if (users && userList.length > 0) {
+          userList.forEach(item => {
+            let [userId, userName] = item.split(':')
+            let userStr = `${userId},${userName}`
+            self.selectedData.push(userStr)
+            self.treeUserValue.push(userStr)
+            self.selectedKeys.push(userStr)
+            if (!self.countersignersTagsData.includes(userStr)) {
+              self.countersignersTagsData.push(userStr)
+            }
+            self.userNum = '1'
+          })
+        }
       }
     },
 
@@ -593,7 +596,6 @@ export default {
           organIds.push(item.organId)
         })
       }
-
       ajax.get(this.smartFlowServerContext + '/manage/user/getAllUsersInfo', {
           params: {
             organIds: organIds.join(','),
@@ -836,6 +838,7 @@ export default {
 /deep/ .custom-select .ivu-select-arrow {
   display: none;
 }
+
 .searchable-select-wrapper {
   position: relative;
   display: inline-block;