Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

src/views/personnel/memberManagement.vue

@@ -159,7 +159,7 @@
                 </template>
           </el-input>
           <el-tree ref="treeRef" style="max-width: 600px" class="filter-tree" :data="deptTreeData" :props="defaultProps"
-            :default-expand-all="true" :expand-on-click-node="false" :filter-node-method="filterNode"
+            :default-expand-all="false" :expand-on-click-node="false" :filter-node-method="filterNode"
             @node-click="treeClick">
             <template #default="{ node, data }">
               <span class="custom-tree-node">

src/views/personnel/roleManagement.vue

@@ -71,7 +71,7 @@
                 <el-radio value="3" size="large">指定机构</el-radio>
               </el-radio-group>
               <ElTree style="max-height: 440px; overflow-y: auto;" :data="deptTreeData" :props="deptProps" show-checkbox
-                node-key="id" check-strictly :default-expand-all="true" :default-checked-keys="roleInfo.deptIds"
+                node-key="id" :check-strictly="['1','2'].includes(roleInfo.dataMark)" :default-expand-all="true" :default-checked-keys="roleInfo.deptIds"
                 @check="handleDeptCheckChange" ref="deptTree" />
             </el-tab-pane>
           </el-tabs>