Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
e3b13804 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents f575964f 649cafc2
Inline Side-by-side
Showing 3 changed files with 27 additions and 18 deletions
...@@ -66,6 +66,14 @@ input:disabled{ ...@@ -66,6 +66,14 @@ input:disabled{
66 .formInput:focus{ 66 .formInput:focus{
67 border: 1px solid #A0C5F6!important; 67 border: 1px solid #A0C5F6!important;
68 } 68 }
69
70 .formSelect {
71 top: -1px;
72 width: 100%;
73 .el-input__inner {
74 height: 32px;
75 }
76 }
69 .psr{ 77 .psr{
70 position: relative; 78 position: relative;
71 } 79 }
......
...@@ -47,15 +47,14 @@ ...@@ -47,15 +47,14 @@
47 </el-col> 47 </el-col>
48 <template v-if="hasSyqx"> 48 <template v-if="hasSyqx">
49 <el-col 49 <el-col
50 class="pr10"
51 :span="3" 50 :span="3"
52 :key="childIndex + '7'" 51 :key="childIndex + '7'"
53 :class="childIndex > 0 ? 'childYT' : ''" 52 :class="childIndex > 0 ? 'childYT' : ''"
54 > 53 >
55 <ul> 54 <ul>
56 <li><i class="requisite">*</i>批准用途</li> 55 <li class="pr10"><i class="requisite">*</i>批准用途</li>
57 <li><i class="requisite">*</i>实际用途</li> 56 <li class="pr10"><i class="requisite">*</i>实际用途</li>
58 <li><i class="requisite">*</i>土地使用起始时间</li> 57 <li class="pr10"><i class="requisite">*</i>土地使用起始时间</li>
59 </ul> 58 </ul>
60 </el-col> 59 </el-col>
61 <el-col 60 <el-col
...@@ -113,15 +112,14 @@ ...@@ -113,15 +112,14 @@
113 </ul> 112 </ul>
114 </el-col> 113 </el-col>
115 <el-col 114 <el-col
116 class="pr10"
117 :span="3" 115 :span="3"
118 :key="childIndex + '5'" 116 :key="childIndex + '5'"
119 :class="childIndex > 0 ? 'childYT' : ''" 117 :class="childIndex > 0 ? 'childYT' : ''"
120 > 118 >
121 <ul> 119 <ul>
122 <li>地类编码</li> 120 <li class="pr10">地类编码</li>
123 <li>地类编码</li> 121 <li class="pr10">地类编码</li>
124 <li><i class="requisite">*</i>年限</li> 122 <li class="pr10"><i class="requisite">*</i>年限</li>
125 </ul> 123 </ul>
126 </el-col> 124 </el-col>
127 <el-col 125 <el-col
...@@ -230,15 +228,15 @@ ...@@ -230,15 +228,15 @@
230 </template> 228 </template>
231 <template v-if="!hasSyqx"> 229 <template v-if="!hasSyqx">
232 <el-col 230 <el-col
233 class="pr10" 231
234 :span="5" 232 :span="5"
235 :key="childIndex + '7'" 233 :key="childIndex + '7'"
236 :class="childIndex > 0 ? 'childYT' : ''" 234 :class="childIndex > 0 ? 'childYT' : ''"
237 > 235 >
238 <ul> 236 <ul>
239 <li><i class="requisite">*</i>批准用途</li> 237 <li class="pr10"><i class="requisite">*</i>批准用途</li>
240 <li><i class="requisite">*</i>实际用途</li> 238 <li class="pr10"><i class="requisite">*</i>实际用途</li>
241 <li><i class="requisite">*</i>土地使用起始时间</li> 239 <li class="pr10"><i class="requisite">*</i>土地使用起始时间</li>
242 </ul> 240 </ul>
243 </el-col> 241 </el-col>
244 <el-col 242 <el-col
...@@ -250,6 +248,7 @@ ...@@ -250,6 +248,7 @@
250 <li> 248 <li>
251 <el-select-tree 249 <el-select-tree
252 v-if="show" 250 v-if="show"
251 class="formSelect percent30"
253 :default-expand-all="defaultExpandAll" 252 :default-expand-all="defaultExpandAll"
254 ref="pzytdm" 253 ref="pzytdm"
255 :multiple="multiple" 254 :multiple="multiple"
...@@ -265,6 +264,7 @@ ...@@ -265,6 +264,7 @@
265 <li> 264 <li>
266 <el-select-tree 265 <el-select-tree
267 v-if="show" 266 v-if="show"
267 class="formSelect percent30"
268 :default-expand-all="defaultExpandAll" 268 :default-expand-all="defaultExpandAll"
269 ref="sjytdm" 269 ref="sjytdm"
270 :multiple="multiple" 270 :multiple="multiple"
...@@ -294,15 +294,15 @@ ...@@ -294,15 +294,15 @@
294 </ul> 294 </ul>
295 </el-col> 295 </el-col>
296 <el-col 296 <el-col
297 class="pr10" 297
298 :span="5" 298 :span="5"
299 :key="childIndex + '5'" 299 :key="childIndex + '5'"
300 :class="childIndex > 0 ? 'childYT' : ''" 300 :class="childIndex > 0 ? 'childYT' : ''"
301 > 301 >
302 <ul> 302 <ul>
303 <li>地类编码</li> 303 <li class="pr10">地类编码</li>
304 <li>地类编码</li> 304 <li class="pr10">地类编码</li>
305 <li><i class="requisite">*</i>土地使用结束时间</li> 305 <li class="pr10"><i class="requisite">*</i>土地使用结束时间</li>
306 </ul> 306 </ul>
307 </el-col> 307 </el-col>
308 <el-col 308 <el-col
...@@ -350,6 +350,7 @@ ...@@ -350,6 +350,7 @@
350 <div class="title"> 350 <div class="title">
351 <el-select-tree 351 <el-select-tree
352 v-if="show" 352 v-if="show"
353 class="formSelect"
353 :disabled="formData.qszt!='0'" 354 :disabled="formData.qszt!='0'"
354 :default-expand-all="defaultExpandAll" 355 :default-expand-all="defaultExpandAll"
355 :multiple="multiple" 356 :multiple="multiple"
...@@ -779,7 +780,7 @@ export default { ...@@ -779,7 +780,7 @@ export default {
779 position: relative; 780 position: relative;
780 border-bottom: 1px solid #E6E6E6; 781 border-bottom: 1px solid #E6E6E6;
781 .pr10{ 782 .pr10{
782 padding-right: 10px; 783 padding-right: 10px!important;
783 } 784 }
784 .el-col { 785 .el-col {
785 // height: 100%; 786 // height: 100%;
......
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
136 </tr> 136 </tr>
137 137
138 <tr> 138 <tr>
139 <td colspan="12" align="center"> 139 <td colspan="12" style="padding-right: 0;" align="center">
140 <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz> 140 <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
141 </td> 141 </td>
142 </tr> 142 </tr>
......