c646aad6 by renchao@pashanhoo.com

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

2 parents 095b486c 94ef8a68
...@@ -9,17 +9,14 @@ ...@@ -9,17 +9,14 @@
9 <el-form 9 <el-form
10 :model="ruleForm" 10 :model="ruleForm"
11 :rules="rules" 11 :rules="rules"
12 :class="{ readonly: editDisabled }" 12 v-Loading="loading"
13 class="loadingtext"
14 ref="ruleForm" 13 ref="ruleForm"
15 :label-position="flag ? 'top' : ''" 14 :label-position="flag ? 'top' : ''"
16 :inline="flag" 15 :inline="flag"
17 label-width="145px" 16 label-width="190px">
18 inline-message
19 :show-message="false">
20 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''"> 17 <div class="slxx_con" v-if="isShow" :class="flag ? 'formMarginBot0' : ''">
21 <div class="slxx_title title-block"> 18 <div class="slxx_title title-block">
22 补录信息 19 申请业务信息
23 <div class="triangle"></div> 20 <div class="triangle"></div>
24 </div> 21 </div>
25 <el-row :gutter="10"> 22 <el-row :gutter="10">
......
...@@ -46,6 +46,14 @@ export function getForm(tabName) { ...@@ -46,6 +46,14 @@ export function getForm(tabName) {
46 case "yydj": 46 case "yydj":
47 form = require("@/views/registerBook/yydj.vue"); 47 form = require("@/views/registerBook/yydj.vue");
48 break; 48 break;
49 //林地使用权
50 case "slxxlq":
51 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/lq.vue");
52 break;
53 //森林林木使用权
54 case "sllmslxx":
55 form = require("@/views/ywbl/slsqxx/sllmslxx");
56 break;
49 case "slxxjsydsyq": 57 case "slxxjsydsyq":
50 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue"); 58 form = require("@/views/djbworkflow/djbBook/components/blxxtabs/jsydsyq.vue");
51 break; 59 break;
......