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

杨泽宇
2 parents 2c418b5d 256022e7
Showing 11 changed files with 77 additions and 26 deletions
src/views/community/housekeeper/houseDetail.vue
src/views/community/housekeeper/index.vue
src/views/community/houses/buildOwner.vue
src/views/community/houses/index.vue
src/views/community/residence/communityDetail.vue
src/views/community/residence/index.vue
src/views/housekeeper/buildinMganager/index.vue
src/views/maintain/index.vue
src/views/ownerManagement/owner/detail.vue
src/views/ownerManagement/owner/index.vue
src/views/serviceman/index.vue
@@ -89,7 +89,7 @@ const rules = reactive({
     {
       type: "number",
       message: "请输入正确的建筑面积",
-      max: 1000,
+      max: 50000,
       transform: (value) => Number(value),
     },
     { whitespace: true, message: "请输入正确的建筑面积", trigger: "blur" },
@@ -111,7 +111,7 @@ const rules = reactive({
     {
       type: "number",
       message: "请输入正确的使用面积",
-      max: 1000,
+      max: 50000,
       transform: (value) => Number(value),
     },
   ],
@@ -6,9 +6,10 @@ import HouseDetail from &quot;./houseDetail.vue&quot;;
 import ChangeAdmin from "./changeAdmin.vue";
 import Pagination from "@/components/Pagination/index.vue";
 import { useRoute } from "vue-router";
+import type { ElForm } from 'element-plus'
  
 let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
-const houseDetailRef = ref<FormInstance>();
+const houseDetailRef = ref<InstanceType<typeof ElForm>>();
 let route = useRoute(); // 路由
  
 // 数据筛选
@@ -92,6 +93,7 @@ const changeData: void = () =&gt; {
  * 弹框关闭
  */
 const dialogClose: void = () => {
+  console.log(111)
   data.title = "新增楼宇";
   data.formObj = {};
   houseDetailRef.value.resetForm();
@@ -169,7 +171,7 @@ watchEffect(() =&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">
@@ -42,10 +42,8 @@ const data = reactive({
     { label: "在住", value: 1 },
   ],
   ownerList: [
-    { label: "租户", value: 0 },
-    { label: "业主", value: 1 },
-    { label: "家人", value: 2 },
-    { label: "朋友", value: 3 },
+    { label: "非业主", value: 0 },
+    { label: "业主", value: 1 }
   ],
   selectList: [],
 });
@@ -189,7 +187,7 @@ watchEffect(() =&gt; {
           </el-select>
         </template>
       </el-table-column>
-      <el-table-column label="类型" prop="isOwner">
+      <el-table-column label="是否是业主" prop="isOwner">
         <template #default="scope">
           <el-select v-model="scope.row.isOwner" placeholder="请选择">
             <el-option
@@ -161,7 +161,7 @@ watchEffect(() =&gt; {
           <span>{{ scope.row.building?.buildingName }}</span></template
         >
       </el-table-column>
-      <el-table-column label="单元数" prop="unitNumber"></el-table-column>
+      <el-table-column label="单元" prop="unitNumber"></el-table-column>
       <el-table-column label="房间号" prop="roomNumber"></el-table-column>
       <el-table-column label="建筑面积" prop="grossArea"></el-table-column>
       <el-table-column label="使用面积" prop="useArea"></el-table-column>
 <script setup lang="ts">
-import { reactive, ref, onMounted, getCurrentInstance } from "vue";
+import { reactive, ref, onMounted, getCurrentInstance,defineExpose } from "vue";
 import type { ElForm } from "element-plus";
 import { addOrUpdate } from "@/api/community/residence.ts";
  
@@ -103,13 +103,22 @@ let submitForm = (formEl: InstanceType&lt;typeof ElForm&gt; | undefined) =&gt; {
     }
   });
 };
-
+/**
+ * 重置
+ */
+let resetForm = () => {
+  ruleFormRef.value.resetFields();
+};
 /**
  * 取消提交
  */
 const cancel: void = () => {
   emit("cancel");
 };
+
+defineExpose({
+  resetForm,
+});
 </script>
  
 <template>
 <script setup lang="ts">
-import { reactive, onMounted, getCurrentInstance } from "vue";
+import { reactive, onMounted, getCurrentInstance,ref } from "vue";
 import { getTableList, deleteNeighborhood } from "@/api/community/residence.ts";
 import CommunityDetail from "./communityDetail.vue";
 import Pagination from "@/components/Pagination/index.vue";
+import type { ElForm } from 'element-plus'
  
 let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
+const detailRef = ref<InstanceType<typeof ElForm>>();
 // 数据筛选
 const searchData = reactive({
   type: 0,
@@ -80,6 +82,7 @@ const changeData: void = () =&gt; {
 const dialogClose: void = () => {
   data.title = "新增小区";
   data.formObj = {};
+  detailRef.value.resetForm();
 };
 onMounted(() => {
   search();
@@ -157,6 +160,7 @@ onMounted(() =&gt; {
       @close="dialogClose"
     >
       <CommunityDetail
+        ref="detailRef"
         @cancel="data.dialogVisible = false"
         @success="changeData"
         :formObj="data.formObj"
@@ -3,10 +3,11 @@ import { reactive, onMounted,ref, getCurrentInstance } from &quot;vue&quot;;
 import { getTableList,deleteHousekeeper } from "@/api/housekeeper/buildinMganager.ts";
 import Detail from "./detail.vue";
 import Pagination from "@/components/Pagination/index.vue";
+import type { ElForm } from 'element-plus'
  
 let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
  
-const detailRef = ref<FormInstance>()
+const detailRef = ref<InstanceType<typeof ElForm>>()
 // 数据筛选
 const searchData = reactive({
   type: "",
@@ -4,11 +4,11 @@ import { getTableList, deleteMaintainById } from &quot;@/api/notify/maintain.ts&quot;;
 import { parseTime } from "@/utils/tool.ts";
 import Detail from "./detail.vue";
 import Pagination from "@/components/Pagination/index.vue";
-// import * as store from "@/pinia/index";
 import { useLoginStore } from "@/pinia/login";
+import type { ElForm } from 'element-plus'
  
 let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
-const detailRef = ref<FormInstance>()
+const detailRef = ref<InstanceType<typeof ElForm>>()
 // 数据筛选
 const searchData = reactive({
   name: null,
@@ -35,7 +35,8 @@ const data = reactive({
     { label: "城镇户口", value: 1 },
     { label: "外阜", value: 2 },
   ],
-  livingList: [{ label: "自住" }, { label: "暂住" }, { label: "外租" }],
+  livingList: [{ label: "在住" }, { label: "不在住" }],
+  ownerList: [{ label: "业主" }, { label: "非业主" }],
 });
 const emit = defineEmits<{
   (e: "cancel"): void;
@@ -196,7 +197,22 @@ watchEffect((newValue, oldVlaue) =&gt; {
         </el-option>
       </el-select>
     </el-form-item>
-    <el-form-item label="居住类型:" prop="isLiving">
+    <el-form-item label="是否是业主:" prop="isOwner">
+      <el-select
+        v-model="data.formObj.isOwner"
+        placeholder="请选择"
+        :disabled="props.isEdit"
+      >
+        <el-option
+          v-for="item in data.ownerList"
+          :key="item.label"
+          :label="item.label"
+          :value="item.label"
+        >
+        </el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="是否居住:" prop="isLiving">
       <el-select
         v-model="data.formObj.isLiving"
         placeholder="请选择"
@@ -17,6 +17,7 @@ let route = useRoute(); // 路由
 // 数据筛选
 const searchData = reactive({
   isOwner: null,
+  isLiving: null,
   startTime: "",
   endTime: "",
   houseId: null,
@@ -36,8 +37,11 @@ const data = reactive({
   isEdit:false,
   options: [
     { label: "业主", value: 1 },
-    { label: "租户", value: 2 },
-    { label: "住户", value: 3 },
+    { label: "非业主", value: 0 }
+  ],
+  livingList: [
+    { label: "在住", value: 1 },
+    { label: "不在住", value: 0 }
   ],
 });
  
@@ -49,7 +53,8 @@ const chengeType = (e: Event) =&gt; {
   getTableList({
     page: searchData.page,
     pageSize: searchData.pageSize,
-    isOwner: e == "" ? null : e,
+    isOwner: searchData.isOwner,
+    isLiving: searchData.isLiving,
     houseId: searchData.houseId,
   })
     .then((res) => {
@@ -159,7 +164,7 @@ watchEffect(() =&gt; {
       <el-form-item>
         <el-select
           v-model="searchData.isOwner"
-          placeholder="请选择类型"
+          placeholder="请选择是否是业主"
           clearable
           @change="chengeType"
         >
@@ -173,6 +178,22 @@ watchEffect(() =&gt; {
         </el-select>
       </el-form-item>
       <el-form-item>
+        <el-select
+          v-model="searchData.isLiving"
+          placeholder="请选择是否在住"
+          clearable
+          @change="chengeType"
+        >
+          <el-option
+            v-for="item in data.livingList"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
         <el-date-picker
           v-model="data.time"
           type="datetimerange"
@@ -4,9 +4,10 @@ import { getTableList, deleteAccendant } from &quot;@/api/notify/serviceman.ts&quot;;
 import Detail from "./detail.vue";
 import { parseTime } from "@/utils/tool.ts";
 import Pagination from "@/components/Pagination/index.vue";
+import type { ElForm } from 'element-plus'
  
 let instance: ComponentInternalInstance | null = getCurrentInstance(); //获取app实例
-const detailRef = ref<FormInstance>();
+const detailRef = ref<InstanceType<typeof ElForm>>();
 // 数据筛选
 const searchData = reactive({
   name: null,
@@ -31,9 +32,8 @@ const search = (): void =&gt; {
   data.loading = true;
   getTableList(searchData)
     .then((res) => {
-      data.tableList = res.data.data;
-      data.total = res.data.data.length;
-      searchData.pageSize = res.data.data.pageSize;
+      data.tableList = res.data.data.list;
+      data.total = res.data.data.total;
       data.loading = false;
     })
     .catch((err) => {