fix bug

张红振
1 parent 031bdd9c
Showing 5 changed files with 90 additions and 43 deletions
src/views/community/housekeeper/houseDetail.vue
src/views/community/housekeeper/index.vue
src/views/community/houses/index.vue
src/views/community/residence/communityDetail.vue
src/views/ownerManagement/owner/index.vue
 <script setup lang="ts">
-import { reactive, ref, onMounted, getCurrentInstance } from "vue";
+import {
+  reactive,
+  ref,
+  onMounted,
+  getCurrentInstance,
+  defineExpose,
+} from "vue";
 import { addOrUpdate } from "@/api/community/housekeeper.ts";
 import { getTableList } from "@/api/community/residence.ts";
  
 const ruleFormRef = ref<InstanceType<typeof ElForm>>();
 let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
  
-
 // 声明props
 const props = defineProps({
   formObj: {
@@ -102,6 +107,12 @@ const emit = defineEmits&lt;{
 }>();
  
 /**
+ * 重置
+ */
+let resetForm = () => {
+  ruleFormRef.value.resetFields();
+};
+/**
  * 表单提交
  * @param {ElForm | undefined} formEl 表单对象
  */
@@ -110,14 +121,14 @@ let submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
   if (!formEl) return;
   formEl.validate((valid) => {
     if (valid) {
-      console.log("111");
-      addOrUpdate(props.formObj).then((res) => {
-        console.log(111)
-        loading.value = false;
-        emit("success");
-      }).catch((err) => {
-        console.log(err)
-      })
+      addOrUpdate(props.formObj)
+        .then((res) => {
+          loading.value = false;
+          emit("success");
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     } else {
       instance?.proxy?.$message.error("请完善信息"); //调用
       loading.value = false;
@@ -132,6 +143,10 @@ let submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
 const cancel: void = () => {
   emit("cancel");
 };
+
+defineExpose({
+  resetForm,
+});
 </script>
  
 <template>
 <script setup lang="ts">
-import { reactive, onMounted, getCurrentInstance } from "vue";
+import { reactive, onMounted, ref, getCurrentInstance } from "vue";
 import { getTableList, deleteBuilding } from "@/api/community/housekeeper.ts";
 import { parseTime } from "@/utils/tool.ts";
 import HouseDetail from "./houseDetail.vue";
@@ -7,7 +7,7 @@ import Pagination from &quot;@/components/Pagination/index.vue&quot;;
 import { useRoute } from "vue-router";
  
 let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
-
+const houseDetailRef = ref(null);
 let route = useRoute(); // 路由
  
 // 数据筛选
@@ -50,9 +50,9 @@ const search = (): void =&gt; {
  * @param { Object } 列表对象
  */
 const edit = (row: Object) => {
+  data.title = "编辑楼宇";
   data.formObj = row;
   data.dialogVisible = true;
-  console.log(data.formObj);
 };
 /**
  * 删除
@@ -84,7 +84,9 @@ const changeData: void = () =&gt; {
  * 弹框关闭
  */
 const dialogClose: void = () => {
+  data.title = "新增楼宇";
   data.formObj = {};
+  houseDetailRef.value.resetForm();
 };
 onMounted(() => {
   searchData.neighborhoodId = route.query.neighborhoodId
@@ -145,7 +147,14 @@ onMounted(() =&gt; {
       <el-table-column label="操作">
         <template #default="scope">
           <el-button type="text" size="mini">更换楼管</el-button>
-          <el-button type="text" size="mini">房屋管理</el-button>
+          <router-link
+            :to="{
+              name: 'houses',
+              query: { buildingId: scope.row.id },
+            }"
+          >
+            <el-button type="text" size="mini">房屋管理</el-button>
+          </router-link>
           <el-button type="text" size="mini" @click="edit(scope.row)"
             >编辑</el-button
           >
@@ -173,6 +182,7 @@ onMounted(() =&gt; {
       @close="dialogClose"
     >
       <HouseDetail
+        ref="houseDetailRef"
         @cancel="data.dialogVisible = false"
         @success="changeData"
         :formObj="data.formObj"
 <script setup lang="ts">
-import { reactive, onMounted,getCurrentInstance } from "vue";
-import { getTableList, deleteHouse,getHouse } from "@/api/community/houses.ts";
+import { reactive, onMounted, getCurrentInstance } from "vue";
+import { getTableList, deleteHouse, getHouse } from "@/api/community/houses.ts";
 import { parseTime } from "@/utils/tool.ts";
 import Detail from "./detail.vue";
 import Pagination from "@/components/Pagination/index.vue";
+import { useRoute } from "vue-router";
  
-let instance: ComponentInternalInstance | null = getCurrentInstance();//获取app实例
+let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
+let route = useRoute(); // 路由
 // 数据筛选
 const searchData = reactive({
-  buildingId: 1,
+  buildingId: null,
   type: 0,
   roomNumber: null,
   pageNum: 1,
@@ -48,7 +50,7 @@ const search = (): void =&gt; {
 const check = (houseId: number) => {
   getHouse({ houseId: houseId }).then((res) => {
     data.formObj = res.data.data;
-    data.dialogVisible=true;
+    data.dialogVisible = true;
   });
 };
  
@@ -57,13 +59,24 @@ const check = (houseId: number) =&gt; {
  * @param { number } houseId 房屋ID
  */
 const remove = (houseId: number) => {
-  deleteHouse({ houseId: houseId }).then((res) => {
-    instance?.proxy?.$message.success('操作成功')//调用
-    search();
-  });
+  instance?.proxy?.$messageBox
+    .confirm("确认要进行此操作？", "提示", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+    })
+    .then(() => {
+      deleteHouse({ houseId: houseId }).then((res) => {
+        instance?.proxy?.$message.success("操作成功"); //调用
+        search();
+      });
+    })
+    .catch((err) => {});
 };
  
 onMounted(() => {
+  searchData.buildingId = route.query.buildingId
+    ? route.query.buildingId
+    : null;
   search();
 });
 </script>
@@ -100,7 +113,7 @@ onMounted(() =&gt; {
         >
       </el-table-column>
       <el-table-column label="楼宇名称" prop="buildingName">
-       <template #default="scope">
+        <template #default="scope">
           <span>{{ scope.row.building.buildingName }}</span></template
         >
       </el-table-column>
@@ -110,10 +123,13 @@ onMounted(() =&gt; {
       <el-table-column label="使用面积" prop="useArea"></el-table-column>
       <el-table-column label="操作" width="350px">
         <template #default="scope">
-          <el-button type="text" size="mini">更换楼管</el-button>
-          <el-button type="text" size="mini">房屋管理</el-button>
+          <el-button type="text" size="mini">绑定业主</el-button>
+          <el-button type="text" size="mini">取消绑定</el-button>
+          
+          <el-button type="text" size="mini" @click="check(scope.row.id)"
+            >查看房屋</el-button
+          >
           <el-button type="text" size="mini">查看业主</el-button>
-          <el-button type="text" size="mini" @click="check(scope.row.id)">查看房屋</el-button>
           <!-- <el-button type="text" size="mini" @click="edit(scope.row)"
             >编辑</el-button
           > -->
@@ -140,9 +156,7 @@ onMounted(() =&gt; {
       width="40%"
       @close="data.dialogClose"
     >
-      <Detail
-        :formObj="data.formObj"
-      ></Detail>
+      <Detail :formObj="data.formObj"></Detail>
     </el-dialog>
   </div>
 </template>
@@ -82,10 +82,9 @@ let submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
   if (!formEl) return;
   formEl.validate((valid) => {
     if (valid) {
-      console.log("111")
       addOrUpdate(props.formObj).then((res) => {
          loading.value = false;
-        emit("success");
+         emit("success");
       });
     } else {
       instance?.proxy?.$message.error('请完善信息')//调用
@@ -19,6 +19,11 @@ const data = reactive({
   loading: false,
   title: "新增小区",
   formObj: {},
+  options:[
+    {label:'业主',value:1},
+    {label:'租户',value:2},
+    {label:'住户',value:3}
+  ]
 });
  
 /**
@@ -80,11 +85,15 @@ onMounted(() =&gt; {
     <!-- 搜索 -->
     <el-form :inline="true" :model="searchData" v-loading="data.loading">
       <el-form-item>
-        <el-input
-          placeholder="请输入社区名称"
-          v-model="searchData.name"
-          clearable
-        ></el-input>
+        <el-select v-model="searchData.isOwner" placeholder="请选择类型">
+          <el-option
+            v-for="item in data.options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item
         ><el-button type="primary" @click="search"
@@ -104,12 +113,12 @@ onMounted(() =&gt; {
  
     <!-- 表格 -->
     <el-table border :data="data.tableList">
-      <el-table-column label="小区名称" prop="name"></el-table-column>
-      <el-table-column label="楼座数" prop="buildingCount"></el-table-column>
-      <el-table-column label="储藏室数" prop="storeroomCount"></el-table-column>
-      <el-table-column label="车位数" prop="truckSpaceCount"></el-table-column>
-      <el-table-column label="所在地区" prop="locality"></el-table-column>
-      <el-table-column label="详细地址" prop="address"></el-table-column>
+      <el-table-column label="房产名称" prop="name"></el-table-column>
+      <el-table-column label="姓名" prop="buildingCount"></el-table-column>
+      <el-table-column label="手机号" prop="storeroomCount"></el-table-column>
+      <el-table-column label="身份证" prop="truckSpaceCount"></el-table-column>
+      <el-table-column label="绑定日期" prop="locality"></el-table-column>
+      <el-table-column label="类型" prop="address"></el-table-column>
       <el-table-column label="操作">
         <template #default="scope">
           <el-button type="text" size="mini" @click="edit(scope.row)"