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

杨泽宇
2 parents 91d54a81 56b72204
Showing 7 changed files with 399 additions and 7 deletions
src/api/housekeeper/buildinMganager.ts
src/router/index.ts
src/router/modules/housekeeper.ts
src/views/community/housekeeper/index.vue
src/views/dashboard/index.vue
src/views/housekeeper/buildinMganager/detail.vue
src/views/housekeeper/buildinMganager/index.vue
+import request from '../request'
+
+// 查询列表
+export function getTableList(params:any) {
+  return request({
+    method: 'get',
+    url: '/housekeeper/housekeeperList',
+    params: params
+  })
+}
+// 根据条件查询列表
+export function residentListByCondition(params:any) {
+  return request({
+    method: 'get',
+    url: '/resident/residentListByCondition',
+    params: params
+  })
+}
+
+// 房屋信息
+export function getHouse(params:any) {
+  return request({
+    method: 'post',
+    url: '/house/getHouse',
+    params: params
+  })
+}
+// 删除
+export function deleteResident(params:any) {
+  return request({
+    method: 'delete',
+    url: '/resident/deleteResident',
+    params: params
+  })
+}
+// 删除
+export function changeBinding(params:any) {
+  return request({
+    method: 'PUT',
+    url: '/resident/changeBinding',
+    params: params
+  })
+}
+// 获取详情
+export function getResidentById(params:any) {
+  return request({
+    method: 'get',
+    url: '/resident/getResidentById',
+    params: params
+  })
+}
+// 修改
+export function update(params:any) {
+  return request({
+    method: 'post',
+    url: '/resident/update',
+    data: params
+  })
+}
@@ -6,6 +6,7 @@ import User from &quot;./modules/user&quot;
 import Property from "./modules/property"
 import Community from "./modules/community"
 import OwnerManagement from "./modules/ownerManagement"
+import Housekeeper from "./modules/housekeeper"
 import Layout from '@/layout/enter.vue'
 const routes: Array<any> = [
   { path: '/', redirect: { path: '/dashboard' } },
@@ -27,6 +28,7 @@ const routes: Array&lt;any&gt; = [
   Property,
   Community,
   OwnerManagement,
+  Housekeeper,
   {
     path: '/login',
     name: 'Login',
+
+import Layout from '@/layout/enter.vue'
+const housekeeper = {
+  path: '/',
+  component: Layout,
+  name: 'buildinMganager',
+  children: [{
+    path: 'buildinMganager',
+    name: 'buildinMganager',
+    component: () => import('@/views/housekeeper/buildinMganager/index.vue'),
+    meta: { title: '楼管管家' }
+  }
+  ]
+}
+
+export default housekeeper
@@ -139,8 +139,12 @@ onMounted(() =&gt; {
       <el-table-column label="使用面积" prop="employArea"></el-table-column>
       <el-table-column
         label="楼管姓名"
-        prop="buildingManager"
-      ></el-table-column>
+        
+      >
+      <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>
@@ -3,11 +3,11 @@ import {ref} from &#39;vue&#39;
 import {propertyList } from '@/api/property'
 import router from '@/router'
 const title = ref(import.meta.env.VITE_APP_TITLE).value
-propertyList().then(res => {
-  console.log(res)
-}).catch(error => {
-  console.log(error)
-})
+// propertyList().then(res => {
+//   console.log(res)
+// }).catch(error => {
+//   console.log(error)
+// })
 console.log(router.getRoutes())
 </script>
+<script setup lang="ts">
+import { reactive, ref, onMounted,getCurrentInstance } from "vue";
+import type { ElForm } 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: {
+    type: Object,
+    default: {
+      name: null,
+      address: null,
+      locality: null,
+      buildingCount: null,
+      storeroomCount: null,
+      truckSpaceCount: null,
+    },
+  },
+});
+
+let loading = ref(false);
+
+// 表单验证
+const rules = reactive({
+  name: [
+    {
+      required: true,
+      message: "请输入小区名",
+      trigger: "blur",
+    },
+  ],
+  locality: [
+    {
+      required: true,
+      message: "请输入所在地区",
+      trigger: "blur",
+    },
+  ],
+  address: [
+    {
+      required: true,
+      message: "请输入地址",
+      trigger: "blur",
+    },
+  ],
+  buildingCount: [
+    {
+      required: true,
+      message: "请输入楼座数",
+      trigger: "blur",
+    },
+  ],
+  storeroomCount: [
+    {
+      required: true,
+      message: "请输入储藏室数",
+      trigger: "blur",
+    },
+  ],
+  truckSpaceCount: [
+    {
+      required: true,
+      message: "请输入车位数",
+      trigger: "blur",
+    },
+  ],
+});
+
+const emit = defineEmits<{
+  (e: "cancel"): void;
+  (e: "success"): void;
+}>();
+
+/**
+ * 表单提交
+ * @param {ElForm | undefined} formEl 表单对象
+ */
+let submitForm = (formEl: InstanceType<typeof ElForm> | undefined) => {
+  loading.value = true;
+  if (!formEl) return;
+  formEl.validate((valid) => {
+    if (valid) {
+      addOrUpdate(props.formObj).then((res) => {
+         loading.value = false;
+         emit("success");
+      });
+    } else {
+      instance?.proxy?.$message.error('请完善信息')//调用
+      loading.value = false;
+      return false;
+    }
+  });
+};
+
+/**
+ * 取消提交
+ */
+const cancel: void = () => {
+  emit("cancel");
+};
+</script>
+
+<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-form-item>
+    <el-form-item label="所在地区:" prop="locality">
+      <el-input v-model="props.formObj.locality" placeholder="请输入所在地区"></el-input>
+    </el-form-item>
+    <el-form-item label="详细地址:" prop="address">
+      <el-input v-model="props.formObj.address" placeholder="请输入详细地址"></el-input>
+    </el-form-item>
+    <el-form-item label="楼座数:" prop="buildingCount">
+      <el-input v-model="props.formObj.buildingCount" onkeyup="value=value.replace(/[^\d]/g,'')" placeholder="请输入楼座数"></el-input>
+    </el-form-item>
+    <el-form-item label="储藏室数:" prop="storeroomCount">
+      <el-input v-model="props.formObj.storeroomCount" onkeyup="value=value.replace(/[^\d]/g,'')" placeholder="请输入储藏室数"></el-input>
+    </el-form-item>
+    <el-form-item label="车位数:" prop="truckSpaceCount">
+      <el-input v-model="props.formObj.truckSpaceCount" onkeyup="value=value.replace(/[^\d]/g,'')" placeholder="请输入车位数"></el-input>
+    </el-form-item>
+    <el-form-item>
+      <el-button
+        type="primary"
+        @click="submitForm(ruleFormRef)"
+        :loading="loading"
+        >保存</el-button
+      >
+      <el-button @click="cancel">取消</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+<script setup lang="ts">
+import { reactive, onMounted, getCurrentInstance } from "vue";
+import { getTableList } from "@/api/housekeeper/buildinMganager.ts";
+import Detail from "./detail.vue";
+import Pagination from "@/components/Pagination/index.vue";
+
+let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
+// 数据筛选
+const searchData = reactive({
+  type: "",
+  condition: "",
+  page: 1,
+  pageSize: 10,
+});
+// 展示
+const data = reactive({
+  total: 0,
+  tableList: [],
+  dialogVisible: false,
+  loading: false,
+  title: "新增楼管",
+  formObj: {},
+  options: [
+    { label: "选举", value: 0 },
+    { label: "派驻", value: 1 },
+  ],
+});
+
+/**
+ * 列表查询
+ */
+const search = (): void => {
+  data.loading = true;
+  getTableList(searchData)
+    .then((res) => {
+      data.tableList = res.data.data;
+      data.total = res.data.data.total;
+      data.loading = false;
+    })
+    .catch((err) => {
+      console.log(err);
+      data.loading = false;
+    });
+};
+/**
+ * 编辑
+ * @param { Object } 列表对象
+ */
+const edit = (row: Object) => {
+  data.title = "编辑楼管";
+  data.formObj = row;
+  data.dialogVisible = true;
+};
+/**
+ * 删除
+ * @param { number } neighborhoodId 小区ID
+ */
+const remove = (neighborhoodId: number) => {
+  instance?.proxy?.$messageBox
+    .confirm("确认要进行此操作？", "提示", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+    })
+    .then(() => {
+      deleteNeighborhood({ neighborhoodId: neighborhoodId }).then((res) => {
+        instance?.proxy?.$message.success("操作成功"); //调用
+        search();
+      });
+    })
+    .catch((err) => {});
+};
+/**
+ * 组件操作成功回调
+ */
+const changeData: void = () => {
+  data.dialogVisible = false;
+  search();
+};
+
+/**
+ * 弹框关闭
+ */
+const dialogClose: void = () => {
+  data.title = "新增小区";
+  data.formObj = {};
+};
+onMounted(() => {
+  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.type" placeholder="请选择类型" clearable>
+          <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-input
+          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-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="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-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
+          >
+        </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"
+    >
+      <Detail
+        @cancel="data.dialogVisible = false"
+        @success="changeData"
+        :formObj="data.formObj"
+      ></Detail>
+    </el-dialog>
+  </div>
+</template>
+
+<style></style>