同步6/16

src/views/system/houseRental/index.vue

@@ -11,7 +11,7 @@
                   <el-option v-for="item in com_house_use" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
-              <el-form-item label="发布人" prop="houseId">
+              <el-form-item label="发布人" prop="rentalName">
                 <el-input v-model="queryParams.rentalName" placeholder="请输入" clearable @keyup.enter="handleQuery" />
               </el-form-item>
               <el-form-item>
@@ -163,10 +163,14 @@ const { queryParams, form } = toRefs(data);
 /** 查询房屋租赁管理列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listHouseRental(queryParams.value);
-  houseRentalList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
+  listHouseRental(queryParams.value)
+    .then((res) => {
+      houseRentalList.value = res.rows;
+      total.value = res.total;
+    })
+    .finally(() => {
+      loading.value = false;
+    });
 };
 
 /** 取消按钮 */
@@ -190,6 +194,8 @@ const handleQuery = () => {
 /** 重置按钮操作 */
 const resetQuery = () => {
   queryFormRef.value?.resetFields();
+  queryParams.value.houseUse = '';
+  queryParams.value.rentalName = '';
   handleQuery();
 };
 
@@ -209,7 +215,7 @@ const handleAdd = () => {
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: HouseRentalVO) => {
-  const id = row.id || ids.value[0];
+  const id = row?.id || ids.value[0];
   router.push({
     path: '/house/edithouseRental',
     query: {