Merge branch 'dev-0420' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-0420

src/views/modules/visual/basicinfo/cpts/roomInfo.vue

@@ -12,13 +12,13 @@
           <img src="@/assets/img/shuju/people/close.png" />
         </div>
 
-        <div class="list">
+        <!-- <div class="list">
 
           <div class="item">
             <span class="item-field">所属小区：</span>
             <span>{{ formData.neighborHoodName }}</span>
           </div>
-        </div>
+        </div> -->
         <div class="list">
           <div class="item">
             <span class="item-field">所属楼栋：</span>
@@ -35,7 +35,7 @@
         <div class="list">
           <div class="item">
             <span class="item-field">房屋类型：</span>
-            <span>{{ formData.neighborHoodName }}</span>
+            <span>{{ formData.houseTypeName }}</span>
           </div>
 
         </div>
@@ -43,7 +43,15 @@
 
           <div class="item">
             <span class="item-field">房屋状态：</span>
-            <span>{{ formData. houseName }}</span>
+            <span>{{ formData. rentName }}</span>
+          </div>
+
+        </div>
+        <div class="list">
+
+          <div class="item">
+            <span class="item-field">房屋用途：</span>
+            <span>{{ formData. purposeName }}</span>
           </div>
 
         </div>
@@ -51,19 +59,19 @@
 
           <div class="item">
             <span class="item-field">房主姓名：</span>
-            <span>{{ formData.neighborHoodName }}</span>
+            <span>{{ formData.ownerName?formData.ownerName:'无' }}</span>
           </div>
         </div>
         <div class="list">
           <div class="item">
             <span class="item-field">房主电话：</span>
-            <span>{{  formData.buildingName }}</span>
+            <span>{{  formData.ownerPhone?formData.ownerPhone:'无' }}</span>
           </div>
         </div>
         <div class="list">
           <div class="item">
             <span class="item-field">房主身份证：</span>
-            <span>{{ formData. houseName }}</span>
+            <span>{{ formData. ownerIdCard?formData.ownerIdCard:'无' }}</span>
           </div>
 
         </div>
@@ -75,7 +83,7 @@
 
 <script>
 import cptCard from "@/views/modules/visual/cpts/card";
-import { requestPost } from "@/js/dai/request";
+import { requestGet } from "@/js/dai/request";
 import cptTb from "@/views/modules/visual/cpts/tb";
 
 export default {
@@ -152,9 +160,9 @@ export default {
 
     async loadHouseInfo () {
 
-      const url = "/gov/org/house/gethouseinfo/" + this.selHouseId
+      const url = "/gov/org/ichouse/" + this.selHouseId
 
-      const { data, code, msg } = await requestPost(url)
+      const { data, code, msg } = await requestGet(url)
 
       if (code === 0) {
         this.formData = data