solve conflict

杨泽宇
2 parents 4cd0e324 e651226a
Showing 13 changed files with 349 additions and 73 deletions
src/api/ownerManagement/owner.ts
src/api/request.ts
src/main.ts
src/router/index.ts
src/router/modules/ownerManagement.ts
src/style/element.scss
src/views/community/housekeeper/houseDetail.vue
src/views/community/housekeeper/index.vue
src/views/community/houses/detail.vue
src/views/community/houses/index.vue
src/views/community/residence/communityDetail.vue
src/views/community/residence/index.vue
src/views/ownerManagement/owner/index.vue
+import request from '../request'
+
+// 列表查询
+export function getTableList(params:any) {
+  return request({
+    method: 'get',
+    url: '/resident/residentList',
+    params: params
+  })
+}
+
+// 房屋信息
+export function getHouse(params:any) {
+  return request({
+    method: 'post',
+    url: '/house/getHouse',
+    params: params
+  })
+}
+// 删除
+export function deleteHouse(params:any) {
+  return request({
+    method: 'delete',
+    url: '/house/deleteHouse',
+    params: params
+  })
+}
 import axios from 'axios'
 import * as store from "@/pinia/index";
 import router from '@/router'
-import { ElMessage } from "element-plus";
+import { ElMessage } from 'element-plus'
 // 不这样写报ts类型错误，import...有一个多余的boolean类型
-let url: any = import.meta.env 
+let url: any = import.meta.env
 let instance = axios.create({
   baseURL: url.VITE_BASE_URL,
   withCredentials: true,
@@ -26,18 +26,22 @@ instance.interceptors.request.use(
 instance.interceptors.response.use(
   response => {
-    if(response) {
+    if (response) {
       console.log(response?.data?.errorCode)
       switch (~~response?.data?.errorCode) {
         case 0:
           return response
         break;
         case 10002:
-          ElMessage.error("登录失效");
+          ElMessage.error(response?.data?.errorMessage || '登录失效');
           router.push({
             path: 'login'
           })
         break;
+        case 500:
+          ElMessage.error(`${response?.data?.errorMessage},请联系管理员`)
+          Promise.reject(response?.data)
+        break;
         default:
           ElMessage.error(response?.data?.errorMessage || '操作失败');
       }
@@ -5,7 +5,7 @@ import promise from &#39;es6-promise&#39;
 // import store from '@/store/index'
 import ElementPlus from 'element-plus'
-import { ElMessage } from 'element-plus'
+import { ElMessage,ElMessageBox  } from 'element-plus'
 import 'element-plus/dist/index.css'
 import zhCn from 'element-plus/es/locale/lang/zh-cn' // TIP elementUI配置中文环境
@@ -38,6 +38,7 @@ for(const i in globalVariable) {
 // app.config.warnHandler = () => null;
 // app.config.errorHandler = () => null;
 app.provide("$message", ElMessage);
+app.provide("$messageBox", ElMessageBox );
 app
 // .use(store)
@@ -6,6 +6,7 @@ import User from &quot;./modules/user&quot;
 import Resident from "./modules/resident"
 import Property from "./modules/property"
 import Community from "./modules/community"
+import OwnerManagement from "./modules/ownerManagement"
 import Layout from '@/layout/enter.vue'
 const routes: Array<any> = [
   { path: '/', redirect: { path: '/dashboard' } },
@@ -46,7 +47,7 @@ const routes: Array&lt;any&gt; = [
   Resident,
   Property,
   Community,
-
+  OwnerManagement,
   {
     path: '/login',
     name: 'Login',
+
+import Layout from '@/layout/enter.vue'
+const OwnerManagement = {
+  path: '/',
+  component: Layout,
+  name: 'Owner',
+  children: [{
+    path: 'owner',
+    name: 'owner',
+    component: () => import('@/views/ownerManagement/owner/index.vue'),
+    meta: { title: '业主管理' }
+  }
+  ]
+}
+
+export default OwnerManagement
@@ -9,9 +9,6 @@
 .el-scrollbar {
   width: 100%;
 }
-// .el-form--inline .el-form-item {
-  // margin-right: 0;
-// }
 // 一行内多个表单项布局
 .card-form {
 <script setup lang="ts">
-import { reactive, ref, watch, onMounted } from "vue";
-import type { ElForm } from "element-plus";
-import { ElMessage } from "element-plus";
+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: {
@@ -30,7 +37,7 @@ let data = reactive({
  * 获取下拉数据
  */
 const getSelectList: void = () => {
-  getTableList({ pageNum: 1, pageSize: 1000,type:0 })
+  getTableList({ pageNum: 1, pageSize: 1000, type: 0 })
     .then((res) => {
       data.options = res.data.data.list;
     })
@@ -39,8 +46,8 @@ const getSelectList: void = () =&gt; {
     });
 };
 onMounted(() => {
-  getSelectList()
-})
+  getSelectList();
+});
 // 表单验证
 const rules = reactive({
   neighborhoodId: [
@@ -100,6 +107,12 @@ const emit = defineEmits&lt;{
 }>();
 /**
+ * 重置
+ */
+let resetForm = () => {
+  ruleFormRef.value.resetFields();
+};
+/**
  * 表单提交
  * @param {ElForm | undefined} formEl 表单对象
  */
@@ -108,16 +121,16 @@ 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(res);
-        emit("success");
-      });
+      addOrUpdate(props.formObj)
+        .then((res) => {
+          loading.value = false;
+          emit("success");
+        })
+        .catch((err) => {
+          console.log(err);
+        });
     } else {
-      ElMessage({
-        message: "请完善信息",
-        type: "error",
-      });
+      instance?.proxy?.$message.error("请完善信息"); //调用
       loading.value = false;
       return false;
     }
@@ -130,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, ref } 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";
 import Pagination from "@/components/Pagination/index.vue";
-import { ElMessage } from "element-plus";
+import { useRoute } from "vue-router";
+
+let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
+const houseDetailRef = ref(null);
+let route = useRoute(); // 路由
+
 // 数据筛选
 const searchData = reactive({
   neighborhoodId: null,
@@ -45,19 +50,27 @@ const search = (): void =&gt; {
  * @param { Object } 列表对象
  */
 const edit = (row: Object) => {
+  data.title = "编辑楼宇";
   data.formObj = row;
   data.dialogVisible = true;
-  console.log(data.formObj);
 };
 /**
  * 删除
  * @param { number } buildingId 楼宇ID
  */
 const remove = (buildingId: number) => {
-  deleteBuilding({ buildingId: buildingId }).then((res) => {
-    ElMessage.success("操作成功");
-    search();
-  });
+  instance?.proxy?.$messageBox
+    .confirm("确认要进行此操作？", "提示", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+    })
+    .then(() => {
+      deleteBuilding({ buildingId: buildingId }).then((res) => {
+        instance?.proxy?.$message.success("操作成功"); //调用
+        search();
+      });
+    })
+    .catch((err) => {});
 };
 /**
  * 组件操作成功回调
@@ -71,9 +84,14 @@ const changeData: void = () =&gt; {
  * 弹框关闭
  */
 const dialogClose: void = () => {
+  data.title = "新增楼宇";
   data.formObj = {};
+  houseDetailRef.value.resetForm();
 };
 onMounted(() => {
+  searchData.neighborhoodId = route.query.neighborhoodId
+    ? route.query.neighborhoodId
+    : null;
   search();
 });
 </script>
@@ -96,8 +114,8 @@ onMounted(() =&gt; {
       >
       <el-row>
         <el-form-item>
-          <el-button type="primary">导入</el-button>
-          <el-button type="primary">导出</el-button>
+          <!-- <el-button type="primary">导入</el-button>
+          <el-button type="primary">导出</el-button> -->
           <el-button type="primary" @click="data.dialogVisible = true"
             >新增</el-button
           >
@@ -129,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
           >
@@ -157,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, ref, onMounted } from "vue";
+import { reactive, onMounted } from "vue";
 import { getHouse } from "@/api/community/houses.ts";
 // 声明props
@@ -9,7 +9,6 @@ const props = defineProps({
     default: {},
   },
 });
-console.log(props.formObj);
 </script>
 <template>
 <script setup lang="ts">
-import { reactive, onMounted, ref } 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 { ElMessage } from "element-plus";
+import { useRoute } from "vue-router";
+
+let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
+let route = useRoute(); // 路由
 // 数据筛选
 const searchData = reactive({
-  buildingId: 1,
+  buildingId: null,
   type: 0,
   roomNumber: null,
   pageNum: 1,
@@ -47,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;
   });
 };
@@ -56,13 +59,24 @@ const check = (houseId: number) =&gt; {
  * @param { number } houseId 房屋ID
  */
 const remove = (houseId: number) => {
-  deleteHouse({ houseId: houseId }).then((res) => {
-    ElMessage.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>
@@ -99,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>
@@ -109,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
           > -->
@@ -139,9 +156,7 @@ onMounted(() =&gt; {
       width="40%"
       @close="data.dialogClose"
     >
-      <Detail
-        :formObj="data.formObj"
-      ></Detail>
+      <Detail :formObj="data.formObj"></Detail>
     </el-dialog>
   </div>
 </template>
 <script setup lang="ts">
-import { reactive, ref, watch, onMounted } from "vue";
+import { reactive, ref, onMounted,getCurrentInstance } from "vue";
 import type { ElForm } from "element-plus";
-import { ElMessage } from "element-plus";
 import { addOrUpdate } from "@/api/community/residence.ts";
+
 const ruleFormRef = ref<InstanceType<typeof ElForm>>();
+let instance: ComponentInternalInstance | null = getCurrentInstance();//获取app实例
 // 声明props
 const props = defineProps({
   formObj: {
@@ -81,16 +82,12 @@ 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(res);
-        emit("success");
+         loading.value = false;
+         emit("success");
       });
     } else {
-      ElMessage({
-        message: "请完善信息",
-        type: "error",
-      });
+      instance?.proxy?.$message.error('请完善信息')//调用
       loading.value = false;
       return false;
     }
 <script setup lang="ts">
-import { reactive, onMounted, ref } from "vue";
+import { reactive, onMounted, getCurrentInstance } from "vue";
 import { getTableList, deleteNeighborhood } from "@/api/community/residence.ts";
 import CommunityDetail from "./communityDetail.vue";
 import Pagination from "@/components/Pagination/index.vue";
-import { ElMessage } from "element-plus";
+
+let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
 // 数据筛选
 const searchData = reactive({
-  propertyId: 1,
   type: 0,
   name: null,
   pageNum: 1,
@@ -44,19 +44,27 @@ const search = (): void =&gt; {
  * @param { Object } 列表对象
  */
 const edit = (row: Object) => {
+  data.title = "编辑小区";
   data.formObj = row;
   data.dialogVisible = true;
-  console.log(data.formObj);
 };
 /**
  * 删除
  * @param { number } neighborhoodId 小区ID
  */
 const remove = (neighborhoodId: number) => {
-  deleteNeighborhood({ neighborhoodId: neighborhoodId }).then((res) => {
-    ElMessage.success("操作成功");
-    search();
-  });
+  instance?.proxy?.$messageBox
+    .confirm("确认要进行此操作？", "提示", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+    })
+    .then(() => {
+      deleteNeighborhood({ neighborhoodId: neighborhoodId }).then((res) => {
+        instance?.proxy?.$message.success("操作成功"); //调用
+        search();
+      });
+    })
+    .catch((err) => {});
 };
 /**
  * 组件操作成功回调
@@ -70,6 +78,7 @@ const changeData: void = () =&gt; {
  * 弹框关闭
  */
 const dialogClose: void = () => {
+  data.title = "新增小区";
   data.formObj = {};
 };
 onMounted(() => {
@@ -82,7 +91,7 @@ onMounted(() =&gt; {
     <el-form :inline="true" :model="searchData" v-loading="data.loading">
       <el-form-item>
         <el-input
-          placeholder="请输入社区名称"
+          placeholder="输入小区名称"
           v-model="searchData.name"
           clearable
         ></el-input>
@@ -94,8 +103,8 @@ onMounted(() =&gt; {
       >
       <el-row>
         <el-form-item>
-          <el-button type="primary">导入</el-button>
-          <el-button type="primary">导出</el-button>
+          <!-- <el-button type="primary">导入</el-button>
+          <el-button type="primary">导出</el-button> -->
           <el-button type="primary" @click="data.dialogVisible = true"
             >新增</el-button
           >
@@ -119,7 +128,14 @@ onMounted(() =&gt; {
           <el-button type="text" size="mini" @click="remove(scope.row.id)"
             >删除</el-button
           >
-          <el-button type="text" size="mini">楼宇管理</el-button>
+          <router-link
+            :to="{
+              name: 'housekeeper',
+              query: { neighborhoodId: scope.row.id },
+            }"
+          >
+            <el-button type="text" size="mini">楼宇管理</el-button></router-link
+          >
         </template>
       </el-table-column>
     </el-table>
+<script setup lang="ts">
+import { reactive, onMounted, getCurrentInstance } from "vue";
+import { getTableList } from "@/api/ownerManagement/owner.ts";
+// import CommunityDetail from "./communityDetail.vue";
+import Pagination from "@/components/Pagination/index.vue";
+
+let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
+// 数据筛选
+const searchData = reactive({
+  isOwner: null,
+  pageNum: 1,
+  pageSize: 10,
+});
+// 展示
+const data = reactive({
+  total: 0,
+  tableList: [],
+  dialogVisible: false,
+  loading: false,
+  title: "新增小区",
+  formObj: {},
+  options:[
+    {label:'业主',value:1},
+    {label:'租户',value:2},
+    {label:'住户',value:3}
+  ]
+});
+
+/**
+ * 列表查询
+ */
+const search = (): void => {
+  data.loading = true;
+  getTableList(searchData)
+    .then((res) => {
+      data.tableList = res.data.data.list;
+      data.total = res.data.data.total;
+      searchData.pageSize = res.data.data.pageSize;
+      data.loading = false;
+    })
+    .catch((err) => {
+      console.log(err);
+      data.loading = false;
+    });
+};
+/**
+ * 编辑
+ * @param { Object } 列表对象
+ */
+const edit = (row: Object) => {
+  data.formObj = row;
+  data.dialogVisible = true;
+};
+/**
+ * 删除
+ * @param { number } neighborhoodId 小区ID
+ */
+const remove = (neighborhoodId: number) => {
+  // deleteNeighborhood({ neighborhoodId: neighborhoodId }).then((res) => {
+  //   instance?.proxy?.$message.success('操作成功')//调用
+  //   search();
+  // });
+};
+/**
+ * 组件操作成功回调
+ */
+const changeData: void = () => {
+  data.dialogVisible = false;
+  search();
+};
+
+/**
+ * 弹框关闭
+ */
+const dialogClose: void = () => {
+  data.formObj = {};
+};
+onMounted(() => {
+  console.log("11");
+  search();
+});
+</script>
+<template>
+  <div class="app-container">
+    <!-- 搜索 -->
+    <el-form :inline="true" :model="searchData" v-loading="data.loading">
+      <el-form-item>
+        <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"
+          >查询</el-button
+        ></el-form-item
+      >
+      <el-row>
+        <el-form-item>
+          <el-button type="primary">导入</el-button>
+          <el-button type="primary">导出</el-button>
+          <el-button type="primary" @click="data.dialogVisible = true"
+            >新增</el-button
+          >
+        </el-form-item>
+      </el-row>
+    </el-form>
+
+    <!-- 表格 -->
+    <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="操作">
+        <template #default="scope">
+          <el-button type="text" size="mini" @click="edit(scope.row)"
+            >编辑</el-button
+          >
+          <el-button type="text" size="mini" @click="remove(scope.row.id)"
+            >删除</el-button
+          >
+          <el-button type="text" size="mini">楼宇管理</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <Pagination
+      v-if="data.total > 0"
+      :total="data.total"
+      :currentPage="searchData.pageNum"
+      :pageSize="searchData.pageSize"
+      @pageChange="search"
+    ></Pagination>
+
+    <!-- 详情弹框 -->
+    <!-- <el-dialog
+      v-model="data.dialogVisible"
+      :title="data.title"
+      width="30%"
+      @close="dialogClose"
+    > -->
+    <!-- <CommunityDetail
+        @cancel="data.dialogVisible = false"
+        @success="changeData"
+        :formObj="data.formObj"
+      ></CommunityDetail> -->
+    <!-- </el-dialog> -->
+  </div>
+</template>
+
+<style></style>