cnlive_project / cnlive-community-web-vue · Commits

Commit 24347a615d8ee600ef1c6bfe9ab2a1e146047a7b

Authored by 张红振
1 parent 61868128

fix bug

Inline Side-by-side
Showing 3 changed files with 44 additions and 7 deletions
src/views/community/housekeeper/houseDetail.vue
  View file @24347a6
@@ -89,7 +89,7 @@ const rules = reactive({ @@ -89,7 +89,7 @@ const rules = reactive({
89 { 89 {
90 type: "number", 90 type: "number",
91 message: "请输入正确的建筑面积", 91 message: "请输入正确的建筑面积",
92 - max: 1000, 92 + max: 50000,
93 transform: (value) => Number(value), 93 transform: (value) => Number(value),
94 }, 94 },
95 { whitespace: true, message: "请输入正确的建筑面积", trigger: "blur" }, 95 { whitespace: true, message: "请输入正确的建筑面积", trigger: "blur" },
src/views/ownerManagement/owner/detail.vue
  View file @24347a6
@@ -35,7 +35,8 @@ const data = reactive({ @@ -35,7 +35,8 @@ const data = reactive({
35 { label: "城镇户口", value: 1 }, 35 { label: "城镇户口", value: 1 },
36 { label: "外阜", value: 2 }, 36 { label: "外阜", value: 2 },
37 ], 37 ],
38 - livingList: [{ label: "自住" }, { label: "暂住" }, { label: "外租" }], 38 + livingList: [{ label: "在住" }, { label: "不在住" }],
  39 + ownerList: [{ label: "业主" }, { label: "非业主" }],
39 }); 40 });
40 const emit = defineEmits<{ 41 const emit = defineEmits<{
41 (e: "cancel"): void; 42 (e: "cancel"): void;
@@ -196,7 +197,22 @@ watchEffect((newValue, oldVlaue) =&gt; { @@ -196,7 +197,22 @@ watchEffect((newValue, oldVlaue) =&gt; {
196 </el-option> 197 </el-option>
197 </el-select> 198 </el-select>
198 </el-form-item> 199 </el-form-item>
199 - <el-form-item label="居住类型:" prop="isLiving"> 200 + <el-form-item label="是否是业主:" prop="isOwner">
  201 + <el-select
  202 + v-model="data.formObj.isOwner"
  203 + placeholder="请选择"
  204 + :disabled="props.isEdit"
  205 + >
  206 + <el-option
  207 + v-for="item in data.ownerList"
  208 + :key="item.label"
  209 + :label="item.label"
  210 + :value="item.label"
  211 + >
  212 + </el-option>
  213 + </el-select>
  214 + </el-form-item>
  215 + <el-form-item label="是否居住:" prop="isLiving">
200 <el-select 216 <el-select
201 v-model="data.formObj.isLiving" 217 v-model="data.formObj.isLiving"
202 placeholder="请选择" 218 placeholder="请选择"
src/views/ownerManagement/owner/index.vue
  View file @24347a6
@@ -17,6 +17,7 @@ let route = useRoute(); // 路由 @@ -17,6 +17,7 @@ let route = useRoute(); // 路由
17 // 数据筛选 17 // 数据筛选
18 const searchData = reactive({ 18 const searchData = reactive({
19 isOwner: null, 19 isOwner: null,
  20 + isLiving: null,
20 startTime: "", 21 startTime: "",
21 endTime: "", 22 endTime: "",
22 houseId: null, 23 houseId: null,
@@ -36,8 +37,11 @@ const data = reactive({ @@ -36,8 +37,11 @@ const data = reactive({
36 isEdit:false, 37 isEdit:false,
37 options: [ 38 options: [
38 { label: "业主", value: 1 }, 39 { label: "业主", value: 1 },
39 - { label: "租户", value: 2 },  
40 - { label: "住户", value: 3 }, 40 + { label: "非业主", value: 0 }
  41 + ],
  42 + livingList: [
  43 + { label: "在住", value: 1 },
  44 + { label: "不在住", value: 0 }
41 ], 45 ],
42 }); 46 });
43 47
@@ -49,7 +53,8 @@ const chengeType = (e: Event) =&gt; { @@ -49,7 +53,8 @@ const chengeType = (e: Event) =&gt; {
49 getTableList({ 53 getTableList({
50 page: searchData.page, 54 page: searchData.page,
51 pageSize: searchData.pageSize, 55 pageSize: searchData.pageSize,
52 - isOwner: e == "" ? null : e, 56 + isOwner: searchData.isOwner,
  57 + isLiving: searchData.isLiving,
53 houseId: searchData.houseId, 58 houseId: searchData.houseId,
54 }) 59 })
55 .then((res) => { 60 .then((res) => {
@@ -159,7 +164,7 @@ watchEffect(() =&gt; { @@ -159,7 +164,7 @@ watchEffect(() =&gt; {
159 <el-form-item> 164 <el-form-item>
160 <el-select 165 <el-select
161 v-model="searchData.isOwner" 166 v-model="searchData.isOwner"
162 - placeholder="请选择类型" 167 + placeholder="请选择是否是业主"
163 clearable 168 clearable
164 @change="chengeType" 169 @change="chengeType"
165 > 170 >
@@ -173,6 +178,22 @@ watchEffect(() =&gt; { @@ -173,6 +178,22 @@ watchEffect(() =&gt; {
173 </el-select> 178 </el-select>
174 </el-form-item> 179 </el-form-item>
175 <el-form-item> 180 <el-form-item>
  181 + <el-select
  182 + v-model="searchData.isLiving"
  183 + placeholder="请选择是否在住"
  184 + clearable
  185 + @change="chengeType"
  186 + >
  187 + <el-option
  188 + v-for="item in data.livingList"
  189 + :key="item.value"
  190 + :label="item.label"
  191 + :value="item.value"
  192 + >
  193 + </el-option>
  194 + </el-select>
  195 + </el-form-item>
  196 + <el-form-item>
176 <el-date-picker 197 <el-date-picker
177 v-model="data.time" 198 v-model="data.time"
178 type="datetimerange" 199 type="datetimerange"