aa222339 by renchao@pashanhoo.com

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

2 parents 61c74f6e 4fc22d83
...@@ -1336,7 +1336,7 @@ class data extends filter { ...@@ -1336,7 +1336,7 @@ class data extends filter {
1336 label: "森林类别", 1336 label: "森林类别",
1337 }, 1337 },
1338 { 1338 {
1339 prop: "zylz", 1339 prop: "zysz",
1340 label: "主要树种", 1340 label: "主要树种",
1341 }, 1341 },
1342 { 1342 {
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-08-30 15:53:18 4 * @LastEditTime: 2023-09-01 09:22:02
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 ref="ruleForm" 12 ref="ruleForm"
13 :label-position="flag ? 'top' : ''" 13 :label-position="flag ? 'top' : ''"
14 :inline="flag" 14 :inline="flag"
15 label-width="140px"> 15 label-width="190px">
16 <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''"> 16 <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
17 <div class="slxx_title title-block"> 17 <div class="slxx_title title-block">
18 申请业务信息 18 申请业务信息
...@@ -168,7 +168,31 @@ ...@@ -168,7 +168,31 @@
168 <el-input v-model="ruleForm.lq.xdm"></el-input> 168 <el-input v-model="ruleForm.lq.xdm"></el-input>
169 </el-form-item> 169 </el-form-item>
170 </el-col> 170 </el-col>
171 <el-col :span="16"> 171 <el-col :span="8">
172 <el-form-item label="林地使用(承包)起始时间:">
173 <el-input v-model="ruleForm.lq.ldsyqssj"></el-input>
174 </el-form-item>
175 </el-col>
176 <el-col :span="8">
177 <el-form-item label="林地使用(承包)结束时间:">
178 <el-input v-model="ruleForm.lq.ldsyjssj"></el-input>
179 </el-form-item>
180 </el-col>
181 </el-row>
182 <el-row :gutter="10">
183 <!-- <el-col :span="8">
184 <el-form-item label="土地用途:">
185 <el-input v-model="ruleForm.lq.xdm"></el-input>
186 </el-form-item>
187 </el-col> -->
188 <el-col :span="8">
189 <el-form-item label="林地使用 (承包)期限:">
190 <el-input v-model="ruleForm.lq.ldsyqx"></el-input>
191 </el-form-item>
192 </el-col>
193 </el-row>
194 <el-row :gutter="10">
195 <el-col :span="24">
172 <el-form-item label="附记:"> 196 <el-form-item label="附记:">
173 <el-input 197 <el-input
174 v-model="ruleForm.lq.fj" 198 v-model="ruleForm.lq.fj"
...@@ -178,14 +202,14 @@ ...@@ -178,14 +202,14 @@
178 </el-form-item> 202 </el-form-item>
179 </el-col> 203 </el-col>
180 </el-row> 204 </el-row>
181 <div class="slxx_title title-block"> 205 <!-- <div class="slxx_title title-block">
182 土地用途 206 土地用途
183 <div class="triangle"></div> 207 <div class="triangle"></div>
184 </div> 208 </div>
185 <tdytTable 209 <tdytTable
186 :ableOperation="viewEdit" 210 :ableOperation="viewEdit"
187 :tableData="ruleForm.tdytqxList" 211 :tableData="ruleForm.tdytqxList"
188 @upDateTdytxxList="upDateTdytxxList" /> 212 @upDateTdytxxList="upDateTdytxxList" /> -->
189 <div class="slxx_title title-block"> 213 <div class="slxx_title title-block">
190 权利人信息 214 权利人信息
191 <div class="triangle"></div> 215 <div class="triangle"></div>
...@@ -238,7 +262,7 @@ ...@@ -238,7 +262,7 @@
238 :disabled="viewEdit" 262 :disabled="viewEdit"
239 :gyfs="ruleForm.sldy.gyfs" /> 263 :gyfs="ruleForm.sldy.gyfs" />
240 264
241 <div v-if="ruleForm.ywrList && ruleForm.slsq.djlx == '200'"> 265 <div v-if="ruleForm.ywrList && ruleForm.sldy.djlx == '200'">
242 <div class="slxx_title title-block"> 266 <div class="slxx_title title-block">
243 义务人信息 267 义务人信息
244 <div class="triangle"></div> 268 <div class="triangle"></div>
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-08-30 14:57:59 4 * @LastEditTime: 2023-09-01 09:52:40
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 ref="ruleForm" 11 ref="ruleForm"
12 :label-position="flag ? 'top' : ''" 12 :label-position="flag ? 'top' : ''"
13 :inline="flag" 13 :inline="flag"
14 label-width="140px"> 14 label-width="190px">
15 <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''"> 15 <div class="slxx_con" :class="flag ? 'formMarginBot0' : ''">
16 <div class="slxx_title title-block"> 16 <div class="slxx_title title-block">
17 申请业务信息 17 申请业务信息
...@@ -167,7 +167,31 @@ ...@@ -167,7 +167,31 @@
167 <el-input v-model="ruleForm.lq.xdm"></el-input> 167 <el-input v-model="ruleForm.lq.xdm"></el-input>
168 </el-form-item> 168 </el-form-item>
169 </el-col> 169 </el-col>
170 <el-col :span="16"> 170 <el-col :span="8">
171 <el-form-item label="林地使用(承包)起始时间:">
172 <el-input v-model="ruleForm.lq.ldsyqssj"></el-input>
173 </el-form-item>
174 </el-col>
175 <el-col :span="8">
176 <el-form-item label="林地使用(承包)结束时间:">
177 <el-input v-model="ruleForm.lq.ldsyjssj"></el-input>
178 </el-form-item>
179 </el-col>
180 </el-row>
181 <el-row :gutter="10">
182 <!-- <el-col :span="8">
183 <el-form-item label="土地用途:">
184 <el-input v-model="ruleForm.lq.xdm"></el-input>
185 </el-form-item>
186 </el-col> -->
187 <el-col :span="8">
188 <el-form-item label="林地使用 (承包)期限:">
189 <el-input v-model="ruleForm.lq.ldsyqx"></el-input>
190 </el-form-item>
191 </el-col>
192 </el-row>
193 <el-row :gutter="10">
194 <el-col :span="24">
171 <el-form-item label="附记:"> 195 <el-form-item label="附记:">
172 <el-input 196 <el-input
173 v-model="ruleForm.lq.fj" 197 v-model="ruleForm.lq.fj"
...@@ -177,14 +201,14 @@ ...@@ -177,14 +201,14 @@
177 </el-form-item> 201 </el-form-item>
178 </el-col> 202 </el-col>
179 </el-row> 203 </el-row>
180 <div class="slxx_title title-block"> 204 <!-- <div class="slxx_title title-block">
181 土地用途 205 土地用途
182 <div class="triangle"></div> 206 <div class="triangle"></div>
183 </div> 207 </div> -->
184 <tdytTable 208 <!-- <tdytTable
185 :ableOperation="viewEdit" 209 :ableOperation="viewEdit"
186 :tableData="ruleForm.tdytqxList" 210 :tableData="ruleForm.tdytqxList"
187 @upDateTdytxxList="upDateTdytxxList" /> 211 @upDateTdytxxList="upDateTdytxxList" /> -->
188 <div class="slxx_title title-block"> 212 <div class="slxx_title title-block">
189 权利人信息 213 权利人信息
190 <div class="triangle"></div> 214 <div class="triangle"></div>
...@@ -237,7 +261,7 @@ ...@@ -237,7 +261,7 @@
237 :disabled="viewEdit" 261 :disabled="viewEdit"
238 :gyfs="ruleForm.sldy.gyfs" /> 262 :gyfs="ruleForm.sldy.gyfs" />
239 263
240 <div v-if="ruleForm.ywrList && ruleForm.slsq.djlx == '200'"> 264 <div v-if="ruleForm.ywrList && ruleForm.sldy.djlx == '200'">
241 <div class="slxx_title title-block"> 265 <div class="slxx_title title-block">
242 义务人信息 266 义务人信息
243 <div class="triangle"></div> 267 <div class="triangle"></div>
......