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

@@ -11,16 +11,10 @@
           <td colspan="6" class="title">宗地基本信息</td>
           <td colspan="6" class="title">宗地基本信息</td>
         </tr>       
         </tr>       
         <tr>
         <tr>
-          <td colspan="6" class="unit" v-if="zdjbxx.mjdw == '1'">
-            单位：■平方米 □公顷（□亩）、万元
-          </td>
-          <td colspan="6" class="unit" v-else>
-            单位：□平方米 ■公顷（■亩）、万元
-          </td>
-        </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,13 +184,11 @@ 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 {
+.tablebox {
   overflow-x: auto;
   overflow-x: auto;
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
@@ -208,7 +200,6 @@ export default {
 
 
   .zdxxTable {
   .zdxxTable {
     width: 100%;
     width: 100%;
-      min-width: 900px;
     color: #333;
     color: #333;
 
 
     td {
     td {
@@ -239,7 +230,8 @@ export default {
         overflow: auto;
         overflow: auto;
       }
       }
 
 
-        .test {}
+      .test {
+      }
 
 
       table {
       table {
         .bhqkTh {
         .bhqkTh {
@@ -256,5 +248,5 @@ export default {
       }
       }
     }
     }
   }
   }
-  }
+}
 </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">
+              <div>
                 <p>{{ item.bdcdyh }}</p>
                 <p>{{ item.bdcdyh }}</p>
                 <p class="title-detail">{{ item.zl }}</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: () => {