@sy-common/organize-select-help 1.0.0-beta.69 → 1.0.0-beta.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sy-common/organize-select-help",
-  "version": "1.0.0-beta.69",
+  "version": "1.0.0-beta.71",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/src/index.vue

@@ -297,11 +297,31 @@
                 <div class="clear-btn" @click="clearOrgNewList">清除全部</div>
               </div>
               <div class="group-list-content">
-                <p class="list-item flex-r-bt" v-for="(item,index) in orgNewList" :key="item.id">
-                  <span>{{item.title}}</span>
-                  <img class="clear-icon" src="./assets/delete.png" alt="" @click="clearOrgNewByIndex(index)">
-                </p>
-                <p style="color:#CCCCCC" class="list-item" v-if="!orgNewList.length">未选择组织节点</p>
+                <div v-if="groupedOrgNewList.length > 0">
+                  <div v-for="group in groupedOrgNewList" :key="group.parentOrgUnitId" class="org-group">
+                    <div class="org-group-title">
+                      <Icon type="md-folder" class="folder-icon" />
+                      <span>{{ group.parentOrgName }}</span>
+                      <span class="org-group-count">({{ group.items.length }})</span>
+                    </div>
+                    <div v-for="item in group.items" class="org-group-items">
+                      <!--                      <Tooltip -->
+                      <!--                        v-for="item in group.items" -->
+                      <!--                        :key="item.id" -->
+                      <!--                        :content="item.fullPath || item.title" -->
+                      <!--                        placement="left"-->
+                      <!--                        :max-width="400"-->
+                      <!--                        transfer-->
+                      <!--                      >-->
+                      <p class="list-item flex-r-bt">
+                        <span class="org-item-name">{{ item.title }}</span>
+                        <img class="clear-icon" src="./assets/delete.png" alt="" @click="clearOrgNewByIndex(item.originalIndex)">
+                      </p>
+                      <!--                      </Tooltip>-->
+                    </div>
+                  </div>
+                </div>
+                <p style="color:#CCCCCC" class="list-item" v-else>未选择组织节点</p>
               </div>
             </div>
           </div>
@@ -1360,11 +1380,19 @@ export default {
       this.orgNewList.splice(index,1)
     },
     confirm(){
+      const cleanOrgNewList = this.orgNewList.map(item => ({
+        id: item.id,
+        orgUnitId: item.orgUnitId,
+        orgNodeName: item.orgNodeName || item.title,
+        title: item.title,
+        includeLevel: item.includeLevel,
+        parentOrgUnitId: item.parentOrgUnitId
+      }))
       const v = {
         orgList:this.orgList,
         postList:this.postList,
         staffList:this.staffList,
-        orgNewList:this.orgNewList
+        orgNewList:cleanOrgNewList
       }
       this.$emit('confirm',deepCopy(v))
     },
@@ -1964,6 +1992,10 @@ export default {
           // 处理树形数据，添加必要的字段
           const processedTree = this.processOrgNewTree(treeData);
           this.orgNewTree = this.safeDeepCopy(processedTree);
+          // 树加载完成后，刷新 orgNewList 的父组织信息
+          this.$nextTick(() => {
+            this.refreshOrgNewListParentInfo();
+          });
         }
       } catch (e) {
         this.$Message.error("组织选择（新）树初始化失败！");
@@ -2101,19 +2133,114 @@ export default {
         return;
       }
 
+      // 获取父组织信息
+      const parentInfo = this.findParentInfo(node.orgUnitId);
+
+      // 获取完整路径
+      const fullPath = this.getOrgFullPath(node.orgUnitId);
+
+      // 根节点没有父组织时，使用自身作为分组（让根节点和其下级分到同一组）
+      const finalParentId = parentInfo.id || node.orgUnitId;
+      const finalParentName = parentInfo.name || node.title || node.orgNodeName;
+
       // 创建组织条件项
       const orgItem = {
         ...node,
         title: includeLevel ? `${node.title}（包含下级组织节点）` : node.title,
         id: id,
         includeLevel: includeLevel,
-        orgNodeName: node.orgNodeName || node.title
+        orgNodeName: node.orgNodeName || node.title,
+        parentOrgUnitId: finalParentId,
+        parentOrgName: finalParentName,
+        fullPath: fullPath
       };
 
       // 添加到已选择列表
       this.orgNewList.push(orgItem);
       this.$Message.success(`已添加【${orgItem.title}】`);
     },
+    findParentInfo(orgUnitId) {
+      let result = { id: '', name: '' };
+      const findParent = (nodes, parentId = '', parentName = '') => {
+        for (const node of nodes) {
+          if (node.orgUnitId === orgUnitId) {
+            result = { id: parentId, name: parentName };
+            return true;
+          }
+          if (node.children && node.children.length > 0) {
+            if (findParent(node.children, node.orgUnitId, node.title || node.orgNodeName)) {
+              return true;
+            }
+          }
+        }
+        return false;
+      };
+      findParent(this.orgNewTree);
+      return result;
+    },
+    getOrgFullPath(orgUnitId) {
+      const path = [];
+      const findPath = (nodes, currentPath = []) => {
+        for (const node of nodes) {
+          const newPath = [...currentPath, node.title || node.orgNodeName];
+          if (node.orgUnitId === orgUnitId) {
+            path.push(...newPath);
+            return true;
+          }
+          if (node.children && node.children.length > 0) {
+            if (findPath(node.children, newPath)) {
+              return true;
+            }
+          }
+        }
+        return false;
+      };
+      findPath(this.orgNewTree);
+      return path.join(' > ');
+    },
+    findParentInfoFromTree(parentOrgUnitId) {
+      let result = { id: parentOrgUnitId, name: '' };
+      const findNode = (nodes) => {
+        for (const node of nodes) {
+          if (node.orgUnitId === parentOrgUnitId) {
+            result.name = node.title || node.orgNodeName;
+            return true;
+          }
+          if (node.children && node.children.length > 0) {
+            if (findNode(node.children)) {
+              return true;
+            }
+          }
+        }
+        return false;
+      };
+      findNode(this.orgNewTree);
+      return result;
+    },
+    buildFullPathFromParent(item, parentInfo) {
+      if (parentInfo.name) {
+        return `${parentInfo.name} > ${item.title || item.orgNodeName}`;
+      }
+      return item.title || item.orgNodeName;
+    },
+    refreshOrgNewListParentInfo() {
+      if (!this.orgNewTree || this.orgNewTree.length === 0) {
+        return;
+      }
+      this.orgNewList.forEach(item => {
+        if (item.parentOrgUnitId) {
+          const parentInfo = this.findParentInfoFromTree(item.parentOrgUnitId);
+          if (parentInfo.name) {
+            item.parentOrgName = parentInfo.name;
+            item.fullPath = this.buildFullPathFromParent(item, parentInfo);
+          } else {
+            item.parentOrgName = item.parentOrgName || '未知上级组织';
+          }
+        } else {
+          item.parentOrgName = item.parentOrgName || '未知上级组织';
+        }
+      });
+    },
     isProvinceAllSelected(province) {
       if (!province.children || province.children.length === 0) return false;
       return province.children.every(city => this.isCityAllSelected(city));
@@ -2276,6 +2403,29 @@ export default {
 
       // 直接使用原始树数据，不需要深拷贝
       return filterTree(this.orgNewTree);
+    },
+    groupedOrgNewList() {
+      const groups = {};
+      this.orgNewList.forEach((item, index) => {
+        const groupKey = item.parentOrgUnitId || 'unknown';
+        const groupName = item.parentOrgName || '未知上级组织';
+        if (!groups[groupKey]) {
+          groups[groupKey] = {
+            parentOrgUnitId: groupKey,
+            parentOrgName: groupName,
+            items: []
+          };
+        }
+        groups[groupKey].items.push({
+          ...item,
+          originalIndex: index
+        });
+      });
+      return Object.values(groups).sort((a, b) => {
+        if (a.parentOrgName === '未知上级组织') return 1;
+        if (b.parentOrgName === '未知上级组织') return -1;
+        return a.parentOrgName.localeCompare(b.parentOrgName, 'zh-CN');
+      });
     }
   },
   watch:{
@@ -2300,11 +2450,30 @@ export default {
         this.postList = postList
         this.staffList = map.staffList || []
         let orgNewList = map.orgNewList || []
-        orgNewList.forEach(item=>{
-          item.title = item.includeLevel?`${item.orgNodeName}（包含下级组织节点）`:item.orgNodeName
-          item.id = item.includeLevel?('01'+'-' + item.orgUnitId):('00'+'-'+item.orgUnitId)
+        orgNewList.forEach(item => {
+          item.title = item.includeLevel ? `${item.orgNodeName}（包含下级组织节点）` : item.orgNodeName
+          item.id = item.includeLevel ? ('01' + '-' + item.orgUnitId) : ('00' + '-' + item.orgUnitId)
+          if (!item.parentOrgName && item.parentOrgUnitId) {
+            if (this.orgNewTree && this.orgNewTree.length > 0) {
+              const parentInfo = this.findParentInfoFromTree(item.parentOrgUnitId)
+              item.parentOrgName = parentInfo.name
+              item.fullPath = item.fullPath || this.buildFullPathFromParent(item, parentInfo)
+            } else {
+              item.parentOrgName = item.parentOrgName || '加载中...'
+            }
+          }
+          if (!item.parentOrgName) {
+            item.parentOrgName = '未知上级组织'
+          }
         })
         this.orgNewList = orgNewList
+        if (orgNewList.some(item => item.parentOrgName === '加载中...')) {
+          this.$nextTick(() => {
+            setTimeout(() => {
+              this.refreshOrgNewListParentInfo()
+            }, 1000)
+          })
+        }
       },
       deep: true,
       immediate: true,
@@ -3318,6 +3487,48 @@ export default {
           .clear-icon{
             cursor:pointer;
           }
+          .org-group {
+            margin-bottom: 12px;
+            &:last-child {
+              margin-bottom: 0;
+            }
+            .org-group-title {
+              display: flex;
+              align-items: center;
+              padding: 6px 0;
+              font-size: 13px;
+              font-weight: 500;
+              color: #666;
+              border-bottom: 1px dashed #E5E6EB;
+              margin-bottom: 8px;
+              .folder-icon {
+                margin-right: 6px;
+                color: #faad14;
+                font-size: 14px;
+              }
+              .org-group-count {
+                margin-left: 4px;
+                color: #999;
+                font-weight: normal;
+                font-size: 12px;
+              }
+            }
+            .org-group-items {
+              padding-left: 4px;
+              .list-item {
+                margin-top: 6px;
+                &:first-child {
+                  margin-top: 0;
+                }
+              }
+            }
+          }
+          .org-item-name {
+            flex: 1;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+          }
         }
         .list-item{
           background:#F4F6FA;