fix bug

张红振
1 parent 61868128
Showing 3 changed files with 44 additions and 7 deletions
src/views/community/housekeeper/houseDetail.vue
src/views/ownerManagement/owner/detail.vue
src/views/ownerManagement/owner/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" },
@@ -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"