Merge branch 'dev' of http://bj.gitlab.cnlive.com/cnlive_project/cnlive-community-web-vue into dev

杨泽宇
2 parents a8f1735d e979bb4e
Showing 9 changed files with 251 additions and 48 deletions
src/api/community/housekeeper.ts
src/views/community/housekeeper/changeAdmin.vue
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/housekeeper/buildinMganager/index.vue
src/views/ownerManagement/owner/detail.vue
src/views/ownerManagement/owner/index.vue
@@ -25,3 +25,11 @@ export function deleteBuilding(params:any) {
     params: params
   })
 }
+// 更换楼管
+export function addOrUpBuildingHouseKeeper(params:any) {
+  return request({
+    method: 'PUT',
+    url: '/building/addOrUpBuildingHouseKeeper',
+    params: params
+  })
+}
+<script setup lang="ts">
+import { reactive, onMounted, ref, getCurrentInstance, defineProps } from "vue";
+import { getTableList } from "@/api/housekeeper/buildinMganager.ts";
+import { addOrUpBuildingHouseKeeper } from "@/api/community/housekeeper.ts";
+import Pagination from "@/components/Pagination/index.vue";
+
+let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
+// 声明props
+const props = defineProps({
+  buildingId: {
+    type: Number,
+    default: null,
+  },
+  originalIds: {
+    type: Number,
+    default: null,
+  },
+});
+
+// 数据筛选
+const searchData = reactive({
+  condition: "",
+  page: 1,
+  pageSize: 10,
+});
+// 展示
+const data = reactive({
+  total: 0,
+  tableList: [],
+  loading: false,
+  options: [
+    { label: "选举", value: 0 },
+    { label: "派驻", value: 1 },
+  ],
+  selectList: []
+});
+
+/**
+ * 列表查询
+ */
+const search = (): void => {
+  data.loading = true;
+  getTableList(searchData)
+    .then((res) => {
+      console.log(res);
+      data.tableList = res.data.data;
+      data.total = res.data.data.length;
+      data.loading = false;
+    })
+    .catch((err) => {
+      console.log(err);
+      data.loading = false;
+    });
+};
+/**
+ * 表格选择回调
+ */
+const handleSelectionChange = (val:Array) => {
+  data.selectList=val.map((val: any) =>{
+    return val.id
+  })
+}
+
+const submit=()=>{
+  console.log(data.selectList.length)
+  if(data.selectList.length==0){
+    instance?.proxy?.$message.error('请选择新的楼管')
+  }else{
+    addOrUpBuildingHouseKeeper({buildingId:props.buildingId,houseKeeperIds:data.selectList[0],originalIds:props.originalIds}).then((res)=>{
+      console.log(res)
+    })
+  }
+}
+
+onMounted(() => {
+  search();
+});
+</script>
+<template>
+  <div>
+    <!-- 搜索 -->
+    <el-form :inline="true" :model="searchData" v-loading="data.loading">
+      <el-form-item>
+        <el-input
+          style="width: 280px"
+          placeholder="请输入姓名/手机号/身份证号"
+          v-model="searchData.condition"
+          clearable
+        ></el-input>
+      </el-form-item>
+      <el-form-item
+        ><el-button type="primary" @click="search"
+          >查询</el-button
+        ></el-form-item
+      >
+      <el-form-item
+        ><el-button type="primary" @click="submit"
+          >确认选择</el-button
+        ></el-form-item
+      >
+    </el-form>
+
+    <!-- 表格 -->
+    <el-table border :data="data.tableList"  @selection-change="handleSelectionChange">
+    <el-table-column type="selection" width="55"/>
+      <el-table-column label="姓名" prop="name"></el-table-column>
+      <el-table-column label="手机号" prop="mobile"></el-table-column>
+      <el-table-column label="身份证号" prop="idcard"></el-table-column>
+      <el-table-column label="类型">
+        <template #default="scope">
+          <span>{{ scope.row.type == 0 ? "选举" : "派驻" }}</span></template
+        >
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页 -->
+    <Pagination
+      v-if="data.total > 0"
+      :total="data.total"
+      :currentPage="searchData.pageNum"
+      :pageSize="searchData.pageSize"
+      @pageChange="search"
+    ></Pagination>
+  </div>
+</template>
+
+<style></style>
@@ -175,13 +175,14 @@ defineExpose({
     <el-form-item label="楼宇名称:" prop="buildingName">
       <el-input
         v-model="props.formObj.buildingName"
+        :disabled="!!props.formObj.id"
         placeholder="请输入楼宇名称"
       ></el-input>
     </el-form-item>
-    <el-form-item label="单元数:" prop="unitCount">
+    <el-form-item label="单元:" prop="unitCount">
       <el-input
         v-model="props.formObj.unitCount"
-        placeholder="请输入单元数"
+        placeholder="请输入单元"
         onkeyup="value=value.replace(/[^\d]/g,'')"
       ></el-input>
     </el-form-item>
 <script setup lang="ts">
-import { reactive, onMounted, ref, getCurrentInstance } from "vue";
+import { reactive, onMounted, ref, getCurrentInstance, watchEffect } from "vue";
 import { getTableList, deleteBuilding } from "@/api/community/housekeeper.ts";
 import { parseTime } from "@/utils/tool.ts";
 import HouseDetail from "./houseDetail.vue";
+import ChangeAdmin from "./changeAdmin.vue";
 import Pagination from "@/components/Pagination/index.vue";
 import { useRoute } from "vue-router";
@@ -27,6 +28,12 @@ const data = reactive({
   title: "新增楼宇",
   formObj: {},
 });
+// 更换楼管相关数据属性
+const changeObj = reactive({
+  currBuildingId:null,
+  originalId:null,
+  changeVisible: false,
+});
 /**
  * 列表查询
@@ -87,9 +94,23 @@ const dialogClose: void = () =&gt; {
   data.formObj = {};
   houseDetailRef.value.resetForm();
 };
-onMounted(() => {
-  searchData.neighborhoodId = route.query.neighborhoodId??null;
-  search();
+/**
+ * 更换楼管
+ * @param { Object } row 操作对象
+ */
+const changeManage:void = (row:Object) => {
+   changeObj.currBuildingId=row.id;
+   changeObj.originalId=row.housekeeper.id
+   changeObj.changeVisible=true
+}
+/**
+ * 监听路由参数变换
+ */
+watchEffect(() => {
+  if (route.path == "/housekeeper") {
+    searchData.neighborhoodId = route.query.neighborhoodId ?? null;
+    search();
+  }
 });
 </script>
@@ -128,7 +149,7 @@ onMounted(() =&gt; {
         >
       </el-table-column>
       <el-table-column label="楼宇名称" prop="buildingName"></el-table-column>
-      <el-table-column label="单元数" prop="unitCount"></el-table-column>
+      <el-table-column label="单元" prop="unitCount"></el-table-column>
       <el-table-column label="总房屋数量" prop="houseCount"></el-table-column>
       <el-table-column label="建成日期" prop="createTime">
         <template #default="scope">
@@ -137,17 +158,14 @@ onMounted(() =&gt; {
       </el-table-column>
       <el-table-column label="建筑面积" prop="grossArea"></el-table-column>
       <el-table-column label="使用面积" prop="employArea"></el-table-column>
-      <el-table-column
-        label="楼管姓名"
-        
-      >
-      <template #default="scope">
-      <span>{{ scope.row.housekeeper?.name }}</span>
-      </template>
+      <el-table-column label="楼管姓名">
+        <template #default="scope">
+          <span>{{ scope.row.housekeeper?.name }}</span>
+        </template>
       </el-table-column>
       <el-table-column label="操作">
         <template #default="scope">
-          <el-button type="text" size="mini">更换楼管</el-button>
+          <el-button type="text" size="mini" @click="changeManage(scope.row)">更换楼管</el-button>
           <router-link
             :to="{
               name: 'houses',
@@ -189,6 +207,15 @@ onMounted(() =&gt; {
         :formObj="data.formObj"
       ></HouseDetail>
     </el-dialog>
+
+    <!-- 更换楼管 -->
+    <el-dialog
+      v-model="changeObj.changeVisible"
+      title="更换楼管"
+      width="60%"
+    >
+      <ChangeAdmin :buildingId="changeObj.currBuildingId" :originalIds="changeObj.originalId"></ChangeAdmin>
+    </el-dialog>
   </div>
 </template>
 <script setup lang="ts">
-import { reactive, onMounted, getCurrentInstance } from "vue";
+import { reactive, onMounted, getCurrentInstance,watchEffect } from "vue";
 import { getTableList, deleteHouse, getHouse } from "@/api/community/houses.ts";
 import { parseTime } from "@/utils/tool.ts";
 import Detail from "./detail.vue";
@@ -35,7 +35,6 @@ const search = (): void =&gt; {
     .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) => {
@@ -72,10 +71,14 @@ const remove = (houseId: number) =&gt; {
     })
     .catch((err) => {});
 };
-
-onMounted(() => {
-  searchData.buildingId = route.query.buildingId??null;
-  search();
+/**
+ * 监听路由参数变换
+ */
+watchEffect(() => {
+  if (route.path == "/houses") {
+    searchData.buildingId = route.query.buildingId ?? null;
+    search();
+  }
 });
 </script>
@@ -127,10 +130,15 @@ onMounted(() =&gt; {
           <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="edit(scope.row)"
-            >编辑</el-button
-          > -->
+          <router-link
+            :to="{
+              name: 'owner',
+              query: { houseId: scope.row.id },
+            }"
+          >
+            <el-button type="text" size="mini">查看业主</el-button>
+          </router-link>
+    
           <el-button type="text" size="mini" @click="remove(scope.row.id)"
             >删除</el-button
           >
@@ -105,7 +105,7 @@ const cancel: void = () =&gt; {
 <template>
   <el-form ref="ruleFormRef" :model="props.formObj" :rules="rules" label-width="100px">
     <el-form-item label="小区名称:" prop="name">
-      <el-input v-model="props.formObj.name" placeholder="请输入名称"></el-input>
+      <el-input v-model="props.formObj.name" placeholder="请输入名称" :disabled="!!props.formObj.id"></el-input>
     </el-form-item>
     <el-form-item label="所在地区:" prop="locality">
       <el-input v-model="props.formObj.locality" placeholder="请输入所在地区"></el-input>
@@ -109,6 +109,7 @@ onMounted(() =&gt; {
       </el-form-item>
       <el-form-item>
         <el-input
+         style="width:280px"
           placeholder="请输入姓名/手机号/身份证号"
           v-model="searchData.condition"
           clearable
 <script setup lang="ts">
-import { reactive, onMounted, watchEffect } from "vue";
+import { reactive, onMounted, watchEffect,defineEmits } from "vue";
 import { getResidentById, update } from "@/api/ownerManagement/owner.ts";
 // 声明props
@@ -35,8 +35,16 @@ const data = reactive({
     { label: "城镇户口", value: 1 },
     { label: "外阜", value: 2 },
   ],
+  livingList: [
+    { label: "自住"},
+    { label: "暂住" },
+    { label: "外租" },
+  ],
 });
-
+const emit = defineEmits<{
+  (e: "cancel"): void;
+  (e: "success"): void;
+}>();
 /**
  * 获取详情
  * @param { number } id 住户id
@@ -54,10 +62,16 @@ const getData = (id: number) =&gt; {
  */
 const submit = () => {
   update(data.formObj).then((res) => {
-    console.log(res);
+    emit("success")
   });
 };
 /**
+ * 取消提交
+ */
+const cancel: void = () => {
+  emit("cancel");
+};
+/**
  * 监听改变
  */
 watchEffect((newValue, oldVlaue) => {
@@ -68,17 +82,17 @@ watchEffect((newValue, oldVlaue) =&gt; {
 </script>
 <template>
-  <el-form :model="formObj" label-width="120px" :inline="true">
-    <el-form-item label="所属小区:">
+  <el-form :model="data.formObj" label-width="120px" :inline="true">
+    <el-form-item label="所属小区:" prop="neighborhoodName">
       <el-input v-model="data.formObj.neighborhoodName" disabled></el-input>
     </el-form-item>
     <el-form-item label="楼宇名称:" prop="buildingName">
       <el-input v-model="data.formObj.buildingName" disabled></el-input>
     </el-form-item>
-    <el-form-item label="姓名:" prop="unitCount">
+    <el-form-item label="姓名:" prop="name">
       <el-input v-model="data.formObj.name" :disabled="props.isEdit"></el-input>
     </el-form-item>
-    <el-form-item label="房间号:" prop="unitCount">
+    <el-form-item label="房间号:" prop="houseName">
       <el-input v-model="data.formObj.houseName" disabled></el-input>
     </el-form-item>
     <el-form-item label="身份证号:" prop="idcard">
@@ -88,13 +102,13 @@ watchEffect((newValue, oldVlaue) =&gt; {
       ></el-input>
     </el-form-item>
-    <el-form-item label="手机号:" prop="grossArea">
+    <el-form-item label="手机号:" prop="mobile">
       <el-input
         v-model="data.formObj.mobile"
         :disabled="props.isEdit"
       ></el-input>
     </el-form-item>
-    <el-form-item label="出生日期:" prop="employArea">
+    <el-form-item label="出生日期:" prop="birthdate">
       <el-date-picker
         :disabled="props.isEdit"
         style="width: 200px"
@@ -104,7 +118,7 @@ watchEffect((newValue, oldVlaue) =&gt; {
       >
       </el-date-picker>
     </el-form-item>
-    <el-form-item label="性别:" prop="employArea">
+    <el-form-item label="性别:" prop="gender">
       <el-select
         disabled
         v-model="data.formObj.gender"
@@ -120,16 +134,16 @@ watchEffect((newValue, oldVlaue) =&gt; {
         </el-option>
       </el-select>
     </el-form-item>
-    <el-form-item label="民族:" prop="employArea">
+    <el-form-item label="民族:" prop="nationality">
       <el-input v-model="data.formObj.nationality" disabled></el-input>
     </el-form-item>
-    <el-form-item label="户籍所在地:" prop="employArea">
+    <el-form-item label="户籍所在地:" prop="censusRegister">
       <el-input
         v-model="data.formObj.censusRegister"
         :disabled="props.isEdit"
       ></el-input>
     </el-form-item>
-    <el-form-item label="婚姻状态:" prop="employArea">
+    <el-form-item label="婚姻状态:" prop="isMarried">
       <el-select
         :disabled="props.isEdit"
         v-model="data.formObj.isMarried"
@@ -145,7 +159,7 @@ watchEffect((newValue, oldVlaue) =&gt; {
         </el-option>
       </el-select>
     </el-form-item>
-    <el-form-item label="政治面貌:" prop="employArea">
+    <el-form-item label="政治面貌:" prop="politicalStatus">
       <el-select
         v-model="data.formObj.politicalStatus"
         placeholder="请选择"
@@ -161,7 +175,7 @@ watchEffect((newValue, oldVlaue) =&gt; {
         </el-option>
       </el-select>
     </el-form-item>
-    <el-form-item label="户口类型:" prop="employArea">
+    <el-form-item label="户口类型:" prop="censusType">
       <el-select
         v-model="data.formObj.censusType"
         placeholder="请选择"
@@ -177,19 +191,29 @@ watchEffect((newValue, oldVlaue) =&gt; {
         </el-option>
       </el-select>
     </el-form-item>
-    <el-form-item label="居住类型:" prop="employArea">
-      <el-input
-        v-model="data.formObj.useArea"
+    <el-form-item label="居住类型:" prop="isLiving">
+    <el-select
+        v-model="data.formObj.isLiving"
+        placeholder="请选择"
+        style="width: 200px"
         :disabled="props.isEdit"
-      ></el-input>
+      >
+        <el-option
+          v-for="item in data.livingList"
+          :key="item.label"
+          :label="item.label"
+          :value="item.label"
+        >
+        </el-option>
+      </el-select>
     </el-form-item>
-    <el-form-item label="现住地址:" prop="employArea">
+    <el-form-item label="现住地址:" prop="location">
       <el-input
         v-model="data.formObj.location"
         :disabled="props.isEdit"
       ></el-input>
     </el-form-item>
-    <el-form-item label="暂住证号:" prop="employArea">
+    <el-form-item label="暂住证号:" prop="residencePermit">
       <el-input
         v-model="data.formObj.residencePermit"
         :disabled="props.isEdit"
@@ -198,6 +222,7 @@ watchEffect((newValue, oldVlaue) =&gt; {
     <el-row>
       <el-form-item>
         <el-button type="primary" @click="submit">保存</el-button>
+         <el-button @click="cancel">取消</el-button>
       </el-form-item>
     </el-row>
   </el-form>
@@ -6,6 +6,7 @@ import {
   deleteResident,
   changeBinding,
 } from "@/api/ownerManagement/owner.ts";
+import { parseTime } from "@/utils/tool.ts";
 import Detail from "./detail.vue";
 import Pagination from "@/components/Pagination/index.vue";
@@ -165,6 +166,7 @@ onMounted(() =&gt; {
       </el-form-item>
       <el-form-item>
         <el-input
+        style="width:280px"
           v-model="searchData.condition"
           placeholder="请输入/姓名/手机号/身份证号"
           clearable
@@ -198,7 +200,11 @@ onMounted(() =&gt; {
       <el-table-column label="姓名" prop="name"></el-table-column>
       <el-table-column label="手机号" prop="mobile"></el-table-column>
       <el-table-column label="身份证" prop="idcard"></el-table-column>
-      <el-table-column label="绑定日期" prop="bindDate"></el-table-column>
+      <el-table-column label="绑定日期" prop="bindDate">
+       <template #default="scope">
+          <span>{{ parseTime(new Date(scope.row.bindDate).getTime()) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="类型" prop="isOwner"></el-table-column>
       <el-table-column label="操作">
         <template #default="scope">