@lambo-design/workflow-approve 1.0.0-beta.51 → 1.0.0-beta.53

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

@@ -512,25 +512,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 +540,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 +1883,7 @@ export default {
       this.permScope = permScope
       this.organTreeType = organTreeType
       this.organTreeRedis(this.permScope)
-      if (inputValue){
+      if (inputValue && inputValue.length > 0){
         this.getOrgan(inputValue)
         this.getUser(inputValue)
         this.getRole(inputValue)

package/src/components/countersigners-box.vue

@@ -1,18 +1,23 @@
 <template>
   <div style="min-height: 300px;">
-    <Select v-if="organTree.userMap && Object.keys(organTree.userMap).length > 0" v-model="countersignersTagsData"
+    <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}`" :label="value">
+               >
+      <Option v-for="(value, key) in organTree.userMap" :key="key" :value="`${key},${value.split('（')[0]}`" :label="value.split('（')[0]">
         <span>{{ value }}</span>
       </Option>
     </Select>
-    <Tag v-else v-for="(item, index) in countersignersTagsData" :key="item.id" closable @on-close="closeTags(index, item)"
+      <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)"
          size="large">
       {{ item.split(',')[1] }}
     </Tag>
+
     <div class="cont">
       <div
         class="contLeftTwo">
@@ -658,7 +663,7 @@ export default {
       this.permScope = permScope
       this.organTreeType = organTreeType
       // this.organTreeRedis(this.permScope)
-      if (inputValue) {
+      if (inputValue && inputValue.length > 0) {
         //加入已选择的数据
         this.getUser(inputValue)
       }
@@ -684,7 +689,6 @@ export default {
   watch: {
     countersignersTagsData: {
       handler(newVal, oldVal) {
-        console.log('countersignersTagsData', newVal)
         let organ = []
         let names = []
         let organs = []
@@ -794,6 +798,10 @@ export default {
   width: 136px;
 }
 
+/deep/ .custom-select {
+  width: 100% !important;
+}
+
 /deep/ .custom-select .ivu-select {
   height: 80px; /* 控制总体高度 */
   min-height: 80px;
@@ -806,6 +814,7 @@ export default {
   line-height: normal !important;
   padding: 0 !important;
   margin-top: 0 !important;
+
 }
 
 /deep/ .custom-select .ivu-select-selection {
@@ -827,4 +836,20 @@ export default {
 /deep/ .custom-select .ivu-select-arrow {
   display: none;
 }
+.searchable-select-wrapper {
+  position: relative;
+  display: inline-block;
+  width: 100%;
+}
+
+.search-icon {
+  position: absolute;
+  top: 50%;
+  right: 10px;
+  zoom: 120%;
+  transform: translateY(100%);
+  color: #999; /* 根据需要调整图标颜色 */
+  pointer-events: none; /* 确保点击图标不会影响选择操作 */
+}
+
 </style>