@sy-common/organize-select-help 1.0.0-beta.7 → 1.0.0-beta.72

package/src/index.vue

@@ -1,29 +1,59 @@
 <template>
   <Modal
-    title=""
-    v-model="modal"
-    @on-ok="confirm"
-    @on-visible-change="visibleChange	"
-    width="1180"
-    :mask-closable="false"
-    class="modal-tree"
+      title=""
+      v-model="modal"
+      @on-ok="confirm"
+      @on-visible-change="visibleChange	"
+      width="1180"
+      :mask-closable="false"
+      class="modal-tree"
+      :fullscreen="true"
   >
     <div slot="header" class="header-text"><Icon type="md-information" class="icon-tip" />人员选择</div>
     <div class="content-container">
       <div class="tree-orig">
-        <div class="tab-content">
-          <Tabs :value="tabName">
-            <TabPane label="选择组织节点" name="org">
+        <div class="tab-content-pro">
+          <Tabs :value="tabName"  @input="handleTabChange">
+            <TabPane label="组织选择" name="org" v-if="name.includes('org')">
               <div class="tab">
-                <Input v-model="orgSearch" placeholder="搜索组织节点"/>
-                <div class="tag-content">
+                <div class="search-row">
+                  <span class="search-label">组织搜索：</span>
+                  <div class="search-input-wrapper">
+                    <Select v-model="orgSearch" filterable :remote-method="getOrgListBySearch" @on-change="getOrgOption" :loading="loadingOrg" placeholder="请输入组织名称" style="width: 100%;" clearable>
+                      <Option v-for="(option, index) in orgSearchList" :value="option.orgUnitId" :key="index">{{option.name}}</Option>
+                    </Select>
+                  </div>
+                </div>
+                <div class="tag-content" v-if="isQuickOpen && orgTagList.length > 0">
                   <span>快捷选择：</span>
-                  <div class="tag-list">
-                    <span class="tag" v-for="item in tagList" :key="item.key">{{item.v}}</span>
+                  <div class="custom-select-wrapper">
+                    <Select
+                        v-model="selectedOrgTagKey"
+                        placeholder="请选择快捷标签"
+                        transfer
+                        clearable
+                        @on-change="handleOrgTagSelect"
+                        @on-clear="handleOrgTagClear"
+                        style="width: 600px;"
+                        :disabled="!orgTagList.length"
+                    >
+                      <Option
+                          v-for="item in orgTagList"
+                          :value="item.quickPickKey"
+                          :key="item.quickPickKey"
+                          :class="{ 'active-option': item.checked }"
+                      >
+                        {{ item.quickPickName }}
+                      </Option>
+                      <!-- 无数据提示 -->
+                      <Option value="" v-if="!postTagList.length" disabled>
+                        暂无快捷标签
+                      </Option>
+                    </Select>
                   </div>
                 </div>
                 <div class="tree">
-                  <organizeTree @handleChange="getOrgList" ref="organizeTree"></organizeTree>
+                  <organizeTree v-if="orgTreeLoaded" @handleChange="getOrgList" ref="orgTree" :treeList="orgTree" :is-custom-tree="true" :disable-lazy-load="false"></organizeTree>
                 </div>
                 <div class="bottom-select">
                   <CheckboxGroup v-model="includeLevelOrg">
@@ -35,21 +65,58 @@
                 </div>
               </div>
             </TabPane>
-            <TabPane label="选择岗位" name="post">
+            <TabPane label="岗位选择" name="post" v-if="name.includes('post')">
               <div class="tab post">
-                <div class="left">
-                  <div v-for="item in positiontList" :class="[item.checked&&'active']" :key="item.positionId" @click="getPosionId(item)">{{ item.positionName }}</div>
+                <div class="left" style="height: 450px; overflow: hidden; position: relative; z-index: 1;">
+                  <div class="scroll-container">
+                    <div class="position-item"
+                         v-for="item in positiontList"
+                         :class="[selectedPositionId === item.positionId ? 'active' : '']"
+                         :key="item.positionId"
+                         @click="getPosionId(item)">
+                      {{ item.positionName }} <!-- 无需修改模板，仅通过样式实现自动换行 -->
+                    </div>
+                  </div>
                 </div>
                 <div class="right">
-                  <Input v-model="orgSearch" placeholder="搜索组织节点"/>
-                  <div class="tag-content">
+                  <div class="search-row">
+                    <span class="search-label">组织搜索：</span>
+                    <div class="search-input-wrapper">
+                      <Select v-model="postSearch" filterable :remote-method="getPostListBySearch" @on-change="getPostOption" placeholder="请输入组织名称" :loading="loadingPost" clearable @on-clear="handlePostSearchClear" style="width: 100%;">
+                        <Option v-for="(option, index) in postSearchList" :value="option.orgUnitId" :key="index">{{option.name}}</Option>
+                      </Select>
+                    </div>
+                  </div>
+                  <div class="tag-content" v-if="isQuickOpen && postTagList.length > 0">
                     <span>快捷选择：</span>
-                    <div class="tag-list">
-                      <span class="tag" v-for="item in tagList" :key="item.key">{{item.v}}</span>
+                    <div class="custom-select-wrapper">
+                      <Select
+                          v-model="selectedPostTagKey"
+                          placeholder="请选择快捷标签"
+                          transfer
+                          clearable
+                          @on-change="handlePostTagSelect"
+                          @on-clear="handlePostTagClear"
+                          style="width: 365px;"
+                          :disabled="!postTagList.length"
+                      >
+                        <Option
+                            v-for="item in postTagList"
+                            :value="item.quickPickKey"
+                            :key="item.quickPickKey"
+                            :class="{ 'active-option': item.checked }"
+                        >
+                          {{ item.quickPickName }}
+                        </Option>
+                        <!-- 无数据提示 -->
+                        <Option value="" v-if="!postTagList.length" disabled>
+                          暂无快捷标签
+                        </Option>
+                      </Select>
                     </div>
                   </div>
                   <div class="tree">
-                    <organizeTree @handleChange="getPostList" ref="postTree"></organizeTree>
+                    <organizeTree v-if="postTreeLoaded" @handleChange="getPostList" ref="postTree" :treeList="postTree" :is-custom-tree="true" :disable-lazy-load="false"></organizeTree>
                   </div>
                   <div class="bottom-select">
                     <CheckboxGroup v-model="includeLevelPost">
@@ -62,32 +129,127 @@
                 </div>
               </div>
             </TabPane>
-            <TabPane label="选择人员" name="staff">
-              <div class="tab">
-                <Input v-model="staffSearch" @on-blur="queryAllStaffList"	 placeholder="搜索组织节点"/>
-                <div class="tree staff-content">
-                  <div :class="['gust-item',item.checked && 'staff-active']" v-for="item in staffAllList" :key="item.id"  @click="handlestaff(item)">
-                    <div class="left-panel">{{item.name && item.name.slice(0,1) || ''}}</div>
-                    <div class="right-panel">
-                      <p>{{item.name}}</p>
-                      <p>{{item.orgNodeName}}</p>
+            <TabPane label="直接选择人员" name="staff" v-if="name.includes('staff')">
+              <div class="tab staff-left-right-layout">
+                <!-- 左侧：组织选择区域（限制高度） -->
+                <div class="staff-left-panel">
+                  <div class="panel-title">组织选择</div>
+                  <div class="tree staff-org-tree">
+                    <div class="tree-scroll-force">
+                      <organizeTree
+                          v-if="staffTreeLoaded"
+                          @handleChange="getStaffList"
+                          ref="staffTree"
+                          :treeList="staffTree"
+                          :showCheckbox="true"
+                          :checkStrictly="true"
+                          :autoExpandParent="true"
+                          :isSingleSelect="true"
+                          :default-org-unit-id="defaultOrgUnitId"
+                          :is-custom-tree="true"
+                          :disable-lazy-load="false"
+                      ></organizeTree>
                     </div>
-                    <div class="checked-icon" v-show="item.checked">✔</div>
                   </div>
                 </div>
-                <div class="bottom-select">
-                  <div>当前已选择 <span class="num">{{getCheckedStaff}}</span>人</div>
-                  <Button type="primary" icon="md-add" @click="addStaffList">添加人员</Button>
+                <div class="staff-right-panel">
+                  <Input v-model="staffSearch" @on-enter="searchStaff" @on-search="searchStaff" search placeholder="搜索人员"/>
+                  <div style="position:relative;">
+                    <div class="tree staff-content" @scroll="handleScroll">
+                      <div :class="['gust-item',item.checked && 'staff-active']"
+                           v-for="(item, index) in staffAllList"
+                           :key="`staff_${index}_${item.id}`"
+                           @click="handlestaff(item)">
+                        <!-- 移除 Checkbox 组件 -->
+                        <div class="left-panel-pro">{{item.name && item.name.slice(0,1) || ''}}</div>
+                        <div class="right-panel-pro">
+                          <p>{{item.name}}</p>
+                          <p>{{item.orgNodeName || item.orgUnitName}}</p>
+                        </div>
+                      </div>
+                      <p v-if="staffEnding" style="color:#CCCCCC;text-align: center">---我也是有底线的---</p>
+                    </div>
+                    <Spin v-if="loadingStaff" size="large" fix />
+                  </div>
+                  <!--                  <div class="bottom-select">-->
+                  <!--                    <div>当前已选择 <span class="num">{{getCheckedStaff}}</span>人</div>-->
+                  <!--                    <Button type="primary" icon="md-add" @click="addStaffList">添加人员</Button>-->
+                  <!--                  </div>-->
+                </div>
+              </div>
+            </TabPane>
+            <TabPane label="组织选择" name="orgNew" v-if="name.includes('orgNew')">
+              <div class="tab org-new-tab">
+                <div class="org-new-header">
+                  <Input v-model="orgNewSearch" @on-enter="searchOrgNew" @on-search="searchOrgNew" search placeholder="搜索组织节点名称（如：办公室）" style="width: 100%;"/>
+                  <div class="org-new-actions">
+                    <Button type="primary" ghost @click="expandAllOrgNew">展开全部</Button>
+                    <Button type="primary" ghost @click="collapseAllOrgNew">折叠全部</Button>
+                    <!--                    <Button type="default" @click="clearOrgNew">清空</Button>-->
+                  </div>
+                </div>
+                <div class="org-new-content">
+                  <div class="org-card" v-for="(province, index) in filteredOrgNewTree" :key="province.orgUnitId">
+                    <div class="org-card-header" @click="toggleProvinceExpand(province)">
+                      <div class="org-card-title" @click.stop="addOrgNewItem(province)">
+                        <img src="./assets/icon.png" alt="" style="margin-right: 8px; width: 14px; height: 14px;"/>
+                        {{ province.title }}
+                      </div>
+                      <div class="org-card-actions" v-if="province.children && province.children.length > 0">
+                        <Button type="text" @click.stop="selectAllProvinceOrgNew(province)">全选（包含下级）</Button>
+                        <Icon size="20" :type="province.expand ? 'md-arrow-dropdown' : 'md-arrow-dropright'" style="margin-left: 8px;"/>
+                      </div>
+                    </div>
+                    <div class="org-card-body" v-if="province.expand && province.children && province.children.length > 0">
+                      <div class="city-card" v-for="city in province.children" :key="city.orgUnitId">
+                        <div class="city-card-header" @click="toggleCityExpand(city)">
+                          <div class="city-card-title" @click.stop="addOrgNewItem(city)">
+                            <img src="./assets/icon.png" alt="" style="margin-right: 8px; width: 14px; height: 14px;"/>
+                            {{ city.title }}
+                          </div>
+                          <div class="city-card-actions" v-if="city.children && city.children.length > 0">
+                            <Button type="text" @click.stop="selectAllCityOrgNew(city)">全选（包含下级）</Button>
+                            <!--                            <Button type="text" @click.stop="selectAllCityLevelOrgNew(city)">全选市本级</Button>-->
+                            <Icon size="20" :type="city.expand ? 'md-arrow-dropdown' : 'md-arrow-dropright'" style="margin-left: 8px;"/>
+                          </div>
+                        </div>
+                        <div class="city-card-body" v-if="city.expand && city.children && city.children.length > 0">
+                          <div class="district-grid">
+                            <div class="district-item" v-for="district in city.children" :key="district.orgUnitId">
+                              <div class="district-header" @click="toggleDistrictExpand(district)">
+                                <div class="district-title" @click.stop="addOrgNewItem(district)">
+                                  <img src="./assets/icon.png" alt="" style="margin-right: 8px; width: 14px; height: 14px;"/>
+                                  {{ district.title }}
+                                </div>
+                                <div class="district-actions" v-if="district.children && district.children.length > 0">
+                                  <Button type="text" @click.stop="selectAllDistrictOrgNew(district)">全选</Button>
+                                  <Icon size="20" :type="district.expand ? 'md-arrow-dropdown' : 'md-arrow-dropright'" style="margin-left: 8px;"/>
+                                </div>
+                              </div>
+                              <div class="district-body" v-if="district.expand && district.children && district.children.length > 0">
+                                <div class="org-unit-item" v-for="unit in district.children" :key="unit.orgUnitId">
+                                  <div class="unit-title" @click="addOrgNewItem(unit)">
+                                    <img src="./assets/icon.png" alt="" style="margin-right: 8px; width: 14px; height: 14px;"/>
+                                    {{ unit.title }}
+                                  </div>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
                 </div>
               </div>
             </TabPane>
           </Tabs>
         </div>
         <div class="form-content">
-          <p>已选择条件 <span class="num">（{{getCheckTypenum}}）</span></p>
+          <p v-if="name.length > 1">已选择条件 <span class="num">（{{getCheckTypenum}}）</span></p>
           <div class="node-list">
             <!--              组织节点条件：-->
-            <div>
+            <div v-if="name.includes('org')">
               <div class="group-box flex-r-bt">
                 <div>组织节点条件：</div>
                 <div class="clear-btn" @click="clearGroup">清除全部</div>
@@ -101,7 +263,7 @@
               </div>
             </div>
             <!--              组织节点+岗位条件：//-->
-            <div>
+            <div v-if="name.includes('post')">
               <div class="group-box flex-r-bt">
                 <div>岗位条件+组织节点：</div>
                 <div class="clear-btn" @click="clearPost">清除全部</div>
@@ -115,17 +277,51 @@
               </div>
             </div>
             <!--              直接选择人员：-->
-            <div>
+            <div v-if="name.includes('staff')">
               <div class="group-box flex-r-bt">
-                <div>直接选择人员：</div>
+                <div>已选择人员：</div>
                 <div class="clear-btn" @click="clearStaff">清除全部</div>
               </div>
               <div class="group-list-content">
-                <p class="list-item flex-r-bt" v-for="(item,index) in staffList" :key="item.id">
+                <p class="list-item flex-r-bt" v-for="(item,index) in staffList" :key="item.userId">
                   <span>{{item.name}}</span>
                   <img class="clear-icon" src="./assets/delete.png" alt="" @click="clearStaffByIndex(index)">
                 </p>
-                <p style="color:#CCCCCC" class="list-item" v-if="!staffList.length">未选择直接选择人员</p>
+                <p style="color:#CCCCCC" class="list-item" v-if="!staffList.length">未选择人员</p>
+              </div>
+            </div>
+            <!--              组织选择（新）：-->
+            <div v-if="name.includes('orgNew')">
+              <div class="group-box flex-r-bt">
+                <div>已选择组织：</div>
+                <div class="clear-btn" @click="clearOrgNewList">清除全部</div>
+              </div>
+              <div class="group-list-content">
+                <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>
@@ -147,16 +343,28 @@ export default {
     },
     data:{
       type:Object,
-      default:{}
+      default:()=>{}
     },
     name:{
-      value:String,
-      default:"org"
+      type:Array ,
+      default(){return ['org','post','staff']}
+    },
+    isQuickOpen:{
+      type: Boolean,
+      default: false
+    },
+    defaultOrgUnitId:{
+      type: String,
+      default: ''
+    },
+    staffSingle:{
+      type: Boolean,
+      default: false
     }
   },
   data(){
     return {
-      tabName:this.name,
+      tabName:this.name[0],
       modal:false,
       dialogOpen:false,
       orgSearch:'',
@@ -164,31 +372,408 @@ export default {
       proOrgList:[],
       includeLevelOrg:[],
       orgList:[],
+      loadingOrg:false,
+      orgSearchList:[],
+      orgTree:[],
       //岗位--form
+      postSearch:'',
       proPostList:[],
       postList:[],
+      loadingPost:false,
+      postSearchList:[],
       includeLevelPost:[],
       positiontList:[],
+      postTree:[],
       //直接人员
       staffSearch:'',
       staffAllList:[],
       staffList:[],
-      tagList:[{
-        v:'所选市公司所有部门',
-        on:false,
-        key:'07'
-      },{
-        v:'所有市公司',
-        on:false,
-        key:'08'
-      }],
+      loadingStaff:false,
+      lastLoadingTime:0,
+      offset:0,
+      staffEnding:false,
+      parentOrgList: [],
+      orgTagList:[],
+      postTagList:[],
+      selectedPositionId: null, // 岗位单选的选中状态存储
+      selectedOrgTagKey: '', // 存储选中标签的唯一标识
+      selectedPostTagKey: '', // 存储选中标签的唯一标识
+      //人员选择
+      staffTree:[],
+      staffTagList:[],
+      staffOrgList:[],
+      staffSearchList:[],
+      selectedStaffOrgId: '', // 选中的组织节点ID
+      proStaffOrgList: [], // 暂存选中的组织节点
+      initialDefaultOrgUnitId: '', // 缓存初始defaultOrgUnitId
+      // staffTreeInited: false, // 组织树初始化完成标记
+      // 树加载完成标记
+      orgTreeLoaded: false,
+      postTreeLoaded: false,
+      staffTreeLoaded: false,
+      // 缓存原始组织树/岗位树数据
+      originalOrgTree: [], // 组织Tab原始树缓存
+      originalPostTree: [], // 岗位Tab原始树缓存
+      staffTreeInited: false, // 组织树初始化完成标记（用于需求3）
+      //组织选择（新）
+      orgNewSearch: '',
+      orgNewTree: [],
+      proOrgNewList: [],
+      includeLevelOrgNew: [],
+      orgNewList: []
     }
   },
   mounted() {
+    this.queryTagList()
     this.queryPositionList()
-    this.queryAllStaffList()
+    // this.loadMore()
+    this.initialDefaultOrgUnitId = this.defaultOrgUnitId || ''; // 缓存初始值
+    this.initOrgOrgTree()
+    this.initPostOrgTree()
+    this.initStaffOrgTree()
+    this.initOrgNewTree()
   },
+
   methods:{
+    async initOrgOrgTree() {
+      try {
+        this.proOrgList = [];
+        this.orgSearch = '';
+        this.orgSearchList = [];
+        this.orgTreeLoaded = false;
+
+        const orgDetailRes = await ajax.get(`/pub-manage-server/pub/organ/q/queryOrg`, {
+          params: { orgUnitId: '' }
+        });
+
+        if (orgDetailRes.data.code !== 1 || !orgDetailRes.data.data) {
+          this.$Message.warning("未查询到组织根节点，显示空树");
+          this.orgTree = [];
+          this.originalOrgTree = []; // 缓存空数据
+          this.orgTreeLoaded = true;
+          return;
+        }
+
+        const rootOrgData = orgDetailRes.data.data;
+        const leafNode = await this.judgeNodeLeafe(rootOrgData.orgUnitId);
+        const rootNode = this.safeDeepCopy({
+          orgUnitId: rootOrgData.orgUnitId,
+          orgUnitName: rootOrgData.orgUnitName,
+          parentOrgUnitId: rootOrgData.parentOrgUnitId,
+          leafNode: leafNode,
+          title: rootOrgData.orgUnitName || `未命名组织(${rootOrgData.orgUnitId})`,
+          expand: true,
+          orgChildrenList: [],
+          children: []
+        });
+
+        let parentsList = [];
+        try {
+          parentsList = await this.getParentOrgNodesByOrgUnitId(rootOrgData.orgUnitId);
+        } catch (e) {
+          console.warn('父节点查询失败，仅显示根节点:', e);
+          parentsList = [];
+        }
+
+        const safeParents = this.safeDeepCopy(parentsList).map(node => ({
+          orgUnitId: node.orgUnitId,
+          orgUnitName: node.orgUnitName || node.name,
+          parentOrgUnitId: node.parentOrgUnitId || node.parentId,
+          leafNode: false,
+          title: node.orgUnitName || node.name || `未命名组织(${node.orgUnitId})`,
+          expand: true,
+          orgChildrenList: [],
+          children: []
+        }));
+
+        const treeSourceData = [...safeParents, rootNode].filter(Boolean);
+        this.orgTree = this.buildTree(treeSourceData);
+        // 缓存原始树数据
+        this.originalOrgTree = this.safeDeepCopy(this.orgTree);
+
+        if (this.orgTree.length === 0) {
+          this.orgTree = [rootNode];
+          this.originalOrgTree = [rootNode]; // 同步缓存
+        }
+
+        this.orgTreeLoaded = true;
+
+      } catch (e) {
+        console.error("组织选择Tab树初始化失败:", e);
+        this.orgTree = [];
+        this.originalOrgTree = []; // 缓存空数据
+        this.orgTreeLoaded = true;
+        this.$Message.error("组织树初始化失败，请刷新重试");
+      }
+    },
+    async initPostOrgTree() {
+      try {
+        this.proPostList = [];
+        this.postSearch = '';
+        this.postSearchList = [];
+        this.selectedPositionId = null;
+        this.postTreeLoaded = false;
+
+        const orgDetailRes = await ajax.get(`/pub-manage-server/pub/organ/q/queryOrg`, {
+          params: { orgUnitId: '' }
+        });
+
+        if (orgDetailRes.data.code !== 1 || !orgDetailRes.data.data) {
+          this.$Message.warning("未查询到组织根节点，显示空树");
+          this.postTree = [];
+          this.originalPostTree = []; // 缓存空数据
+          this.postTreeLoaded = true;
+          return;
+        }
+
+        const rootOrgData = orgDetailRes.data.data;
+        const leafNode = await this.judgeNodeLeafe(rootOrgData.orgUnitId);
+        const rootNode = this.safeDeepCopy({
+          orgUnitId: rootOrgData.orgUnitId,
+          orgUnitName: rootOrgData.orgUnitName,
+          parentOrgUnitId: rootOrgData.parentOrgUnitId,
+          leafNode: leafNode,
+          title: rootOrgData.orgUnitName || `未命名组织(${rootOrgData.orgUnitId})`,
+          expand: true,
+          orgChildrenList: [],
+          children: []
+        });
+
+        let parentsList = [];
+        try {
+          parentsList = await this.getParentOrgNodesByOrgUnitId(rootOrgData.orgUnitId);
+        } catch (e) {
+          console.warn('岗位Tab父节点查询失败:', e);
+          parentsList = [];
+        }
+
+        const safeParents = this.safeDeepCopy(parentsList).map(node => ({
+          orgUnitId: node.orgUnitId,
+          orgUnitName: node.orgUnitName || node.name,
+          parentOrgUnitId: node.parentOrgUnitId || node.parentId,
+          leafNode: false,
+          title: node.orgUnitName || node.name || `未命名组织(${node.orgUnitId})`,
+          expand: true,
+          orgChildrenList: [],
+          children: []
+        }));
+
+        const treeSourceData = [...safeParents, rootNode].filter(Boolean);
+        this.postTree = this.buildTree(treeSourceData);
+        // 缓存原始树数据
+        this.originalPostTree = this.safeDeepCopy(this.postTree);
+
+        if (this.postTree.length === 0) {
+          this.postTree = [rootNode];
+          this.originalPostTree = [rootNode]; // 同步缓存
+        }
+
+        this.postTreeLoaded = true;
+
+      } catch (e) {
+        console.error("岗位选择Tab树初始化失败:", e);
+        this.postTree = [];
+        this.originalPostTree = []; // 缓存空数据
+        this.postTreeLoaded = true;
+        this.$Message.error("岗位组织树初始化失败，请刷新重试");
+      }
+    },
+
+    async initStaffOrgTree() {
+      try {
+        // 初始化时重置选中状态
+        this.$set(this, 'selectedStaffOrgId', '');
+        this.proStaffOrgList = [];
+        this.staffTreeLoaded = false;
+        const rootOrgId = this.defaultOrgUnitId || '';
+        let rootNode = null;
+        let treeSourceData = []; // 存储树原始数据，避免后续覆盖
+
+        // if (rootOrgId) {
+        //   const orgDetailRes = await ajax.get(`/pub-manage-server/pub/organ/q/queryOrg`, {
+        //     params: { orgUnitId: rootOrgId }
+        //   });
+        //   if (orgDetailRes.data.code === 1 && orgDetailRes.data.data) {
+        //     const orgData = orgDetailRes.data.data;
+        //     const leafNode = await this.judgeNodeLeafe(rootOrgId);
+        //     rootNode = this.safeDeepCopy({
+        //       ...orgData,
+        //       orgNodeName: orgData.orgUnitName || '',
+        //       title: orgData.orgUnitName || `未命名组织(${orgData.orgUnitId || ''})`,
+        //       leafNode,
+        //       expand: true,
+        //       parentOrgUnitId: orgData.parentOrgUnitId || orgData.parentId,
+        //       orgChildrenList: [], // 初始化自定义子节点字段
+        //       children: [] // 初始化 Tree 组件识别的 children 字段
+        //     });
+        //     // 父节点列表同样同步初始化 children 字段
+        //     let parentsList = await this.getParentOrgNodesByOrgUnitId(rootOrgId);
+        //     const safeParents = this.safeDeepCopy(parentsList);
+        //     safeParents.forEach(node => {
+        //       node.expand = true;
+        //       node.parentOrgUnitId = node.parentId;
+        //       node.orgNodeName = node.orgUnitName || node.orgNodeName || '';
+        //       node.title = node.orgUnitName || node.name || `未命名组织(${node.orgUnitId || ''})`;
+        //       node.orgChildrenList = [];
+        //       node.children = []; // 父节点也初始化 children 字段
+        //       node.leafNode = false;
+        //     });
+        //     treeSourceData = [...safeParents, rootNode];
+        //   } else {
+        //     this.$Message.error("根据默认组织ID查询根节点失败！");
+        //     return;
+        //   }
+        // } else {
+        //   // defaultOrgUnitId为空时，沿用原有接口/pub/personHelpBox/q/getOrgUnitList
+        //   const res = await ajax.get('/pub-manage-server/pub/personHelpBox/q/getOrgUnitList', {
+        //     params: { containsCurLevel: true }
+        //   });
+        //   if (res.data.code === 1) {
+        //     rootNode = res.data.data[0] || null;
+        //     if (rootNode) {
+        //       rootNode.expand = true;
+        //       rootNode.parentOrgUnitId = rootNode.parentId;
+        //       treeSourceData = [rootNode];
+        //     }
+        //   }
+        // }
+        const orgDetailRes = await ajax.get(`/pub-manage-server/pub/organ/q/queryOrg`, {
+          params: { orgUnitId: rootOrgId }
+        });
+        if (orgDetailRes.data.code === 1 && orgDetailRes.data.data) {
+          const orgData = orgDetailRes.data.data;
+          const leafNode = await this.judgeNodeLeafe(rootOrgId);
+          rootNode = this.safeDeepCopy({
+            ...orgData,
+            orgNodeName: orgData.orgUnitName || '',
+            title: orgData.orgUnitName || `未命名组织(${orgData.orgUnitId || ''})`,
+            leafNode,
+            expand: true,
+            parentOrgUnitId: orgData.parentOrgUnitId || orgData.parentId,
+            orgChildrenList: [], // 初始化自定义子节点字段
+            children: [] // 初始化 Tree 组件识别的 children 字段
+          });
+          // 父节点列表同样同步初始化 children 字段
+          let parentsList = await this.getParentOrgNodesByOrgUnitId(rootOrgId);
+          const safeParents = this.safeDeepCopy(parentsList);
+          safeParents.forEach(node => {
+            node.expand = true;
+            node.parentOrgUnitId = node.parentId;
+            node.orgNodeName = node.orgUnitName || node.orgNodeName || '';
+            node.title = node.orgUnitName || node.name || `未命名组织(${node.orgUnitId || ''})`;
+            node.orgChildrenList = [];
+            node.children = []; // 父节点也初始化 children 字段
+            node.leafNode = false;
+          });
+          treeSourceData = [...safeParents, rootNode];
+        } else {
+          this.$Message.error("根据默认组织ID查询根节点失败！");
+          this.staffTreeLoaded = true;
+          return;
+        }
+        // 构建组织树，且仅赋值一次，避免后续覆盖
+        if (treeSourceData.length > 0) {
+          const tree = this.buildTree(treeSourceData);
+          this.staffTree = this.safeDeepCopy(tree);
+          // 标记树已初始化完成，防止后续重复构建覆盖
+          // this.staffTreeInited = true;
+          this.staffTreeLoaded = true;
+        }
+      } catch (e) {
+        this.$Message.error("人员选择组织树初始化失败！");
+        console.error(e);
+        this.staffTreeLoaded = true;
+      }
+    },
+    handlePostTagSelect(quickPickKey) {
+      // 清空暂存列表
+      this.proPostList = [];
+      // 找到选中的标签对象
+      const selectedItem = this.postTagList.find(
+          item => item.quickPickKey === quickPickKey
+      );
+
+      if (selectedItem) {
+        // 重置其他标签的选中状态
+        this.postTagList.forEach(tag => tag.checked = false);
+        // 触发原有的处理方法
+        this.fastChedkPost(selectedItem);
+        // 清空搜索框绑定的值
+        this.postSearch = '';
+        // 清空搜索结果列表
+        this.postSearchList = [];
+      }
+    },
+    handleOrgTagSelect(quickPickKey) {
+      // 清空暂存列表
+      this.proOrgList = [];
+      // 找到选中的标签对象
+      const selectedItem = this.orgTagList.find(
+          item => item.quickPickKey === quickPickKey
+      );
+
+      if (selectedItem) {
+        // 重置其他标签的选中状态
+        this.orgTagList.forEach(tag => tag.checked = false);
+        // 触发原有的处理方法
+        this.fastChedkOrg(selectedItem);
+        // 清空搜索框绑定的值
+        this.orgSearch = '';
+        // 清空搜索结果列表
+        this.orgSearchList = [];
+      }
+    },
+    handleOrgTagClear() {
+      this.selectedOrgTagKey = '';
+      // 重置所有标签的选中状态
+      this.orgTagList.forEach(tag => {
+        tag.checked = false;
+      });
+
+      // 3. 清空树选择状态和暂存列表
+      if (this.$refs.orgTree && this.orgSearchList) {
+        this.$refs.orgTree.initData();
+      }
+      // 4. 可选：添加清空提示
+      this.$Message.info("已清空快捷标签选择");
+    },
+    // 修正清空逻辑方法（与事件名称对应）
+    handlePostTagClear() {
+      // 1. 重置选中的标签key
+      this.selectedPostTagKey = '';
+
+      // 2. 重置所有标签的选中状态
+      this.postTagList.forEach(tag => {
+        tag.checked = false;
+      });
+
+      // 3. 清空树选择状态和暂存列表
+      if (this.$refs.postTree) {
+        this.$refs.postTree.initData();
+        this.proPostList = [];
+      }
+
+      // 4. 可选：添加清空提示
+      this.$Message.info("已清空快捷标签选择");
+    },
+    handlePostSearchClear() {
+      // 清空搜索框绑定的值
+      this.postSearch = '';
+
+      // 清空搜索结果列表
+      this.postSearchList = [];
+
+      // 重置树组件状态（与原有逻辑保持一致）
+      if (this.$refs.postTree) {
+        this.$refs.postTree.initData();
+      }
+
+      // 清空暂存列表
+      this.proPostList = [];
+
+      // 可选：添加清空提示
+      this.$Message.info("已清空组织选择搜索");
+    },
     queryPositionList(){
       ajax.get('/pub-manage-server/pub/personHelpBox/q/queryPositionList').then((res)=>{
         if(res.data.code === 1){
@@ -198,38 +783,487 @@ export default {
         }
       })
     },
-    queryAllStaffList(){
-      ajax.get('/pub-manage-server/pub/personHelpBox/q/queryAllStaffList?search='+this.staffSearch).then((res)=>{
-        if(res.data.code === 1){
-          let staffAllList = res.data.data && res.data.data.rows || []
-          staffAllList.map((item)=>item.checked=false)
-          this.staffAllList = staffAllList
+    getOrgListBySearch(query){
+      if (query !== '') {
+        this.loadingOrg = true;
+        this.getOrgUnitBySearchTerm(query,(res)=>{
+          this.loadingOrg = false
+          if(res.data.code === 1){
+            let resp = res.data.data?.items??[]
+            this.orgSearchList = resp
+          }else{
+            this.orgSearchList = []
+            this.$Message.error("获取组织节点列表失败！")
+          }
+        })
+      }else{
+        this.orgSearchList = [];
+      }
+    },
+    getPostListBySearch(query) {
+      if (query !== '') {
+        this.loadingPost = true;
+        this.getOrgUnitBySearchTerm(query, (res) => {
+          this.loadingPost = false;
+          if (res.data.code === 1) {
+            let resp = res.data.data?.items ?? [];
+            this.postSearchList = this.safeDeepCopy(resp);
+          } else {
+            this.postSearchList = [];
+            this.$Message.error("获取组织节点列表失败！");
+          }
+        });
+      } else {
+        // 仅清空搜索结果，不重置树数据
+        this.postSearchList = [];
+        // 仅重置选中状态，保留树结构
+        if (this.$refs.postTree) {
+          this.$refs.postTree.initData(); // 清空选中状态
+          this.proPostList = []; // 清空暂存列表
         }
-      })
+        // 移除清空树数据的代码
+        // this.$set(this, 'postTree', []);
+      }
+    },
+    getOrgUnitBySearchTerm(query,callback){
+      ajax.get('/pub-manage-server/pub/personHelpBox/q/getOrgUnitBySearchTerm?searchTerm='+query).then((res)=>{callback(res)})
+    },
+    async getOrgOption(val) {
+      this.selectedOrgTagKey = '';
+      this.orgTagList.forEach(tag => tag.checked = false);
+      this.proOrgList = [];
+      if (!val) {
+        // 清空搜索时恢复原始树数据，而非置空
+        this.orgTree = this.safeDeepCopy(this.originalOrgTree);
+        // 同步更新子组件数据
+        this.$nextTick(() => {
+          if (this.$refs.orgTree) {
+            this.$refs.orgTree.data = this.safeDeepCopy(this.orgTree);
+            // 重置树选中状态，但保留树结构
+            this.$refs.orgTree.initData();
+          }
+        });
+        return;
+      }
+      const orgDetailRes = await ajax.get(`/pub-manage-server/pub/organ/q/queryOrg`, {
+        params: { orgUnitId: val }
+      });
+
+      if (orgDetailRes.data.code !== 1 || !orgDetailRes.data.data) {
+        this.$Message.error("获取组织节点详情失败！");
+        return;
+      }
+
+      const nodeData = orgDetailRes.data.data;
+      const currentNode = this.safeDeepCopy({
+        orgUnitId: nodeData.orgUnitId,
+        orgUnitName: nodeData.orgUnitName,
+        parentOrgUnitId: nodeData.parentOrgUnitId,
+        leafNode: nodeData.leafNode || await this.judgeNodeLeafe(nodeData.orgUnitId),
+        title: nodeData.orgUnitName || `未命名组织(${nodeData.orgUnitId})`,
+        expand: true,
+        orgChildrenList: [],
+        children: []
+      });
+
+      try {
+        let parentsList = await this.getParentOrgNodesByOrgUnitId(val);
+        const safeParents = this.safeDeepCopy(parentsList).map(node => ({
+          orgUnitId: node.orgUnitId,
+          orgUnitName: node.orgUnitName || node.name,
+          parentOrgUnitId: node.parentOrgUnitId || node.parentId,
+          leafNode: false,
+          title: node.orgUnitName || node.name || `未命名组织(${node.orgUnitId})`,
+          expand: true,
+          orgChildrenList: [],
+          children: []
+        }));
+
+        const treeSourceData = [...safeParents, currentNode].filter(Boolean);
+        this.orgTree = this.buildTree(treeSourceData);
+
+        // 强制更新子组件数据
+        this.$nextTick(() => {
+          if (this.$refs.orgTree) {
+            this.$refs.orgTree.data = this.safeDeepCopy(this.orgTree);
+          }
+        });
+      } catch (e) {
+        this.$Message.error("更新组织树失败！");
+      }
+    },
+    async getPostOption(val) {
+      this.selectedPostTagKey = '';
+      this.postTagList.forEach(tag => tag.checked = false);
+
+      if (!val) {
+        // 清空搜索时恢复原始树数据
+        this.postTree = this.safeDeepCopy(this.originalPostTree);
+        this.proPostList = [];
+        this.postSearch = '';
+        // 同步更新子组件数据
+        this.$nextTick(() => {
+          if (this.$refs.postTree) {
+            this.$refs.postTree.data = this.safeDeepCopy(this.postTree);
+            // 重置树选中状态，但保留树结构
+            this.$refs.postTree.initData();
+          }
+        });
+        return;
+      }
+
+      // 原有逻辑保持不变
+      const orgDetailRes = await ajax.get(`/pub-manage-server/pub/organ/q/queryOrg`, {
+        params: { orgUnitId: val }
+      });
+
+      if (orgDetailRes.data.code !== 1 || !orgDetailRes.data.data) {
+        this.$Message.error("获取组织节点详情失败！");
+        return;
+      }
+
+      const nodeData = orgDetailRes.data.data;
+      const currentNode = this.safeDeepCopy({
+        orgUnitId: nodeData.orgUnitId,
+        orgUnitName: nodeData.orgUnitName,
+        parentOrgUnitId: nodeData.parentOrgUnitId,
+        leafNode: nodeData.leafNode || await this.judgeNodeLeafe(nodeData.orgUnitId),
+        title: nodeData.orgUnitName || `未命名组织(${nodeData.orgUnitId})`,
+        expand: true,
+        orgChildrenList: [],
+        children: []
+      });
+
+      try {
+        let parentsList = await this.getParentOrgNodesByOrgUnitId(val);
+        const safeParents = this.safeDeepCopy(parentsList).map(node => ({
+          orgUnitId: node.orgUnitId,
+          orgUnitName: node.orgUnitName || node.name,
+          parentOrgUnitId: node.parentOrgUnitId || node.parentId,
+          leafNode: false,
+          title: node.orgUnitName || node.name || `未命名组织(${node.orgUnitId})`,
+          expand: true,
+          orgChildrenList: [],
+          children: []
+        }));
+
+        const treeSourceData = [...safeParents, currentNode].filter(Boolean);
+        this.postTree = this.buildTree(treeSourceData);
+
+        this.$nextTick(() => {
+          if (this.$refs.postTree && this.$refs.postTree.setCheckedNodes) {
+            this.$refs.postTree.setCheckedNodes([val]);
+            this.proPostList = [currentNode];
+          }
+          // 强制更新子组件数据
+          if (this.$refs.postTree) {
+            this.$refs.postTree.data = this.safeDeepCopy(this.postTree);
+          }
+        });
+      } catch (e) {
+        this.$Message.error("更新岗位组织树失败！");
+      }
     },
-    getOrgList(data){
-      this.proOrgList = data
+    async getStaffOption(val) {
+      this.staffOrgList = [];
+      if(!val) return this.$refs.staffTree.initData();
+      let item = this.staffSearchList.filter((item)=> item.orgUnitId === val).shift();
+      if (!item) return;
+
+      const leafNode = await this.judgeNodeLeafe(item.orgUnitId);
+      const ftem = this.safeDeepCopy({
+        ...item,
+        orgNodeName: item.name,
+        parentOrgUnitId: item.parentId,
+        leafNode: leafNode
+      });
+
+      try{
+        let parentsList = await this.getParentOrgNodesByOrgUnitId(val);
+        // 对父节点列表进行安全拷贝
+        const safeParents = this.safeDeepCopy(parentsList);
+        let tree = this.buildTree([...safeParents, ftem]);
+        this.staffTree = this.safeDeepCopy(tree);
+      }catch(e){
+        this.$Message.error("获取组织节点列表失败！");
+      }
     },
-    getPostList(data){
-      this.proPostList = data
+    getParentOrgNodesByOrgUnitId(val) {
+      return new Promise((resolve) => {
+        ajax.get('/pub-manage-server/pub/personHelpBox/q/getParentOrgNodesByOrgUnitId?orgUnitId='+val)
+            .then((res) => {
+              if (res.data.code === 1) {
+                const parentsList = res.data?.data?.items ?? [];
+                resolve(parentsList); // 接口正常返回则取数据
+              } else {
+                resolve([]); // 接口报错返回空数组
+              }
+            })
+            .catch(() => {
+              resolve([]); // 网络/请求失败返回空数组
+            });
+      });
     },
-    addOrgList(){
-      if(!this.proOrgList.length) return this.$Message.error("请先选择组织节点！")
-      let proOrgList = deepCopy(this.proOrgList)
-      proOrgList.forEach(item=>{
-        item.title = this.includeLevelOrg.includes('01')?`${item.orgNodeName}（包含下级组织节点）`:item.orgNodeName
-        item.id = this.includeLevelOrg.includes('01')?('01'+'-' + item.orgUnitId):('00'+'-'+item.orgUnitId)
-        item.includeLevel = this.includeLevelOrg.includes('01')
-      })
-      let list = this.orgList.concat(proOrgList)
+    judgeNodeLeafe(orgUnitId) {
+      return new Promise((resolve) => {
+        ajax.get('/pub-manage-server/pub/personHelpBox/q/getOrgUnitList', {
+          params: {
+            containsCurLevel: true,
+            orgUnitId: orgUnitId,
+          }
+        }).then((res) => {
+          if (res.data.code === 1) {
+            const treeList = res.data.data || [];
+            resolve(treeList.length === 0);
+          } else {
+            resolve(false); // 接口失败默认非叶子节点
+          }
+        }).catch(() => {
+          resolve(false); // 网络错误默认非叶子节点
+        });
+      });
+    },
+    buildTree(items) {
+      if (!Array.isArray(items) || items.length === 0) {
+        console.warn('构建树入参为空，返回空数组');
+        return [];
+      }
+
+      const map = new Map();
+      const roots = [];
+      const copiedItems = this.safeDeepCopy(items);
+
+      copiedItems.forEach(item => {
+        if (!item.orgUnitId) return;
+        map.set(item.orgUnitId, this.safeDeepCopy({
+          orgUnitId: item.orgUnitId,
+          orgUnitName: item.orgUnitName,
+          parentOrgUnitId: item.parentOrgUnitId,
+          leafNode: item.leafNode || false,
+          title: item.title || item.orgUnitName || `未命名组织(${item.orgUnitId})`,
+          expand: item.expand || true, // 保留展开状态
+          orgChildrenList: item.orgChildrenList || [],
+          children: item.children || []
+        }));
+      });
+
+      copiedItems.forEach(item => {
+        if (!item.orgUnitId || !map.has(item.orgUnitId)) return;
+
+        const node = map.get(item.orgUnitId);
+        if (!item.parentOrgUnitId || !map.has(item.parentOrgUnitId)) {
+          roots.push(node);
+        } else {
+          const parent = map.get(item.parentOrgUnitId);
+          parent.orgChildrenList.push(node);
+          parent.children.push(node);
+          parent.leafNode = false; // 有子节点则强制非叶子节点
+          parent.expand = true; // 有子节点则强制展开
+        }
+      });
+
+      if (roots.length === 0 && map.size > 0) {
+        roots.push(Array.from(map.values())[0]);
+      }
+
+      return roots;
+    },
+
+    searchStaff(){
+      this.staffEnding = false;
+      this.offset = 0;
+      this.staffAllList = [];
+      // 50ms延迟，解决极端情况下的异步更新问题
+      setTimeout(() => {
+        this.loadMore();
+      }, 50);
+    },
+    queryAllStaffList() {
+      const params = {
+        search: this.staffSearch,
+        offset: this.offset,
+        limit: 20
+      };
+
+      if (this.selectedStaffOrgId && typeof this.selectedStaffOrgId === 'string' && this.selectedStaffOrgId.trim()) {
+        params.orgUnitId = this.selectedStaffOrgId.trim();
+      } else if (this.initialDefaultOrgUnitId && this.initialDefaultOrgUnitId.trim()) {
+        // 初始化及未选中节点时，使用传入的defaultOrgUnitId
+        params.orgUnitId = this.initialDefaultOrgUnitId.trim();
+      } else {
+        params.orgUnitId = '';
+      }
+
+      console.log('人员查询接口参数:', params);
+
+      return new Promise((resolve, reject) => {
+        ajax.get('/pub-manage-server/pub/personHelpBox/q/queryAllStaffList', {
+          params: params
+        }).then((res) => {
+          if (res.data.code === 1) {
+            resolve(res.data.data);
+          } else {
+            reject(false);
+          }
+        }).catch((err) => {
+          reject(err);
+        });
+      });
+    },
+    handleScroll(e){
+      const { scrollTop, clientHeight, scrollHeight } = e.target;
+      if (scrollHeight - (scrollTop + clientHeight) < 50) {
+        this.loadMore();
+      }
+    },
+    async loadMore(){
+      if (this.loadingStaff || this.staffEnding) return
+      this.loadingStaff = true
+      try {
+        console.log("--触底加载/强制加载---", new Date().getTime());
+        let res = await this.queryAllStaffList()
+        let list = res.rows;
+        // 移除这行：list.map((item)=>item.checked=false)
+        this.staffAllList = this.staffAllList.concat(list)
+        this.offset += 20;
+        this.loadingStaff = false
+        this.lastLoadingTime = Date.now()
+        if(res.total===this.staffAllList.length){
+          this.staffEnding = true
+        }
+      }catch (e){
+        this.loadingStaff = false
+        this.lastLoadingTime = Date.now()
+        console.log(e)
+      }
+    },
+    getOrgList(data) {
+      const validNodes = Array.isArray(data)
+          ? data.filter(node => node.orgUnitId)
+          : [];
+
+      // 去重：基于orgUnitId避免重复
+      const uniqueNodes = validNodes.filter((node, index, self) =>
+          self.findIndex(item => item.orgUnitId === node.orgUnitId) === index
+      );
+
+
+      const completeNodes = uniqueNodes.map(node => ({
+        ...node,
+        orgNodeName: node.orgNodeName || node.name || `未命名组织(${node.orgUnitId})`,
+        orgUnitName: node.orgNodeName || node.name || `未命名组织(${node.orgUnitId})`
+      }));
+
+      this.proOrgList = this.safeDeepCopy(completeNodes);
+    },
+
+    getPostList(data) {
+      // 过滤有效节点：仅要求orgUnitId
+      const validNodes = Array.isArray(data)
+          ? data.filter(node => node.orgUnitId)
+          : [];
+
+      // 去重：基于orgUnitId
+      const uniqueNodes = validNodes.filter((node, index, self) =>
+          self.findIndex(item => item.orgUnitId === node.orgUnitId) === index
+      );
+
+      // 补全缺失字段
+      const completeNodes = uniqueNodes.map(node => ({
+        ...node,
+        orgNodeName: node.orgNodeName || node.name || `未命名组织(${node.orgUnitId})`,
+        orgUnitName: node.orgNodeName || node.name || `未命名组织(${node.orgUnitId})`
+      }));
+
+      // 覆盖暂存列表（而非concat，避免累积无效数据）
+      this.proPostList = this.safeDeepCopy(completeNodes);
+    },
+    getStaffList(data) {
+      if (!Array.isArray(data) || data.length === 0) {
+        this.proStaffOrgList = [];
+        // 强制清空并触发响应式更新
+        this.$set(this, 'selectedStaffOrgId', '');
+        // 立即触发搜索，确保orgUnitId参数实时更新为空
+        this.$nextTick(() => this.searchStaff());
+        return;
+      }
+
+      // 过滤仅含有效orgUnitId的节点，排除无效数据
+      const validNodes = data.filter(node =>
+          node.orgUnitId && typeof node.orgUnitId === 'string' // 确保orgUnitId存在且为字符串
+      );
+
+      if (validNodes.length === 0) {
+        this.$Message.warning("所选节点无效，请重新选择");
+        this.proStaffOrgList = [];
+        this.$set(this, 'selectedStaffOrgId', '');
+        // 立即触发搜索，更新参数为空
+        this.$nextTick(() => this.searchStaff());
+        return;
+      }
+
+      // 单选逻辑强化，仅保留最后一个有效选中节点
+      const currentNode = validNodes[validNodes.length - 1];
+      const currentOrgUnitId = currentNode.orgUnitId.trim(); // 去除空格，避免无效字符串
+
+      // 补全节点字段，确保orgUnitId绝对存在
+      const pureNode = this.safeDeepCopy({
+        ...currentNode,
+        orgNodeName: currentNode.orgNodeName || currentNode.name || `未命名组织(${currentOrgUnitId})`,
+        orgUnitName: currentNode.orgNodeName || currentNode.name || `未命名组织(${currentOrgUnitId})`
+      });
+
+      // 清除子节点引用，避免循环引用导致的更新延迟
+      if (pureNode.orgChildrenList) pureNode.orgChildrenList = [];
+      if (pureNode.children) pureNode.children = [];
+
+      // 强制响应式更新，避免Vue数据延迟
+      this.$set(this, 'proStaffOrgList', [pureNode]);
+      this.$set(this, 'selectedStaffOrgId', currentOrgUnitId);
+
+      // 双重nextTick确保数据完全更新后再查询
+      this.$nextTick(() => {
+        if (this.selectedStaffOrgId !== currentOrgUnitId) {
+          this.$set(this, 'selectedStaffOrgId', currentOrgUnitId);
+          this.$nextTick(() => this.searchStaff());
+        } else {
+          this.searchStaff();
+        }
+        console.log('人员选择-当前选中orgUnitId:', this.selectedStaffOrgId); // 调试日志
+      });
+    },
+
+    addOrgList() {
+      // 过滤空节点（仅校验orgUnitId）
+      const validOrgList = this.proOrgList.filter(node => node.orgUnitId);
+      if (!validOrgList.length) return this.$Message.error("请先选择组织节点！");
+
+      let proOrgList = deepCopy(validOrgList);
+      proOrgList.forEach(item => {
+        // 用补全后的orgNodeName，避免空显示
+        item.title = this.includeLevelOrg.includes('01')
+            ? `${item.orgNodeName}（包含下级组织节点）`
+            : item.orgNodeName;
+        item.id = this.includeLevelOrg.includes('01')
+            ? (`01-${item.orgUnitId}`)
+            : (`00-${item.orgUnitId}`);
+        item.includeLevel = this.includeLevelOrg.includes('01');
+      });
+
+      // 去重合并
+      let list = this.orgList.concat(proOrgList);
       let uniqueArray = list.filter((item, index, self) =>
-          index === self.findIndex(t => (
-            t.id === item.id // 基于id属性去重
-          ))
+          index === self.findIndex(t => t.id === item.id)
       );
-      this.orgList = uniqueArray
-      this.$refs.organizeTree.upDataTree()
-      this.proOrgList = []
+      this.orgList = uniqueArray;
+
+      // 清空选中状态
+      if (this.$refs.orgTree && this.$refs.orgTree.clearAllChecked) {
+        this.$refs.orgTree.clearAllChecked(this.$refs.orgTree.data);
+        this.$refs.orgTree.$emit('handleChange', []);
+      }
+      this.$refs.orgTree.upDataTree();
+      this.proOrgList = [];
     },
     clearGroup(){
       this.orgList = []
@@ -239,36 +1273,47 @@ export default {
     },
     //岗位
     getPosionId(item){
-      item.checked = !item.checked;
-    },
-    addPostList(){
-      if(!this.proPostList.length) return this.$Message.error("请选择组织节点！")
-      let proPostList = deepCopy(this.proPostList)
-      let checkedPosition = this.positiontList.filter((item)=>item.checked === true)
-      if(!checkedPosition.length){return this.$Message.error("请选择岗位！！")}
-      //summary data
-      let totalList = []
-      for(let it of checkedPosition){
-        proPostList.forEach(item=>{
-          totalList.push({
-            ...item,
-            ...it,
-            title:`${this.includeLevelPost.length?(item.orgNodeName+'（包含下级组织节点）'):item.orgNodeName}`,
-            includeLevel:this.includeLevelPost.includes('01'),
-            id:this.includeLevelPost.includes('01')?('01'+'-'+it.positionId + '-' + item.orgUnitId):('00'+'-'+it.positionId + '-' + item.orgUnitId),
-          })
-        })
-      }
-      let list = this.postList.concat(totalList)
+      // item.checked = !item.checked;
+      this.selectedPositionId = item.positionId
+    },
+    addPostList() {
+      // 过滤空节点
+      const validPostList = this.proPostList.filter(node => node.orgUnitId);
+      if (!validPostList.length) return this.$Message.error("请选择组织节点！");
+
+      let checkedPosition = this.positiontList.find(item => item.positionId === this.selectedPositionId);
+      if (!checkedPosition) { return this.$Message.error("请选择岗位！"); }
+
+      let totalList = [];
+      validPostList.forEach(item => {
+        totalList.push({
+          ...item,
+          ...checkedPosition,
+          title: `${this.includeLevelPost.length ? (item.orgNodeName + '（包含下级组织节点）') : item.orgNodeName}`,
+          includeLevel: this.includeLevelPost.includes('01'),
+          id: this.includeLevelPost.includes('01')
+              ? (`01-${checkedPosition.positionId}-${item.orgUnitId}`)
+              : (`00-${checkedPosition.positionId}-${item.orgUnitId}`),
+        });
+      });
+
+      // 去重合并
+      let list = this.postList.concat(totalList);
       let uniqueArray = list.filter((item, index, self) =>
-          index === self.findIndex(t => (
-            t.id === item.id // 基于id属性去重
-          ))
+          index === self.findIndex(t => t.id === item.id)
       );
-      this.postList = uniqueArray
-      this.$refs.postTree.upDataTree()
-      this.proPostList = []
-      this.positiontList.map((item)=>{item.checked=false})
+      this.postList = uniqueArray;
+
+      // 清空选中状态
+      if (this.$refs.postTree && this.$refs.postTree.clearAllChecked) {
+        this.$refs.postTree.clearAllChecked(this.$refs.postTree.data);
+        this.$refs.postTree.$emit('handleChange', []);
+      }
+      this.$refs.postTree.upDataTree();
+      this.proPostList = [];
+      this.selectedPositionId = null;
+      // this.$refs.postTree.initData();
+      this.selectedPostTagKey = '';
     },
     clearPost(){
       this.postList= []
@@ -277,19 +1322,50 @@ export default {
       this.postList.splice(index,1)
     },
     //staff
-    addStaffList(){
-      let staffList = this.staffAllList.filter((item)=>item.checked===true)
-      let list = this.staffList.concat(staffList)
-      let uniqueArray = list.filter((item, index, self) =>
-          index === self.findIndex(t => (
-            t.id === item.id // 基于id属性去重
-          ))
-      );
-      this.staffList = uniqueArray
-      this.staffAllList.map((item)=>item.checked=false)
-    },
+    // addStaffList(){
+    //   console.log("this.staffSingle", this.staffSingle)
+    //   let staffList = this.staffAllList.filter((item)=>item.checked===true);
+    //
+    //   if (!staffList.length) {
+    //     this.$Message.error("请选择人员");
+    //     return;
+    //   }
+    //   if (this.staffSingle && this.staffList.length >= 1) {
+    //     this.$Message.error("请先清除已选人员，再重新添加");
+    //     return;
+    //   }
+    //
+    //   if(this.staffSingle && staffList.length > 1){
+    //     this.$Message.error("温馨提示：当前业务暂时只支持选择一位人员");
+    //     return;
+    //   }
+    //
+    //   // 基于item.id去重，不修改原数据字段，仅过滤重复项
+    //   let uniqueStaffList = staffList.filter(newItem =>
+    //       // 检查右侧条件区域（staffList）是否已有该人员，避免重复添加
+    //       !this.staffList.some(existItem => existItem.userId === newItem.userId)
+    //   );
+    //   // 合并去重后的列表
+    //   this.staffList = this.staffList.concat(uniqueStaffList);
+    //   // 清空选中状态
+    //   this.staffAllList.forEach(item => item.checked = false);
+    // },
     handlestaff(item){
-      item.checked=!item.checked
+      // 处理单选逻辑
+      if (this.staffSingle) {
+        // 单选时先清空已选人员
+        this.staffList = [];
+      }
+      // 去重校验：避免重复添加
+      const isExist = this.staffList.some(existItem => existItem.userId === item.userId);
+      if (!isExist) {
+        // 深拷贝防止原数据引用污染
+        const newItem = this.safeDeepCopy(item);
+        this.staffList.push(newItem);
+        this.$Message.success(`已添加【${item.name}】`);
+      } else {
+        this.$Message.warning(`【${item.name}】已在选择列表中`);
+      }
     },
     clearStaff(){
       this.staffList = []
@@ -297,27 +1373,1059 @@ export default {
     clearStaffByIndex(index){
       this.staffList.splice(index,1)
     },
+    clearOrgNewList(){
+      this.orgNewList = []
+    },
+    clearOrgNewByIndex(index){
+      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
+        staffList:this.staffList,
+        orgNewList:cleanOrgNewList
       }
       this.$emit('confirm',deepCopy(v))
     },
-    visibleChange(val){
-      this.$emit('input',val);
+    visibleChange(val) {
+      this.$emit('input', val);
+      if (val) {
+        this.resetStaffTreeChecked();
+        this.staffEnding = false;
+        this.offset = 0;
+        this.staffAllList = [];
+        this.loadingStaff = false;
+        if (this.tabName === 'staff') {
+          this.loadMore().catch(err => console.log("弹窗打开加载失败：", err));
+          this.$nextTick(() => {
+            setTimeout(() => {
+              this.loadMore();
+            }, 100);
+          });
+        }
+      } else {
+        this.staffEnding = false;
+        this.offset = 0;
+        this.staffAllList = [];
+        this.$set(this, 'selectedStaffOrgId', '');
+        if (this.$refs.staffTree) {
+          this.$refs.staffTree.clearAllChecked(this.$refs.staffTree.data);
+          this.$refs.staffTree.$emit('handleChange', []);
+        }
+      }
+    },
+    resetStaffTreeChecked() {
+      this.$set(this, 'selectedStaffOrgId', '');
+      this.proStaffOrgList = [];
+      if (this.$refs.staffTree) {
+        this.$refs.staffTree.clearAllChecked(this.$refs.staffTree.data);
+        this.$refs.staffTree.$emit('handleChange', []);
+      }
+      if (this.tabName === 'staff') {
+        this.$nextTick(() => {
+          this.loadMore();
+        });
+      }
+    },
+
+    handleTabChange(tabName) {
+      this.tabName = tabName;
+
+      if (tabName === 'staff') {
+        this.resetStaffTreeChecked();
+        this.staffEnding = false;
+        this.offset = 0;
+        this.staffAllList = [];
+        this.loadingStaff = false;
+        // 仅当树未初始化时才加载
+        if (!this.staffTreeLoaded || this.staffTree.length === 0) {
+          this.loadMore().catch(err => console.log("同步加载失败：", err));
+        }
+      } else if (tabName === 'post' && this.proPostList.length === 0) {
+        this.proPostList = [];
+        // 移除initData调用，避免重置树数据
+        // this.$refs.postTree.initData();
+      }
+    },
+    initStaffList() {
+      this.staffEnding = false;
+      this.offset = 0;
+      this.staffAllList = [];
+      // 小幅延迟，确保树重置完成后再发起查询（避免时序差）
+      this.$nextTick(() => {
+        setTimeout(() => {
+          this.loadMore();
+        }, 50); // 50ms足够，可根据实际情况调整
+      });
+    },
+    async fastChedkOrg(item) {
+      // 1. 改用组织 Tab 专属标签列表判断
+      if (!this.orgTagList.length) {
+        this.$Message.warning("快捷选择标签正在加载中，请稍后");
+        return;
+      }
+      const treeRef = this.$refs.orgTree;
+      const proListKey = 'proOrgList';
+      const treeDataKey = 'orgTree';
+      this[proListKey] = [];
+      // 移除initData调用
+      // if (treeRef) await treeRef.initData();
+      if (!treeRef) {
+        this.$Message.error("组织树组件未初始化，请稍后再试");
+        item.checked = !item.checked;
+        return;
+      }
+
+      // 2. 清空组织 Tab 标签选中状态（仅操作 orgTagList）
+      this.orgTagList.forEach(tag => {
+        tag.checked = false;
+      });
+
+      // 3. 后续逻辑保持不变，仅操作当前 item（属于 orgTagList）
+      const isCurrentlyChecked = item.checked;
+      if (!isCurrentlyChecked) {
+        item.checked = true;
+      }
+
+      if (!item.checked) {
+        this.$Message.info("已取消该快捷选择");
+        return;
+      }
+
+      try {
+        await this.querySpecificParam(item, true, treeRef, proListKey, treeDataKey);
+      } catch (error) {
+        this.$Message.error(`快捷选择处理失败：${error.message.slice(0, 50)}`);
+        item.checked = !item.checked;
+      }
+    },
+    async fastChedkPost(item) {
+      // 1. 改用岗位 Tab 专属标签列表判断
+      if (!this.postTagList.length) {
+        this.$Message.warning("快捷选择标签正在加载中，请稍后");
+        return;
+      }
+
+      const isOrgTab = this.tabName === 'org';
+      const treeRef = isOrgTab ? this.$refs.orgTree : this.$refs.postTree;
+      const proListKey = isOrgTab ? 'proOrgList' : 'proPostList';
+      const treeDataKey = isOrgTab ? 'orgTree' : 'postTree';
+
+      this[proListKey] = [];
+      const isCurrentlyChecked = item.checked;
+      // 移除initData调用，避免重置树数据
+      // if (treeRef) await treeRef.initData();
+
+      // 2. 清空岗位 Tab 标签选中状态（仅操作 postTagList）
+      this.postTagList.forEach(tag => {
+        tag.checked = false;
+      });
+
+      // 3. 后续逻辑保持不变，仅操作当前 item（属于 postTagList）
+      if (!isCurrentlyChecked) {
+        item.checked = true;
+      }
+
+      if (!item.checked) {
+        this.$Message.info("已取消该快捷选择");
+        return;
+      }
+
+      try {
+        await this.querySpecificParam(item, isOrgTab, treeRef, proListKey, treeDataKey);
+      } catch (error) {
+        this.$Message.error(`快捷选择处理失败：${error.message.slice(0, 50)}`);
+        item.checked = !item.checked;
+      }
+    },
+    queryTagList() {
+      ajax.get('/pub-manage-server/pub/helpBoxTag/q/queryQuickPickTags').then((res) => {
+        if (res.data.code === 1) {
+          let baseTagList = res.data.data || [];
+          // 组织 Tab 标签：深拷贝并初始化选中状态
+          this.orgTagList = this.safeDeepCopy(baseTagList).map(item => ({
+            ...item,
+            checked: false // 独立选中状态
+          }));
+          // 岗位 Tab 标签：深拷贝并初始化选中状态（与组织 Tab 完全独立）
+          this.postTagList = this.safeDeepCopy(baseTagList).map(item => ({
+            ...item,
+            checked: false // 独立选中状态
+          }));
+        }
+      });
+    },
+
+    querySpecificParam: function (item, isOrgTab, treeRef, proListKey, treeDataKey) {
+      return new Promise((resolve, reject) => {
+        // 取消选中时处理（仅当手动点击已选中的标签时触发）
+        if (!item.checked) {
+          if (treeRef && treeRef.initData) {
+            treeRef.initData(); // 清空对应树组件
+          }
+          this[proListKey] = []; // 清空对应暂存列表
+          this.$Message.info("已取消该快捷选择");
+          resolve();
+          return;
+        }
+
+        // 请求快捷选择对应的orgUnitId列表
+        ajax.get(`/pub-manage-server/pub/helpBoxTag/q/querySpecificParam?quickPickKey=${item.quickPickKey}`)
+            .then(async (res) => {
+              if (res.data.code !== 1) {
+                this.$Message.error("获取快捷选择配置失败");
+                item.checked = !item.checked;
+                reject(new Error("获取配置失败"));
+                return;
+              }
+
+              const orgUnitIds = res.data.data?.param || [];
+              const safeOrgUnitIds = Array.isArray(orgUnitIds) ? orgUnitIds : [];
+              if (safeOrgUnitIds.length === 0) {
+                this.$Message.warning("该快捷选择未配置任何组织节点");
+                item.checked = !item.checked;
+                reject(new Error("无配置节点"));
+                return;
+              }
+
+              // 校验树组件是否存在（通用校验）
+              if (!treeRef) {
+                this.$Message.error("树组件未初始化");
+                item.checked = !item.checked;
+                reject(new Error("树组件不存在"));
+                return;
+              }
+              const originalTreeData = treeRef.data && treeRef.data.length ? this.safeDeepCopy(treeRef.data) : [];
+              const matchedNodes = [];
+
+              // 批量处理每个orgUnitId（循环逻辑不变，通用处理）
+              for (const orgUnitId of safeOrgUnitIds) {
+                try {
+                  // 节点详情查询（复用原有方法）
+                  let currentNode = await this.queryOrgNodeDetail(orgUnitId);
+                  if (!currentNode || !currentNode.orgUnitId) {
+                    this.$Message.warning(`节点【${orgUnitId}】数据异常，跳过处理`);
+                    continue;
+                  }
+
+                  // 循环引用检测与处理（复用原有方法）
+                  const cycle = this.detectCircularReferences(currentNode);
+                  if (cycle) {
+                    this.$Message.warning(`节点【${orgUnitId}】存在循环引用，已自动修复`);
+                    currentNode = this.safeDeepCopy(currentNode);
+                  }
+
+                  // 节点名称默认值处理（复用原有逻辑）
+                  currentNode.orgNodeName = currentNode.orgNodeName || currentNode.orgUnitName || `未命名组织(${orgUnitId})`;
+                  currentNode.orgUnitName = currentNode.orgNodeName;
+
+                  // 节点是否已在树中检测（复用原有方法）
+                  const nodeInTree = this.findNodeInTree(originalTreeData, orgUnitId);
+                  if (nodeInTree) {
+                    if (this.detectCircularReferences(nodeInTree)) {
+                      this.$Message.warning(`树中节点【${orgUnitId}】存在循环引用，已跳过`);
+                      continue;
+                    }
+                    matchedNodes.push(nodeInTree);
+                    continue;
+                  }
+
+                  // 父节点追溯与节点链挂载（使用当前Tab的树数据originalTreeData，而非固定orgTree）
+                  let targetParent = null;
+                  let nodeChain = [currentNode];
+                  const MAX_DEPTH = 8;
+                  let depth = 0;
+                  let lastParentId = '';
+
+                  while (!targetParent && depth < MAX_DEPTH) {
+                    const parentId = currentNode.parentOrgUnitId;
+                    if (!parentId || typeof parentId !== 'string' || parentId === lastParentId) {
+                      break;
+                    }
+                    lastParentId = parentId;
+
+                    const parentNode = await this.queryOrgNodeDetail(parentId);
+                    if (!parentNode || !parentNode.orgUnitId) {
+                      break;
+                    }
+
+                    if (this.detectCircularReferences(parentNode)) {
+                      this.$Message.warning(`父节点【${parentId}】存在循环引用，已跳过`);
+                      break;
+                    }
+
+                    parentNode.orgNodeName = parentNode.orgNodeName || parentNode.orgUnitName || `未命名组织(${parentId})`;
+                    // 查询父节点是否在当前Tab的树数据中（originalTreeData），而非固定orgTree
+                    const parentInTree = this.findNodeInTree(originalTreeData, parentNode.orgUnitId);
+
+                    if (parentInTree) {
+                      targetParent = parentInTree;
+                      break;
+                    }
+
+                    nodeChain.unshift(parentNode);
+                    currentNode = parentNode;
+                    depth++;
+                  }
+
+                  // 节点链挂载（复用原有方法）
+                  if (targetParent) {
+                    let currentMountParent = targetParent;
+                    for (const node of nodeChain) {
+                      const formattedNode = this.safeDeepCopy({
+                        ...node,
+                        leafNode: await this.judgeNodeLeafe(node.orgUnitId),
+                        expand: true,
+                        checked: false,
+                        orgChildrenList: [],
+                        children: []
+                      });
+
+                      if (!Array.isArray(currentMountParent.orgChildrenList)) {
+                        currentMountParent.orgChildrenList = [];
+                        currentMountParent.children = [];
+                      }
+
+                      const isDuplicate = currentMountParent.orgChildrenList.some(
+                          child => child.orgUnitId === formattedNode.orgUnitId
+                      );
+                      if (!isDuplicate) {
+                        currentMountParent.orgChildrenList.push(formattedNode);
+                        currentMountParent.leafNode = false;
+                      }
+
+                      currentMountParent = currentMountParent.orgChildrenList.find(
+                          child => child.orgUnitId === formattedNode.orgUnitId
+                      ) || formattedNode;
+                    }
+
+                    const mountedTarget = this.findNodeInTree(originalTreeData, orgUnitId);
+                    if (mountedTarget) {
+                      matchedNodes.push(mountedTarget);
+                    }
+                  }
+
+                } catch (error) {
+                  this.$Message.error(`处理节点【${orgUnitId}】失败：${error.message.slice(0, 50)}`);
+                  continue;
+                }
+              }
+
+
+              if (matchedNodes.length > 0) {
+                // 同步暂存列表（组织proOrgList/岗位proPostList）
+                this[proListKey] = matchedNodes;
+                const finalTreeData = this.safeDeepCopy(originalTreeData);
+                // 响应式更新对应树数据（组织orgTree/岗位postTree）
+                this.$set(this, treeDataKey, finalTreeData);
+
+                await this.$nextTick(async () => {
+                  // 更新树组件数据（通用逻辑）
+                  if (treeRef.updateTreeData) {
+                    treeRef.updateTreeData(this.safeDeepCopy(finalTreeData));
+                  } else {
+                    treeRef.data = this.safeDeepCopy(finalTreeData);
+                  }
+
+                  // 设置树选中状态（通用逻辑）
+                  const safeNodeIds = matchedNodes.map(node => node.orgUnitId);
+                  if (treeRef.setCheckedNodes) {
+                    treeRef.setCheckedNodes([]);
+                    treeRef.setCheckedNodes(safeNodeIds);
+                    treeRef.handleChange(matchedNodes); // 触发子组件选中事件
+                  } else {
+                    this.updateTreeNodesStatus(
+                        finalTreeData,
+                        new Set(safeNodeIds),
+                        new Set(safeNodeIds)
+                    );
+                    treeRef.handleChange(matchedNodes);
+                  }
+
+                  // 提示信息
+                  this.$Message.success(`成功选中${matchedNodes.length}个组织节点`);
+                });
+              } else {
+                this.$Message.warning("未找到任何可匹配的组织节点");
+                item.checked = !item.checked;
+              }
+              resolve();
+            })
+            .catch((error) => {
+              const errMsg = error.message || '网络异常';
+              this.$Message.error(`快捷选择失败：${errMsg.slice(0, 50)}`);
+              item.checked = !item.checked;
+              reject(error);
+            });
+      });
+    },
+
+    // 移除树数据中的 parent 引用，避免子组件处理时形成循环
+    removeParentReferences(treeData) {
+      if (!Array.isArray(treeData)) return;
+      treeData.forEach(node => {
+        if (node.parent) delete node.parent;
+        // 递归处理子节点
+        if (Array.isArray(node.orgChildrenList)) {
+          this.removeParentReferences(node.orgChildrenList);
+        }
+        if (Array.isArray(node.children)) {
+          this.removeParentReferences(node.children);
+        }
+      });
+    },
+    // 在 methods 中添加循环引用检测工具函数
+    detectCircularReferences(obj, path = [], visited = new Map()) {
+      if (obj === null || typeof obj !== 'object') return null;
+
+      if (visited.has(obj)) {
+        return { path: [...path, visited.get(obj)], node: obj };
+      }
+
+      visited.set(obj, Array.isArray(obj) ? 'Array' : `Object(${obj.orgUnitId || 'unknown'})`);
+
+      const keys = Array.isArray(obj) ? obj.map((_, i) => i) : Object.keys(obj);
+      for (const key of keys) {
+        const value = obj[key];
+        const newPath = [...path, key];
+        if (value && typeof value === 'object') {
+          const cycle = this.detectCircularReferences(value, newPath, visited);
+          if (cycle) return cycle;
+        }
+      }
+
+      visited.delete(obj);
+      return null;
+    },
+
+    safeDeepCopy(obj, hash = new WeakMap()) {
+      if (obj === null || typeof obj !== 'object') {
+        return obj;
+      }
+
+      if (hash.has(obj)) {
+        const safeObj = {
+          orgUnitId: obj.orgUnitId,
+          orgNodeName: obj.orgNodeName || obj.name || `未命名组织(${obj.orgUnitId || 'unknown'})`,
+          orgUnitName: obj.orgUnitName || obj.orgNodeName || obj.name || `未命名组织(${obj.orgUnitId || 'unknown'})`,
+          parentOrgUnitId: obj.parentOrgUnitId || obj.parentId || null
+        };
+        hash.set(obj, safeObj);
+        return safeObj;
+      }
+
+      let copy;
+      if (obj instanceof Array) {
+        copy = [];
+        hash.set(obj, copy);
+        for (let i = 0; i < obj.length; i++) {
+          copy[i] = this.safeDeepCopy(obj[i], hash);
+        }
+      } else if (obj instanceof Object) {
+        copy = {};
+        hash.set(obj, copy);
+        for (let key in obj) {
+          if (obj.hasOwnProperty(key)) {
+            if (['__vue__', '__ob__', '$parent', '$children'].includes(key)) {
+              continue;
+            }
+            if (['orgChildrenList', 'children'].includes(key) && Array.isArray(obj[key])) {
+              copy[key] = obj[key].map(child => this.safeDeepCopy(child, hash));
+            } else {
+              copy[key] = this.safeDeepCopy(obj[key], hash);
+            }
+          }
+        }
+      } else {
+        copy = obj;
+      }
+      return copy;
+    },
+
+    /**
+     * 查询单个节点的原生详情
+     * @param {string} orgUnitId
+     * @returns {Promise<Object|null>}
+     */
+    getOrgNodeDetail(orgUnitId) {
+      return new Promise((resolve) => {
+        ajax.get(`/pub-manage-server/pub/organ/q/queryOrg`, {
+          params: { orgUnitId: orgUnitId }
+        }).then((res) => {
+          if (res.data.code === 1 && res.data.data) {
+            const { orgUnitId, parentOrgUnitId, orgNodeName, orgChildrenList } = res.data.data;
+            resolve({
+              orgUnitId,
+              parentOrgUnitId,
+              orgNodeName,
+              orgChildrenList: orgChildrenList || []
+            });
+          } else {
+            resolve(null);
+          }
+        }).catch(() => {
+          this.$Message.error(`查询节点【${orgUnitId}】详情失败`);
+          resolve(null);
+        });
+      });
+    },
+
+    /**
+     * 迭代查找节点
+     * @param {Array} treeData - 树形数据
+     * @param {string} targetOrgUnitId - 目标节点ID
+     * @returns {Object|null} 找到的节点
+     */
+    findNodeInTree(treeData, targetOrgUnitId) {
+      if (!Array.isArray(treeData) || !targetOrgUnitId || typeof targetOrgUnitId !== 'string') {
+        return null;
+      }
+
+      const queue = [...treeData];
+      while (queue.length > 0) {
+        const currentNode = queue.shift();
+        const nodeId = currentNode.orgUnitId || currentNode.id || '';
+        if (nodeId === targetOrgUnitId) {
+          return currentNode;
+        }
+        // 兼容children和orgChildrenList两种子节点字段
+        const childNodes = currentNode.orgChildrenList || currentNode.children || [];
+        if (childNodes.length > 0) {
+          queue.push(...childNodes);
+        }
+      }
+      return null;
+    },
+
+    /**
+     * 辅助方法：查询单个orgUnitId的节点详情
+     * @param {string} orgUnitId - 组织节点ID
+     * @returns {Promise<Object|null>} 节点详情
+     */
+    queryOrgNodeDetail(orgUnitId) {
+      return new Promise((resolve) => {
+        // 前置校验：避免无效请求
+        if (!orgUnitId || typeof orgUnitId !== 'string') {
+          resolve(null);
+          return;
+        }
+
+        ajax.get(`/pub-manage-server/pub/organ/q/queryOrg?orgUnitId=${orgUnitId}`)
+            .then((res) => {
+              if (res.data.code === 1 && res.data.data && res.data.data.orgUnitId) {
+                // 深拷贝并清理无效字段
+                const node = this.safeDeepCopy(res.data.data);
+                // 确保节点名称有默认值，避免空显示
+                const nodeName = node.orgNodeName || node.orgUnitName || node.name || `未命名组织(${orgUnitId})`;
+                node.orgNodeName = nodeName;
+                node.orgUnitName = nodeName; // 同步更新orgUnitName，确保所有使用场景都有值
+                // 确保关键字段存在
+                node.parentOrgUnitId = node.parentOrgUnitId || null;
+                node.orgChildrenList = node.orgChildrenList || [];
+                resolve(node);
+              } else {
+                // 接口返回空时，返回默认结构避免报错
+                resolve({
+                  orgUnitId,
+                  orgNodeName: `未命名组织(${orgUnitId})`,
+                  orgUnitName: `未命名组织(${orgUnitId})`,
+                  parentOrgUnitId: null,
+                  orgChildrenList: []
+                });
+              }
+            })
+            .catch(() => {
+              // 请求失败时，返回默认结构避免报错
+              resolve({
+                orgUnitId,
+                orgNodeName: `未命名组织(${orgUnitId})`,
+                orgUnitName: `未命名组织(${orgUnitId})`,
+                parentOrgUnitId: null,
+                orgChildrenList: []
+              });
+            });
+      });
+    },
+
+
+    /**
+     * 手动更新树节点状态（如果树组件没有提供update方法）
+     * @param {Array} nodeList - 节点列表
+     * @param {Set} expandIds - 需要展开的节点ID集合
+     * @param {Set} checkedIds - 需要选中的节点ID集合
+     */
+    updateTreeNodesStatus(nodeList, expandIds, checkedIds) {
+      nodeList.forEach(node => {
+        // 更新展开状态
+        if (expandIds.has(node.orgUnitId)) {
+          node.expand = true;
+        }
+
+        // 更新选中状态
+        if (checkedIds.has(node.orgUnitId)) {
+          node.checked = true;
+        }
+
+        // 递归处理子节点
+        const children = node.children || node.orgChildrenList;
+        if (children && children.length > 0) {
+          this.updateTreeNodesStatus(children, expandIds, checkedIds);
+        }
+      });
+    },
+    // 组织选择（新）相关方法
+    async initOrgNewTree() {
+      try {
+        const res = await ajax.get('/pub-manage-server/pub/personHelpBox/q/getFullOrgUnitTree');
+        if (res.data.code === 1) {
+          // 直接使用返回的完整树形结构
+          const treeData = res.data.data || [];
+          // 处理树形数据，添加必要的字段
+          const processedTree = this.processOrgNewTree(treeData);
+          this.orgNewTree = this.safeDeepCopy(processedTree);
+          // 树加载完成后，刷新 orgNewList 的父组织信息
+          this.$nextTick(() => {
+            this.refreshOrgNewListParentInfo();
+          });
+        }
+      } catch (e) {
+        this.$Message.error("组织选择（新）树初始化失败！");
+        console.error(e);
+      }
+    },
+    buildOrgNewTree(items) {
+      const map = {};
+      const roots = [];
+      const copiedItems = this.safeDeepCopy(items);
+
+      copiedItems.forEach(item => {
+        if (!item.orgUnitId) return;
+        map[item.orgUnitId] = this.safeDeepCopy({
+          ...item,
+          orgChildrenList: [],
+          children: [],
+          title: item.orgUnitName || item.orgNodeName || item.name || `未命名组织(${item.orgUnitId || ''})`,
+          expand: false,
+          checked: false
+        });
+      });
+
+      copiedItems.forEach(item => {
+        if (!item.orgUnitId || !map[item.orgUnitId]) return;
+
+        const node = map[item.orgUnitId];
+        if (!item.parentOrgUnitId || !map[item.parentOrgUnitId]) {
+          node.expand = true;
+          roots.push(node);
+        } else {
+          const parent = map[item.parentOrgUnitId];
+          parent.orgChildrenList.push(node);
+          parent.children.push(node);
+          parent.leafNode = false;
+        }
+      });
+      return roots;
+    },
+    // 处理新接口返回的组织树数据
+    processOrgNewTree(treeData) {
+      if (!Array.isArray(treeData)) return [];
+
+      return treeData.map(node => {
+        // 添加必要的字段
+        const processedNode = {
+          ...node,
+          title: node.orgNodeName || node.orgUnitName || `未命名组织(${node.orgUnitId || ''})`,
+          expand: false,
+          checked: false,
+          orgChildrenList: node.children || []
+        };
+
+        // 递归处理子节点
+        if (processedNode.children && processedNode.children.length > 0) {
+          processedNode.children = this.processOrgNewTree(processedNode.children);
+          processedNode.expand = true; // 默认展开有子节点的节点
+        }
+
+        return processedNode;
+      });
+    },
+    searchOrgNew() {
+      // 搜索功能已通过计算属性实现，这里可以添加额外的逻辑
+    },
+    toggleProvinceExpand(province) {
+      // 只有有子节点时才允许展开/折叠
+      if (province.children && province.children.length > 0) {
+        province.expand = !province.expand;
+        // 同步更新原始数据中的节点状态
+        this.updateOriginalNodeExpand(province);
+      }
+    },
+    toggleCityExpand(city) {
+      // 只有有子节点时才允许展开/折叠
+      if (city.children && city.children.length > 0) {
+        city.expand = !city.expand;
+        // 同步更新原始数据中的节点状态
+        this.updateOriginalNodeExpand(city);
+      }
+    },
+    toggleDistrictExpand(district) {
+      // 只有有子节点时才允许展开/折叠
+      if (district.children && district.children.length > 0) {
+        district.expand = !district.expand;
+        // 同步更新原始数据中的节点状态
+        this.updateOriginalNodeExpand(district);
+      }
+    },
+    updateOriginalNodeExpand(node) {
+      // 查找并更新原始数据中的节点状态
+      const findAndUpdate = (nodes) => {
+        for (let i = 0; i < nodes.length; i++) {
+          if (nodes[i].orgUnitId === node.orgUnitId) {
+            nodes[i].expand = node.expand;
+            return true;
+          }
+          if (nodes[i].children && nodes[i].children.length > 0) {
+            if (findAndUpdate(nodes[i].children)) {
+              return true;
+            }
+          }
+        }
+        return false;
+      };
+      findAndUpdate(this.orgNewTree);
+    },
+    selectAllProvinceOrgNew(province) {
+      // 全选并添加到已选择条件框，包含下级节点
+      this.addOrgNewItemWithChildren(province, true);
+    },
+    selectAllCityOrgNew(city) {
+      // 全选并添加到已选择条件框，包含下级节点
+      this.addOrgNewItemWithChildren(city, true);
+    },
+    selectAllCityLevelOrgNew(city) {
+      // 全选市本级并添加到已选择条件框，包含下级节点
+      if (city.children && city.children.length > 0) {
+        const cityLevel = city.children[0];
+        this.addOrgNewItemWithChildren(cityLevel, true);
+      }
+    },
+    selectAllDistrictOrgNew(district) {
+      // 全选并添加到已选择条件框，包含下级节点
+      this.addOrgNewItemWithChildren(district, true);
+    },
+    addOrgNewItemWithChildren(node, includeLevel) {
+      if (!node.orgUnitId) return this.$Message.error("组织节点无效！");
+
+      // 检查是否已存在
+      const id = includeLevel ? `01-${node.orgUnitId}` : `00-${node.orgUnitId}`;
+      const existingIndex = this.orgNewList.findIndex(item => item.id === id);
+      if (existingIndex > -1) {
+        this.$Message.warning(`【${node.title}】已在选择列表中`);
+        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,
+        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));
+    },
+    isCityAllSelected(city) {
+      if (!city.children || city.children.length === 0) return false;
+      return city.children.every(district => this.isDistrictAllSelected(district));
+    },
+    isCityLevelAllSelected(city) {
+      // 检查市本级是否全选
+      if (!city.children || city.children.length === 0) return false;
+      // 假设第一个子节点是市本级
+      const cityLevel = city.children[0];
+      return this.isDistrictAllSelected(cityLevel);
+    },
+    isDistrictAllSelected(district) {
+      if (!district.children || district.children.length === 0) return false;
+      return district.children.every(unit => unit.checked);
+    },
+    setProvinceChecked(province, checked) {
+      if (province.children) {
+        province.children.forEach(city => {
+          this.setCityChecked(city, checked);
+        });
+      }
+    },
+    setCityChecked(city, checked) {
+      if (city.children) {
+        city.children.forEach(district => {
+          this.setDistrictChecked(district, checked);
+        });
+      }
+    },
+    setCityLevelChecked(city, checked) {
+      if (city.children && city.children.length > 0) {
+        // 只设置市本级（第一个子节点）
+        const cityLevel = city.children[0];
+        this.setDistrictChecked(cityLevel, checked);
+      }
+    },
+    setDistrictChecked(district, checked) {
+      if (district.children) {
+        district.children.forEach(unit => {
+          unit.checked = checked;
+        });
+      }
+    },
+    handleOrgNewUnitChange(unit) {
+      // 处理组织单位选择变化
+      this.collectOrgNewCheckedUnits();
+    },
+    collectOrgNewCheckedUnits() {
+      this.proOrgNewList = [];
+      this.collectCheckedUnits(this.orgNewTree);
     },
+    collectCheckedUnits(nodeList) {
+      if (!Array.isArray(nodeList)) return;
+      nodeList.forEach(node => {
+        if (node.checked) {
+          this.proOrgNewList.push({
+            ...node,
+            orgNodeName: node.orgNodeName || node.title || `未命名组织(${node.orgUnitId})`
+          });
+        }
+        if (node.children && node.children.length > 0) {
+          this.collectCheckedUnits(node.children);
+        }
+      });
+    },
+    expandAllOrgNew() {
+      this.setAllExpand(this.orgNewTree, true);
+    },
+    collapseAllOrgNew() {
+      this.setAllExpand(this.orgNewTree, false);
+    },
+    setAllExpand(nodeList, expand) {
+      if (!Array.isArray(nodeList)) return;
+      nodeList.forEach(node => {
+        node.expand = expand;
+        if (node.children && node.children.length > 0) {
+          this.setAllExpand(node.children, expand);
+        }
+      });
+    },
+    clearOrgNew() {
+      this.clearAllCheckedOrgNew(this.orgNewTree);
+      this.proOrgNewList = [];
+      this.orgNewSearch = '';
+    },
+    clearAllCheckedOrgNew(nodeList) {
+      if (!Array.isArray(nodeList)) return;
+      nodeList.forEach(node => {
+        node.checked = false;
+        if (node.children && node.children.length > 0) {
+          this.clearAllCheckedOrgNew(node.children);
+        }
+      });
+    },
+    addOrgNewItem(node) {
+      // 调用通用方法，不包含下级节点
+      this.addOrgNewItemWithChildren(node, false);
+    },
+    addOrgNewList() {
+      const validOrgList = this.proOrgNewList.filter(node => node.orgUnitId);
+      if (!validOrgList.length) return this.$Message.error("请先选择组织节点！");
+
+      validOrgList.forEach(node => {
+        this.addOrgNewItemWithChildren(node, false);
+      });
+
+      // 清空选中状态
+      this.clearAllCheckedOrgNew(this.orgNewTree);
+      this.proOrgNewList = [];
+    }
+
   },
   computed:{
-    getCheckedStaff(){
-      return this.staffAllList.filter((item)=>item.checked===true).length
-    },
+    // getCheckedStaff(){
+    //   return this.staffAllList.filter((item)=>item.checked===true).length
+    // },
     getCheckTypenum(){
       let l1 = this.orgList.length?1:0;
       let l2 = this.postList.length?1:0;
       let l3 = this.staffList.length?1:0;
-      return l1+l2+l3
+      let l4 = this.orgNewList.length?1:0;
+      return l1+l2+l3+l4
+    },
+    filteredOrgNewTree() {
+      // 前端过滤，模糊匹配
+      const searchTerm = this.orgNewSearch.toLowerCase().trim();
+      if (!searchTerm) {
+        return this.orgNewTree;
+      }
+
+      // 递归过滤函数
+      const filterTree = (nodes) => {
+        return nodes.map(node => {
+          // 检查当前节点是否匹配
+          const isMatch = node.title.toLowerCase().includes(searchTerm);
+
+          // 递归过滤子节点
+          let filteredChildren = [];
+          if (node.children && node.children.length > 0) {
+            filteredChildren = filterTree(node.children);
+          }
+
+          // 如果当前节点匹配或有匹配的子节点，则保留该节点
+          if (isMatch || filteredChildren.length > 0) {
+            // 创建一个新对象，保留原始节点的所有属性，包括expand状态
+            return {
+              ...node,
+              children: filteredChildren
+            };
+          }
+
+          // 不匹配且没有匹配的子节点，则过滤掉
+          return null;
+        }).filter(Boolean); // 过滤掉null值
+      };
+
+      // 直接使用原始树数据，不需要深拷贝
+      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:{
@@ -326,6 +2434,7 @@ export default {
     },
     data:{
       handler(val){
+        if(!val) return
         let map = deepCopy(val)
         let orgList = map.orgList || []
         orgList.forEach(item=>{
@@ -340,6 +2449,31 @@ 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)
+          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,
@@ -348,7 +2482,691 @@ export default {
 }
 </script>
 <style lang="less" scoped>
+// 新增checkbox样式
+//.staff-checkbox {
+//  margin-right: 12px;
+//  flex-shrink: 0;
+//
+//  /deep/ .ivu-checkbox-wrapper {
+//    display: flex;
+//    align-items: center;
+//    cursor: pointer;
+//  }
+//
+//  /deep/ .ivu-checkbox {
+//    width: 18px;
+//    height: 18px;
+//
+//    &:checked {
+//      /deep/ .ivu-checkbox-inner {
+//        background-color: var(--primary-color);
+//        border-color: var(--primary-color);
+//      }
+//    }
+//  }
+//}
+
+.staff-left-right-layout {
+  display: flex;
+  // 适配全屏：使用视口高度百分比 + 最小高度限制
+  height: calc(100vh - 180px) !important;
+  min-height: 500px !important;
+  gap: 15px;
+  padding: 0 5px;
+  width: 100%;
+  box-sizing: border-box;
+  flex-wrap: nowrap !important;
+
+  // 小屏幕 不改变左右结构
+  @media (max-width: 1200px) {
+    height: calc(100vh - 200px) !important;
+
+    & > .staff-left-panel {
+      width: calc(60% - 7.5px) !important;
+      min-width: 280px !important;
+      max-width: none !important;
+    }
+  }
+
+  @media (max-width: 768px) {
+    flex-wrap: wrap !important;
+
+    & > .staff-left-panel {
+      width: 100% !important;
+      min-width: 100% !important;
+      max-width: 100% !important;
+      height: 40% !important;
+      margin-bottom: 10px;
+    }
+
+    .staff-right-panel {
+      width: 100% !important;
+      height: 60% !important;
+    }
+  }
+
+  & > .staff-left-panel {
+    width: calc(60% - 7.5px) !important;
+    min-width: 320px !important;
+    max-width: none !important;
+    display: flex !important;
+    flex-direction: column !important;
+    box-sizing: border-box !important;
+    flex-shrink: 0 !important;
+    flex-grow: 0 !important;
+    height: 100% !important;
+    position: relative !important;
+
+    ::v-deep(.panel-title) {
+      all: unset !important;
+      display: flex !important;
+      align-items: center !important;
+      visibility: visible !important;
+      opacity: 1 !important;
+      height: 20px !important;
+      line-height: 20px !important;
+      font-size: 14px !important;
+      font-weight: 500 !important;
+      color: #333 !important;
+      margin-bottom: 8px !important;
+      background: #fff !important;
+      z-index: 999 !important;
+      padding: 0 !important;
+      box-sizing: border-box !important;
+      position: relative !important;
+      width: 100% !important;
+      // 左侧竖条样式
+      &::before {
+        content: '' !important;
+        display: inline-block !important;
+        width: 5px !important; // 竖条宽度
+        height: 16px !important; // 竖条高度（略小于文字行高）
+        background-color: #1890ff !important; // 蓝色竖条
+        margin-right: 8px !important; // 竖条与文字间距
+        //border-radius: 1.5px !important;
+      }
+    }
+
+    .staff-org-tree {
+      height: calc(100% - 28px - 10px) !important; /* 28=标题高度+间距 + 10px额外缩减，确保按钮可见 */
+      border: 1px solid #EAECF0;
+      border-radius: 4px;
+      padding: 0 !important;
+      box-sizing: border-box;
+      width: 100% !important;
+      overflow-x: auto !important;
+      overflow-y: auto !important;
+      position: relative;
+      flex-shrink: 1;
+      min-height: 0 !important;
+
+      &::-webkit-scrollbar {
+        width: 8px !important;
+        height: 8px !important;
+        background: #f9f9f9 !important;
+      }
+      &::-webkit-scrollbar-thumb {
+        background: #ccc !important;
+        border-radius: 4px !important;
+      }
+      scrollbar-width: thin !important;
+      scrollbar-color: #ccc #f9f9f9 !important;
+    }
+
+    .tree-scroll-force {
+      width: 100% !important;
+      height: 100% !important;
+      margin: 0 !important;
+      padding: 8px !important;
+      box-sizing: border-box;
+      overflow: visible !important;
+      position: relative;
+    }
+  }
+
+  .staff-right-panel {
+    width: calc(40% - 7.5px) !important;
+    min-width: 0 !important;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    gap: 8px; /* 搜索框与列表、列表与底部选择栏的间距统一为8px */
+    padding: 0 5px;
+    flex-shrink: 1 !important;
+
+    // 搜索框：固定高度
+    .ivu-input-wrapper {
+      height: 32px;
+      flex-shrink: 0;
+    }
+
+    // 右侧人员列表容器：适配全屏高度
+    .staff-content {
+      height: calc(100% - 32px - 40px - 16px - 10px) !important;
+      min-height: 200px !important; // 小屏幕最小高度限制
+      border: 1px solid #EAECF0;
+      border-radius: 4px;
+      overflow-x: hidden !important;
+      overflow-y: auto !important;
+      flex-shrink: 1;
+
+      &::-webkit-scrollbar {
+        width: 8px !important;
+        height: 8px !important;
+        background: #f9f9f9 !important;
+      }
+      &::-webkit-scrollbar-thumb {
+        background: #ccc !important;
+        border-radius: 4px !important;
+      }
+      scrollbar-width: thin !important;
+      scrollbar-color: #ccc #f9f9f9 !important;
+    }
+
+    // 底部选择栏：固定高度
+    .bottom-select {
+      height: 40px;
+      flex-shrink: 0;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      padding: 8px 0;
+      background: #fff !important;
+      border-top: 1px solid #f0f0f0;
+
+      //.num {
+      //  color: var(--primary-color);
+      //}
+    }
+  }
+}
+
+
+.tab-content-pro {
+  .tab {
+    .search-row {
+      display: flex;
+      align-items: center;
+      flex-wrap: nowrap; // 禁止换行
+      width: 100%;
+      gap: 8px; // 文字和搜索框之间的间距
+    }
+    .tree {
+      // 全屏 使用百分比高度 + 最小高度
+      height: calc(100vh - 340px) !important; // 从300px增加到340px，缩减40px高度
+      min-height: 360px !important; // 降低最小高度，确保按钮可见
+      max-height: none !important; // 移除最大高度限制
+      margin-top:20px;
+      overflow-y: auto !important;
+      overflow-x: auto !important;
+      border: 1px solid #EAECF0;
+      border-radius: 4px;
+      box-sizing: border-box;
+
+      &::-webkit-scrollbar {
+        width: 8px !important;
+        height: 8px !important;
+        display: block !important;
+        background: #f9f9f9 !important;
+      }
+      &::-webkit-scrollbar-thumb {
+        background: #ccc !important;
+        border-radius: 4px !important;
+      }
+    }
+
+    &.post .right .tree {
+      // 岗位树适配全屏（缩减高度确保按钮可见）
+      height: calc(100vh - 430px) !important; // 从400px增加到430px，缩减30px高度
+      min-height: 270px !important; // 降低最小高度，确保按钮可见
+      max-height: none !important;
+    }
+
+    .bottom-select {
+      display:flex;
+      align-items: center;
+      justify-content: space-between;
+      margin-top:15px !important;
+      padding: 8px 0;
+      background: #fff !important;
+      position: relative;
+      z-index: 10;
+      border-top: 1px solid #f0f0f0;
+      .num{
+        color:var(--primary-color);
+      }
+    }
+    // 搜索标签样式（固定宽度，不换行）
+    .search-label {
+      white-space: nowrap; // 文字不换行
+      flex-shrink: 0; // 不被压缩
+      font-size: 14px;
+      color: #333;
+    }
+    // 搜索框容器样式（自适应剩余宽度）
+    .search-input-wrapper {
+      flex: 1; // 占满剩余宽度
+      min-width: 0; // 允许搜索框收缩
+    }
+  }
+}
+
+/deep/ .ivu-tree {
+  width: 100% !important;
+  box-sizing: border-box;
+}
+
+/deep/ .ivu-tree-node-content {
+  width: 100% !important;
+  box-sizing: border-box;
+}
+
+.gust-item {
+  display: flex;
+  align-items: center;
+  width: 100% !important;
+  padding: 12px 12px;
+  margin-top: 8px;
+  cursor: pointer;
+  box-sizing: border-box;
+  border: none !important;
+  &:hover {
+    background-color: #f2f8ff;
+    border-radius: 4px;
+  }
+}
+
+// 滚动条样式
+.staff-content::-webkit-scrollbar {
+  width: 8px !important;
+  height: 8px;
+  display: block !important;
+}
+
+.staff-content::-webkit-scrollbar-thumb {
+  background-color: #ccc !important;
+  border-radius: 4px !important;
+}
+
+.staff-content::-webkit-scrollbar-track {
+  background-color: #f9f9f9 !important;
+}
+
+.tab.post .left {
+  width: calc(50% - 10px) !important;
+  // 适配全屏高度
+  height: calc(100vh - 380px) !important;
+  min-height: 270px !important;
+  overflow: hidden !important;
+  padding-right: 10px;
+  box-sizing: border-box;
+
+  // 小屏幕仅调整宽度，不改变左右结构
+  @media (max-width: 1200px) {
+    width: calc(50% - 10px) !important;
+  }
+
+  // 超小屏幕
+  @media (max-width: 768px) {
+    width: 100%;
+    margin-bottom: 10px;
+  }
+}
+
+.scroll-container {
+  height: 100% !important;
+  overflow-y: auto !important;
+  overflow-x: hidden !important;
+  padding: 8px 0;
+  margin: 0;
+  box-sizing: border-box;
+}
+
+.scroll-container::-webkit-scrollbar {
+  width: 8px !important;
+  height: 8px;
+  display: block !important;
+}
+
+.scroll-container::-webkit-scrollbar-thumb {
+  background-color: #ccc !important;
+  border-radius: 4px !important;
+  transition: background-color 0.2s;
+}
+
+.scroll-container::-webkit-scrollbar-thumb:hover {
+  background-color: #999 !important;
+}
+
+.scroll-container::-webkit-scrollbar-track {
+  background-color: #f9f9f9 !important;
+  border-radius: 4px !important;
+}
+
+.position-item {
+  border: 1px solid #ddd;
+  margin: 5px 0;
+  padding: 8px 10px;
+  border-radius: 2px;
+  cursor: pointer;
+  transition: background-color 0.2s;
+  white-space: normal !important;
+  overflow: visible !important;
+  text-overflow: clip !important;
+  line-height: 1.4;
+  min-height: 40px;
+  word-wrap: break-word;
+}
+
+.position-item.active {
+  border-color: #1890ff;
+  background-color: #e6f7ff;
+}
+
+.position-item:hover:not(.active) {
+  background-color: #f5f5f5;
+}
+
+/* 组织选择（新）样式 */
+.org-new-tab {
+  .org-new-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 16px;
+    flex-wrap: wrap;
+    gap: 10px;
+  }
+
+  .org-new-actions {
+    display: flex;
+    gap: 10px;
+  }
+
+  .org-new-content {
+    max-height: 500px;
+    overflow-y: auto;
+    border: 1px solid #EAECF0;
+    border-radius: 4px;
+    padding: 16px;
+    margin-bottom: 16px;
+  }
+
+  .org-card {
+    border: 1px solid #EAECF0;
+    border-radius: 4px;
+    margin-bottom: 16px;
+    overflow: hidden;
+
+    .org-card-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 12px 16px;
+      background-color: #f9fafb;
+      border-bottom: 1px solid #EAECF0;
+
+      &:hover {
+        background-color: #f3f4f6;
+      }
+
+      .org-card-title {
+        display: flex;
+        align-items: center;
+        font-weight: 500;
+        cursor: pointer;
+      }
+
+      .org-card-actions {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+
+        .ivu-btn-text {
+          color: #1890ff;
+          font-weight: 500;
+          transition: all 0.2s;
+          cursor: pointer;
+
+          &:hover {
+            color: #40a9ff;
+            text-decoration: underline;
+            transform: translateY(-1px);
+          }
+
+          &:active {
+            color: #096dd9;
+            transform: translateY(0);
+          }
+        }
+      }
+    }
+
+    .org-card-body {
+      padding: 16px;
+    }
+  }
+
+  .city-card {
+    border: 1px solid #EAECF0;
+    border-radius: 4px;
+    margin-bottom: 12px;
+    overflow: hidden;
+
+    .city-card-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 10px 14px;
+      background-color: #f9fafb;
+      border-bottom: 1px solid #EAECF0;
+
+      &:hover {
+        background-color: #f3f4f6;
+      }
+
+      .city-card-title {
+        display: flex;
+        align-items: center;
+        font-weight: 500;
+        cursor: pointer;
+      }
+
+      .city-card-actions {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+
+        .ivu-btn-text {
+          color: #1890ff;
+          font-weight: 500;
+          transition: all 0.2s;
+          cursor: pointer;
+
+          &:hover {
+            color: #40a9ff;
+            text-decoration: underline;
+            transform: translateY(-1px);
+          }
+
+          &:active {
+            color: #096dd9;
+            transform: translateY(0);
+          }
+        }
+      }
+    }
+
+    .city-card-body {
+      padding: 14px;
+    }
+  }
+
+  .district-grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+    gap: 12px;
+  }
+
+  .district-item {
+    border: 1px solid #EAECF0;
+    border-radius: 4px;
+    overflow: hidden;
+
+    .district-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 8px 12px;
+      background-color: #f9fafb;
+      border-bottom: 1px solid #EAECF0;
+
+      &:hover {
+        background-color: #f3f4f6;
+      }
+
+      .district-title {
+        display: flex;
+        align-items: center;
+        font-weight: 500;
+        cursor: pointer;
+      }
+
+      .district-actions {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+
+        .ivu-btn-text {
+          color: #1890ff;
+          font-weight: 500;
+          transition: all 0.2s;
+          cursor: pointer;
+
+          &:hover {
+            color: #40a9ff;
+            text-decoration: underline;
+            transform: translateY(-1px);
+          }
+
+          &:active {
+            color: #096dd9;
+            transform: translateY(0);
+          }
+        }
+      }
+    }
+
+    .district-body {
+      padding: 12px;
+    }
+  }
+
+  .org-unit-item {
+    margin-bottom: 8px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  .unit-title {
+    display: flex;
+    align-items: center;
+    padding: 4px 0;
+    cursor: pointer;
+
+    &:hover {
+      color: #1890ff;
+    }
+  }
+
+  .org-card-title,
+  .city-card-title,
+  .district-title {
+    cursor: pointer;
+
+    &:hover {
+      color: #1890ff;
+    }
+  }
+
+  .org-new-footer {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding-top: 16px;
+    border-top: 1px solid #f0f0f0;
+  }
+
+  .include-level {
+    display: flex;
+    align-items: center;
+  }
+}
+
+.custom-select-wrapper {
+  position: relative;
+
+  /deep/ .ivu-select-clear {
+    right: 32px;
+    color: #999;
+    font-size: 16px;
+    opacity: 1 !important;
+    transition: all 0.2s ease;
+
+    &:hover {
+      color: #ff4d4f;
+      transform: scale(1.1);
+    }
+  }
+
+  /deep/ .ivu-select-arrow {
+    right: 12px;
+  }
+
+  /deep/ .ivu-select-input {
+    padding-right: 45px !important;
+  }
+
+  /deep/ .active-option {
+    background-color: #f2f8ff;
+    color: var(--primary-color);
+  }
+
+  /deep/ .ivu-select-option-disabled {
+    color: #ccc !important;
+    background: #f5f5f5 !important;
+  }
+}
+
+.tag-select-container {
+  margin-left: 10px;
+
+  /deep/ .ivu-select-dropdown {
+    max-height: 200px;
+    overflow-y: auto;
+  }
+
+  /deep/ .active-option {
+    background-color: #f2f8ff;
+    color: var(--primary-color);
+  }
+
+  /deep/ .ivu-select-selected-value {
+    max-width: 150px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+}
+
 .modal-tree{
+  // 全屏适配：移除固定宽度限制
+  width: 100% !important;
+  height: 100% !important;
+  max-width: none !important;
+  max-height: none !important;
+
   .header-text{
     font-weight: bold;
     font-size: 16px;
@@ -363,28 +3181,79 @@ export default {
     line-height: 16px;
   }
   .content-container{
+    width: 100%;
+    height: 100%;
+    padding: 10px;
+    box-sizing: border-box;
   }
   .tree-orig{
     width:100%;
     display: flex;
-    height: 700px;
+    // 适配全屏高度
+    height: calc(100vh - 80px) !important;
+    min-height: 600px !important;
     background: #fff;
+    // 强制保留左右结构，仅超小屏幕 换行
+    flex-wrap: nowrap !important;
+
+    // 只在当前组件内部隐藏 ink-bar，不影响全局
+    /deep/.ivu-tabs-ink-bar {
+      height: 0 !important;
+      display: none !important;
+      width: 0 !important;
+      background: transparent !important;
+      visibility: hidden !important;
+    }
+
     /deep/.ivu-tabs-nav{
       font-weight: bold;
       font-size: 16px;
-    }
-    /deep/.ivu-tabs-nav{
       width: 100%;
       display: flex;
+      margin: 0 !important;
+      padding: 0 !important;
     }
     /deep/.ivu-tabs-nav .ivu-tabs-tab{
       flex:1;
       text-align: center;
+      background: #F0F2F5 !important;
+      margin: 0 !important;
+      padding: 12px 0 !important;
+      border: none !important;
+      line-height: 1 !important;
+      border-right: 2px solid #E5E6EB !important; // 页签右侧竖线
+      line-height: 1 !important;
+      // 最后一个页签去掉右侧竖线
+      &:last-child {
+        border-right: none !important;
+      }
     }
-    .tab-content{
-      width: 720px;
+    /deep/.ivu-tabs-nav .ivu-tabs-tab-active {
+      background: #1890FF !important;
+      color: #fff !important;
+      margin: 0 !important;
+      border-right: 1px solid #E5E6EB !important;
+      &:last-child {
+        border-right: none !important;
+      }
+    }
+    .tab-content-pro{
+      // 6:4比例 - 减去gap的一半
+      width: calc(60% - 10px) !important;
+      max-width: none !important; // 取消固定最大宽度，按比例适配
+      flex-shrink: 0 !important; // 禁止压缩
       border-radius: 8px;
       border: 1px solid #EAECF0;
+      // 小屏幕保持6:4比例
+      @media (max-width: 1200px) {
+        width: calc(60% - 10px) !important;
+      }
+      // 超小屏幕兜底
+      @media (max-width: 768px) {
+        width: 100% !important;
+        margin-bottom: 10px;
+      }
+
       .tab{
         padding:20px;
         .tag-content{
@@ -393,9 +3262,32 @@ export default {
           display:flex;
           align-items: center;
         }
-        .tree{
-          height:450px;
+        .tree {
+          height: calc(100vh - 340px) !important; // 缩减40px确保按钮可见
+          min-height: 360px !important; // 降低最小高度
+          max-height: none !important; // 移除最大高度限制
           margin-top:20px;
+          overflow-y: auto !important; // 纵向溢出时滚动，而非超出
+          overflow-x: auto !important; // 横向溢出时滚动
+          border: 1px solid #EAECF0; // 明确容器边界
+          border-radius: 4px;
+          box-sizing: border-box; // 包含边框/内边距计算
+          // 滚动条样式统一（与人员Tab保持一致）
+          &::-webkit-scrollbar {
+            width: 8px !important;
+            height: 8px !important;
+            display: block !important;
+            background: #f9f9f9 !important;
+          }
+          &::-webkit-scrollbar-thumb {
+            background: #ccc !important;
+            border-radius: 4px !important;
+          }
+        }
+        &.post .right .tree {
+          height: calc(100vh - 430px) !important; // 缩减30px确保按钮可见
+          min-height: 270px !important; // 降低最小高度
+          max-height: none !important;
         }
         .staff-content{
           overflow:auto;
@@ -404,7 +3296,12 @@ export default {
           display:flex;
           align-items: center;
           justify-content: space-between;
-          margin-top:20px;
+          margin-top:15px !important; // 增加间距
+          padding: 8px 0; // 内边距提升可读性
+          background: #fff !important; // 白色背景覆盖树溢出内容
+          position: relative;
+          z-index: 10; // 层级高于树容器
+          border-top: 1px solid #f0f0f0; // 视觉分隔
           .num{
             color:var(--primary-color);
           }
@@ -424,17 +3321,52 @@ export default {
         border: 1px solid #EAECF0;
         margin-left:10px;
         font-weight: bold;
+        cursor: pointer;
         &.active{
           background: var(--primary-color);
           border-radius: 4px;
           color: #fff;
         }
       }
+      .pop-content{
+        display: flex;
+        flex-wrap: wrap;
+        width:500px;
+        .tag{
+          margin-top: 10px;
+          &.active{
+            background: var(--primary-color);
+            border-radius: 4px;
+            color: #fff;
+          }
+        }
+      }
       .post{
         display: flex;
         height: 100%;
+        // 小屏幕仅调整宽度，不改变左右结构
+        @media (max-width: 1200px) {
+          .left {
+            width: calc(50% - 10px) !important; // 同步改为50%
+          }
+        }
+        // 超小屏幕兜底
+        @media (max-width: 768px) {
+          flex-direction: column;
+
+          .left {
+            width: 100%;
+            margin-bottom: 10px;
+          }
+
+          .right {
+            margin-left: 0;
+            width: 100%;
+          }
+        }
+
         .left{
-          width:200px;
+          width: calc(50% - 10px) !important;
           overflow: auto;
           >div{
             background: #FFFFFF;
@@ -455,7 +3387,8 @@ export default {
         }
         .right{
           margin-left:20px;
-          flex: 1;
+          width: calc(50% - 10px) !important;
+          flex: none !important;
         }
       }
       .gust-item{
@@ -465,7 +3398,7 @@ export default {
         padding: 15px 10px;
         margin-top:10px;
         cursor: pointer;
-        .left-panel{
+        .left-panel-pro{
           background:url("./assets/name-bg.png") no-repeat;
           width:30px;
           height:30px;
@@ -476,7 +3409,7 @@ export default {
           line-height:30px;
           text-align:center;
         }
-        .right-panel{
+        .right-panel-pro{
           margin-left:10px;
           flex:1;
           >p:first-child{
@@ -492,20 +3425,36 @@ export default {
           font-size:18px;
         }
       }
-      .staff-active{
-        background:#E9F4FF;
-        >p:first-child{
-          color: var(--primary-color);
-        }
-      }
+      //.staff-active {
+      //  background: transparent !important; // 彻底移除背景色
+      //  border: none !important; // 彻底移除边框高亮
+      //  border-radius: 0 !important; // 移除圆角
+      //
+      //  > .right-panel > p:first-child {
+      //    color: inherit !important; // 可选：也移除文字颜色变化，仅保留Checkbox选中
+      //    // 如果需要保留文字变色，删除上面这行，保留下面注释的行
+      //    // color: var(--primary-color);
+      //  }
+      //}
     }
     .form-content{
-      flex:1;
+      // 6:4比例 - 减去gap的一半
+      width: calc(40% - 10px) !important;
+      min-width: 300px !important; // 最小宽度限制
       overflow: hidden;
       border-radius: 8px;
       border: 1px solid #EAECF0;
       margin-left:20px;
       padding:10px 20px;
+      height: 100%;
+      flex: none !important; // 取消弹性，固定比例
+      // 超小屏幕
+      @media (max-width: 768px) {
+        margin-left: 0;
+        width: 100%;
+        margin-top: 10px;
+      }
+
       >p{
         font-weight: 500;
         font-size: 16px;
@@ -539,6 +3488,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;
@@ -565,4 +3556,28 @@ export default {
     }
   }
 }
+
+// 超小屏幕适配（手机端）
+@media (max-width: 768px) {
+  .modal-tree .tree-orig {
+    flex-wrap: wrap !important; // 仅超小屏幕换行
+    height: calc(100vh - 100px) !important;
+    min-height: 400px !important;
+  }
+
+  .tab-content-pro .tab .tree {
+    height: calc(100vh - 380px) !important;
+    min-height: 300px !important;
+  }
+
+  .tab.post .left {
+    height: calc(100vh - 480px) !important;
+    min-height: 200px !important;
+  }
+
+  .staff-left-right-layout {
+    height: calc(100vh - 220px) !important;
+    min-height: 400px !important;
+  }
+}
 </style>