Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web

@@ -9,18 +9,12 @@
         <col width="150" />
         <col width="150" />
         <tr>
         <tr>
           <td colspan="6" class="title">宗地基本信息</td>
           <td colspan="6" class="title">宗地基本信息</td>
-        </tr>
-        <tr>
-          <td colspan="6" class="unit" v-if="zdjbxx.mjdw == '1'">
-            单位：■平方米 □公顷（□亩）、万元
-          </td>
-          <td colspan="6" class="unit" v-else>
-            单位：□平方米 ■公顷（■亩）、万元
-          </td>
-        </tr>
+        </tr>       
         <tr>
         <tr>
-          <td colspan="2">不动产类型</td>
-          <td colspan="4">■土地 ■房屋建筑 □构筑物 □森林、林地 □其他</td>
+          <td colspan="2">不动产类型：</td>
+          <td colspan="2">{{ zdjbxx.bdclx }}</td>
+          <td>单位：</td>
+          <td>{{ zdjbxx.mjdw }}</td>
         </tr>
         </tr>
         <tr>
         <tr>
           <td colspan="2">坐落</td>
           <td colspan="2">坐落</td>
@@ -37,15 +31,15 @@
         </tr>
         </tr>
         <tr>
         <tr>
           <td colspan="2">等级</td>
           <td colspan="2">等级</td>
-          <td>{{ zdjbxx.dj }}</td>
+          <td>{{ zdjbxx.djmc }}</td>
           <td>价格</td>
           <td>价格</td>
           <td>{{ zdjbxx.jg }}</td>
           <td>{{ zdjbxx.jg }}</td>
         </tr>
         </tr>
         <tr>
         <tr>
           <td colspan="2">权利类型</td>
           <td colspan="2">权利类型</td>
-          <td>{{ zdjbxx.qllx }}</td>
+          <td>{{ zdjbxx.qllxmc }}</td>
           <td>权利性质</td>
           <td>权利性质</td>
-          <td>{{ zdjbxx.qlxz }}</td>
+          <td>{{ zdjbxx.qlxzmc }}</td>
         </tr>
         </tr>
         <tr>
         <tr>
           <td colspan="2">权利设定方式</td>
           <td colspan="2">权利设定方式</td>
@@ -125,7 +119,7 @@
 import { getZdjjxxBybdcdyid } from "@/api/registerBook.js";
 import { getZdjjxxBybdcdyid } from "@/api/registerBook.js";
 
 
 export default {
 export default {
-  data () {
+  data() {
     return {
     return {
       bhqkColumns: [
       bhqkColumns: [
         {
         {
@@ -164,16 +158,16 @@ export default {
       bhqkTableWidth: 745,
       bhqkTableWidth: 745,
       zdjbxx: {},
       zdjbxx: {},
       zdbhqks: [],
       zdbhqks: [],
-      propsParam:this.$attrs,
+      propsParam: this.$attrs,
       showGroup: false,
       showGroup: false,
     };
     };
   },
   },
-  created () {
+  created() {
     this.loadData();
     this.loadData();
   },
   },
   methods: {
   methods: {
-    loadData () {
-      getZdjjxxBybdcdyid({bdcdyid:this.propsParam.bdcdyid}).then((res) => {
+    loadData() {
+      getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
         if (res.code === 200) {
         if (res.code === 200) {
           this.zdjbxx = res.result.zdjbxx;
           this.zdjbxx = res.result.zdjbxx;
           this.zdbhqks = res.result.zdbhqkList;
           this.zdbhqks = res.result.zdbhqkList;
@@ -190,71 +184,69 @@ export default {
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 .zdxx {
 .zdxx {
   width: 100%;
   width: 100%;
-  height: calc(100% - 42px);
+  height: 100%;
   background-color: #f5f5f5;
   background-color: #f5f5f5;
   padding: 5px;
   padding: 5px;
-
- 
 }
 }
- .tablebox {
-    overflow-x: auto;
+.tablebox {
+  overflow-x: auto;
+  width: 100%;
+  height: 100%;
+  background: #fff;
+  border: 1px solid rgb(228, 228, 228);
+  text-align: center;
+  padding: 4px;
+  overflow-y: scroll;
+
+  .zdxxTable {
     width: 100%;
     width: 100%;
-    height: 100%;
-    background: #fff;
-    border: 1px solid rgb(228, 228, 228);
-    text-align: center;
-    padding: 4px;
-    overflow-y: scroll;
+    color: #333;
 
 
-    .zdxxTable {
-      width: 100%;
-      min-width: 900px;
-      color: #333;
+    td {
+      border: 1px solid rgb(228, 228, 228);
+      line-height: 30px;
+      padding: 0 4px;
+    }
 
 
-      td {
-        border: 1px solid rgb(228, 228, 228);
-        line-height: 30px;
-        padding: 0 4px;
-      }
+    .title {
+      line-height: 68px;
+      font-size: 20px;
+    }
 
 
-      .title {
-        line-height: 68px;
-        font-size: 20px;
-      }
+    .unit {
+      text-align: right;
+    }
 
 
-      .unit {
-        text-align: right;
-      }
+    .title2 {
+      writing-mode: vertical-lr;
+      letter-spacing: 6px;
+    }
+
+    .bhqk {
+      padding: 0;
 
 
-      .title2 {
-        writing-mode: vertical-lr;
-        letter-spacing: 6px;
+      .box {
+        width: 745px;
+        overflow: auto;
       }
       }
 
 
-      .bhqk {
-        padding: 0;
+      .test {
+      }
 
 
-        .box {
-          width: 745px;
-          overflow: auto;
+      table {
+        .bhqkTh {
+          width: 110px;
+          line-height: 40px;
+          background-color: #f5f5f5;
+          border: 1px solid rgb(228, 228, 228);
+          font-weight: bold;
         }
         }
 
 
-        .test {}
-
-        table {
-          .bhqkTh {
-            width: 110px;
-            line-height: 40px;
-            background-color: #f5f5f5;
-            border: 1px solid rgb(228, 228, 228);
-            font-weight: bold;
-          }
-
-          td {
-            width: 180px;
-          }
+        td {
+          width: 180px;
         }
         }
       }
       }
     }
     }
   }
   }
+}
 </style>
 </style>

@@ -25,8 +25,10 @@
           <div class="title">申请单元列表({{ unitData.length }})</div>
           <div class="title">申请单元列表({{ unitData.length }})</div>
           <el-menu :default-active="activeIndex" @select="unitClick">
           <el-menu :default-active="activeIndex" @select="unitClick">
             <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index">
             <el-menu-item v-for="(item, index) in unitData" :index="index.toString()" :key="index">
-              <p>{{ item.bdcdyh }}</p>
-              <p class="title-detail">{{ item.zl }}</p>
+              <div>
+                <p>{{ item.bdcdyh }}</p>
+                <p class="title-detail">{{ item.zl }}</p>
+              </div>
             </el-menu-item>
             </el-menu-item>
           </el-menu>
           </el-menu>
         </div>
         </div>

@@ -116,7 +116,7 @@ export default {
           editItem: 'registerBook/djbFrame', // 弹窗内容   
           editItem: 'registerBook/djbFrame', // 弹窗内容   
           formData: scroll,    
           formData: scroll,    
           width:"1220px",
           width:"1220px",
-          height:"835px",
+          height:"790px",
           // cancelText: '取消摆烂', // 右边按钮文本 
           // cancelText: '取消摆烂', // 右边按钮文本 
           // confirmText: '确定点击', //左边按钮文本
           // confirmText: '确定点击', //左边按钮文本
           cancel: () => {
           cancel: () => {