房屋管理页面联调

ruoyi-ui/src/views/szxc/jminfo/index.vue

@@ -412,6 +412,7 @@
               <el-dropdown-item command="handleBankInfo">银行卡信息</el-dropdown-item>
               <el-dropdown-item command="handleHzbg">户主变更</el-dropdown-item>
               <el-dropdown-item command="handleClxx">车辆信息</el-dropdown-item>
+              <el-dropdown-item command="handleFwxx">房屋信息</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
         </template>
@@ -1069,6 +1070,46 @@
       </div>
     </el-dialog>
 
+    <el-dialog title="房屋信息" :visible.sync="fwxx.visible" width="1200px" append-to-body>
+      <el-table v-loading="fwxx.loading" :data="fwxx.list" border>
+        <el-table-column label="主键ID" align="center" prop="id" />
+        <el-table-column label="所属网格" align="center" prop="deptName" />
+        <el-table-column label="户主姓名" align="center" prop="ownerName" />
+        <el-table-column label="身份证号" align="center" prop="cardId" />
+        <el-table-column label="小区名称" align="center" prop="houseName" />
+        <el-table-column label="楼栋名称" align="center" prop="ldName" />
+        <el-table-column label="单元" align="center" prop="unit" />
+        <el-table-column label="门牌号" align="center" prop="doorNo" />
+        <el-table-column label="房屋类型" align="center" prop="houseType" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_xqfwlx" :value="scope.row.houseType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="房屋面积" align="center" prop="houseArea" />
+        <el-table-column label="房屋性质" align="center" prop="houseProp" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_fw_xz" :value="scope.row.houseProp"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="取暖方式" align="center" prop="qnfs" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_qnfs" :value="scope.row.qnfs"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="厕所类型" align="center" prop="toiletType" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.szxc_cs_type" :value="scope.row.toiletType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="房屋简介" align="center" prop="houseIntro" />
+        <el-table-column label="房屋照片" align="center" prop="housePicture" >
+          <template slot-scope="scope">
+            <image-preview :src="scope.row.housePicture" :width="50" :height="50"/>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -1079,6 +1120,7 @@ import { listJmtag, addAllJmtag } from "@/api/szxc/jmtag";
 import { listTag } from "@/api/szxc/tag";
 import { listBankinfo, editDefault, addBankinfo, updateBankinfo, delBankinfo } from "@/api/szxc/bankinfo";
 import { listCarinfo, delCarinfo, addCarinfo, updateCarinfo } from "@/api/szxc/carinfo";
+import { listHouseinfo } from "@/api/szxc/houseinfo";
 import { addRecard } from "@/api/szxc/recard";
 import { addOffrecard } from "@/api/szxc/offrecard";
 import { deptTreeSelect } from "@/api/system/user";
@@ -1089,7 +1131,8 @@ export default {
   name: "Jminfo",
   components: { Treeselect },
   dicts: ['szxc_hjxz', 'szxc_gj', 'szxc_head', 'szxc_hzgx', 'szxc_yes_no', 'szxc_off', 'szxc_gj', 'sys_user_sex',
-    'szxc_brqk', 'szxc_hyzk', 'szxc_xueli', 'szxc_zjxy', 'szxc_jkzk', 'szxc_zzmm', 'szxc_hkbg_reason', 'szxc_cartype'],
+    'szxc_brqk', 'szxc_hyzk', 'szxc_xueli', 'szxc_zjxy', 'szxc_jkzk', 'szxc_zzmm', 'szxc_hkbg_reason',
+    'szxc_cartype', 'szxc_qnfs', 'szxc_fw_xz', 'szxc_xq_type', 'szxc_wy_type', 'szxc_cs_type', 'szxc_xqfwlx'],
   data() {
     return {
       queryMore: false,
@@ -1409,6 +1452,16 @@ export default {
           ],
         },
       },
+      // 房屋信息
+      fwxx: {
+        visible: false,
+        // 遮罩层
+        loading: false,
+        // 查询列表
+        list: [],
+        // 居民信息
+        jminRow: null,
+      },
     };
   },
   created() {
@@ -1579,6 +1632,9 @@ export default {
         case "handleClxx":
           this.handleClxx(row);
           break;
+        case "handleFwxx":
+          this.handleFwxx(row);
+          break;
         default:
           break;
       }
@@ -1818,7 +1874,7 @@ export default {
       this.clxx.visible = true;
       this.getlistClxx();
     },
-    /** 查询银行卡信息列表 */
+    /** 查询车辆信息列表 */
     getlistClxx() {
       listCarinfo({
         pageNum: 1,
@@ -1828,7 +1884,7 @@ export default {
         this.clxx.list = response.rows
       });
     },
-    // 添加银行卡
+    // 添加车辆
     clxxAdd(){
       this.resetForm("clxxForm");
       this.clxx.form = {
@@ -1868,7 +1924,7 @@ export default {
         this.$modal.msgSuccess("删除成功");
       }).catch(() => {});
     },
-    // 添加提交银行卡
+    // 添加车辆银行卡
     clxxSubmit(){
       this.$refs["clxxForm"].validate(valid => {
         if (valid) {
@@ -1888,6 +1944,22 @@ export default {
         }
       });
     },
+    // 房屋信息
+    handleFwxx(row){
+      this.fwxx.jminRow = row;
+      this.fwxx.visible = true;
+      this.getlistHouseinfo();
+    },
+    /** 查询房屋信息列表 */
+    getlistHouseinfo() {
+      listHouseinfo({
+        pageNum: 1,
+        pageSize: 100000000,
+        ownerId: this.fwxx.jminRow.id
+      }).then(response => {
+        this.fwxx.list = response.rows
+      });
+    },
   }
 };
 </script>

ruoyi-ui/src/views/szxc/ldinfo/index.vue

@@ -310,7 +310,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="选择小区" :visible.sync="xqInfo.visible" width="900px" append-to-body>
+    <el-dialog title="选择小区" :visible.sync="xqInfo.visible" width="1000px" append-to-body>
       <el-form :model="xqInfo.queryParams" ref="queryForm" size="small" :inline="true" label-width="70px">
         <el-form-item label="小区名称" prop="name">
           <el-input
@@ -344,12 +344,11 @@
         <el-table-column label="物业负责人" align="center" prop="wyResponse" />
         <el-table-column label="联系电话" align="center" prop="wyPhone" />
         <el-table-column label="小区地址" align="center" prop="xqAddress" />
-        <el-table-column label="建成日期" align="center" prop="buildDate" width="180">
+        <el-table-column label="建成日期" align="center" prop="buildDate" >
           <template slot-scope="scope">
             <span>{{ parseTime(scope.row.buildDate, '{y}-{m}-{d}') }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="小区描述" align="center" prop="xqDescribe" />
       </el-table>
       <pagination
         v-show="xqInfo.total>0"