fix:成员管理及机构管理bug修复

.env.development

@@ -4,10 +4,10 @@ VITE_APP_SETTING = true
 VITE_APP_TITLE = 掌柜运营平台
 # 接口请求地址，会设置到 axios 的 baseURL 参数上
 # VITE_APP_API_BASEURL = https://test.baoxianzhanggui.com/web-api #默认地址
-# VITE_APP_API_BASEURL = http://192.168.0.253:8001  #田智
+VITE_APP_API_BASEURL = http://192.168.0.253:8001  #田智
 # VITE_APP_API_BASEURL = http://192.168.0.55:8001  #董鑫
 # VITE_APP_API_BASEURL = http://192.168.0.106:8001  #屈晨
-VITE_APP_API_BASEURL = http://192.168.0.59:8001  #徐强
+# VITE_APP_API_BASEURL = http://192.168.0.59:8001  #徐强
 
 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空
 VITE_APP_DEBUG_TOOL =

src/views/personnel/institutionManage.vue

@@ -273,13 +273,7 @@ function selectChange(list:any){
 
 const isDisabledId = ref("");
 const addChild = (item: any) => {
-  // form.id=item.id
-  // console.log(item)
-  // form.parentId = item.id;
-  // isDisabledId.value = item.id;
-  // dialogVisible.value = true;
-  // operationType.value = "add";
-  // disabledTree(tableData.value);
+  
   router.push({
     path:'/personnel/institution/institutionEdit',
     query:{
@@ -287,20 +281,10 @@ const addChild = (item: any) => {
       id:item.id
     }
   })
-  // pageInfo.pageNum=item.pageNum
-  // pageInfo.pageSize=item.pageSize
+  
 };
 const editor = (item: any) => {
-  
-  // // form={...item}
-  // for (let key in item) {
-  //   form[key] = item[key];
-  // }
-  // isDisabledId.value=''
-  // // form.area=[item.province,item.city,item.area]
-  // dialogVisible.value = true;
-  // operationType.value = "edit";
-  // disabledTree(tableData.value)
+ 
   router.push({
     path:'/personnel/institution/institutionEdit',
     query:{
@@ -309,8 +293,7 @@ const editor = (item: any) => {
     }
   })
 
-  // pageInfo.pageNum=item.pageNum
-  // pageInfo.pageSize=item.pageSize
+  
 };
 const del = (item: any) => {
   // ElPopconfirm('是否确认')

src/views/personnel/memberManagement.vue

@@ -35,9 +35,9 @@
                 </span>
                 <template #dropdown>
                   <el-dropdown-menu>
-                    <el-dropdown-item>添加子机构</el-dropdown-item>
-                    <el-dropdown-item>编辑</el-dropdown-item>
-                    <el-dropdown-item>删除</el-dropdown-item>
+                    <el-dropdown-item @click="addChild(data)">添加子机构</el-dropdown-item>
+                    <el-dropdown-item @click="editorInstitution(data)">编辑</el-dropdown-item>
+                    <el-dropdown-item @click="del(data)">删除</el-dropdown-item>
                   </el-dropdown-menu>
                 </template>
               </el-dropdown>
@@ -61,8 +61,18 @@
       >
         <template v-slot:table-title-btn>
           <div>
-            <p>状态</p>
-            <p>展示全部成员</p>
+            <el-select v-model="status" style="width: 100px;">
+              <!-- status -->
+              <el-option
+                :label="'全部'" :value="'all'"
+              ></el-option>
+              <el-option v-for="item in statusList" :key="item.id"
+                :label="item.label" :value="item.value"
+              ></el-option>
+              <!-- <el-option :value="'add'">启用</el-option>
+              <el-option :value="'add'">禁用</el-option> -->
+            </el-select>
+            <el-button style="margin-left: 10px;" @click="showAllMember()">展示全部成员</el-button>
           </div>
           <div>
             <el-button type="primary" @click="add(ruleFormRef)">
@@ -257,8 +267,9 @@ onMounted(async () => {
  
 });
 
-//性别字典
+//状态字典
 const statusList = ref<dictType[]>([]);
+const status=ref('all')
 //机构列表
 
 type tableType = {
@@ -426,6 +437,10 @@ const pageInfo =reactive( {
   total: 0,
   show:true
 });
+function showAllMember(){
+  deptItem.value={}
+  getUserList()
+}
 const getList = (item: PageInfo) => {
   pageInfo.pageNum = item.pageNum;
   pageInfo.pageSize = item.pageSize;
@@ -469,11 +484,55 @@ const add = (formEl: FormInstance | undefined) => {
 };
 
 
+const addChild = (item: any) => {
+  // console.log(item)
+  router.push({
+    path:'/personnel/institution/institutionEdit',
+    query:{
+      type:"add",
+      id:item.id
+    }
+  })
+  
+};
+const editorInstitution = (item: any) => {
+ 
+ router.push({
+   path:'/personnel/institution/institutionEdit',
+   query:{
+     type:"edit",
+     id:item.id
+   }
+ })
 
-const operationMany = (item: any) => {
-  // pageInfo.pageNum=item.pageNum
-  // pageInfo.pageSize=item.pageSize
+ 
 };
+const del = (item: any) => {
+  // ElPopconfirm('是否确认')
+  ElMessageBox.confirm("确认要删除当前数据吗?", "提示", {
+    confirmButtonText: "确认",
+    cancelButtonText: "取消",
+    type: "warning",
+    center:true
+  })
+    .then(() => {
+      
+      api.institutionApi
+        .institutionDel({
+          id: item.id,
+        })
+        .then((res) => {
+          ElMessage.success("操作成功");
+          getInstitutionList(); //机构列表
+        });
+    })
+    .catch(() => {
+      ElMessage.warning("用户取消操作");
+    });
+};
+
+
+
 
 const append = (data: Tree) => {
   
@@ -492,16 +551,14 @@ const remove = (node: Node, data: Tree) => {
   children.splice(index, 1);
   // dataSource.value = [...dataSource.value]
 };
-const reset = (item: any) => {
-  // ElMessage({})
-};
+
 
 const deptDialogVisible=ref(false)
 //判断当前机构是否可以进行变更
 const changeDeptDialog = ref(false);
 const operationForm=ref({})
 function changeDept(item:any) {
-  // changeDeptDialog.value=true
+  
   operationForm.value=item.operationData.row
   api.userApi
     .checkChangeDept({
@@ -512,6 +569,7 @@ function changeDept(item:any) {
         // transferInfo.value=res.data
 
         changeDeptDialog.value = true;
+        deptItem.value={}
       }
     });
 }