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

src/components/DialogSetDeptLeader/index.vue

@@ -104,6 +104,7 @@ const props = defineProps<{
   deptList: Array<tableType>;
   title: string;
   deptSelected: string;
+  typeAttr: string;
 }>();
 
 interface ListItem {
@@ -151,6 +152,7 @@ const remoteMethod = (query: string) => {
     api.userApi
       .AllMemberList({
         name: query,
+        typeAttr:props.typeAttr
       })
       .then((res: any) => {
 
@@ -184,6 +186,7 @@ function treeClick(node: any) {
   api.userApi
     .AllMemberList({
       deptId: node.id,
+      typeAttr:props.typeAttr
     })
     .then((res: any) => {
       if (res.code === 200) {

src/views/personnel/memberManagement.vue

@@ -139,7 +139,7 @@
         </template>
       </el-dialog>
       <setDept :dialogVisible="deptDialogVisible" :dept-list="deptTreeData" :dept-ids="[deptItem.id]"
-        @close-dialog="confirmDialogInfo" :title="title" @cancel-dialog="deptDialogVisible = false"></setDept>
+        @close-dialog="confirmDialogInfo" :title="title" typeAttr="2" @cancel-dialog="deptDialogVisible = false"></setDept>
       <el-dialog v-model="changeDeptDialog" title="变更机构" width="600" append-to-body draggable>
         <div>
           <el-input v-model="filterText" style="width: 240px" placeholder="请输入机构名称查找" :prefix-icon="Search" />

src/views/personnel/roleManagement.vue

@@ -76,8 +76,8 @@
                 <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" @check="handleDeptCheckChange" ref="deptTree" />
+                node-key="id" check-strictly :default-expand-all="true" :default-checked-keys="roleInfo.deptIds"
+                @check="handleDeptCheckChange" ref="deptTree" />
             </el-tab-pane>
           </el-tabs>
         </div>
@@ -475,7 +475,7 @@ function getRoleList() {
     .roleList({
       system: localStorage.getItem("login_system") || "",
       perms: [],
-      name:roleName.value,
+      name: roleName.value,
     })
     .then((res) => {
       roleList.value = JSON.parse(JSON.stringify(res.data))