e3b13804 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents f575964f 649cafc2
......@@ -66,6 +66,14 @@ input:disabled{
.formInput:focus{
border: 1px solid #A0C5F6!important;
}
.formSelect {
top: -1px;
width: 100%;
.el-input__inner {
height: 32px;
}
}
.psr{
position: relative;
}
......
......@@ -47,15 +47,14 @@
</el-col>
<template v-if="hasSyqx">
<el-col
class="pr10"
:span="3"
:key="childIndex + '7'"
:class="childIndex > 0 ? 'childYT' : ''"
>
<ul>
<li><i class="requisite">*</i>批准用途</li>
<li><i class="requisite">*</i>实际用途</li>
<li><i class="requisite">*</i>土地使用起始时间</li>
<li class="pr10"><i class="requisite">*</i>批准用途</li>
<li class="pr10"><i class="requisite">*</i>实际用途</li>
<li class="pr10"><i class="requisite">*</i>土地使用起始时间</li>
</ul>
</el-col>
<el-col
......@@ -113,15 +112,14 @@
</ul>
</el-col>
<el-col
class="pr10"
:span="3"
:key="childIndex + '5'"
:class="childIndex > 0 ? 'childYT' : ''"
>
<ul>
<li>地类编码</li>
<li>地类编码</li>
<li><i class="requisite">*</i>年限</li>
<li class="pr10">地类编码</li>
<li class="pr10">地类编码</li>
<li class="pr10"><i class="requisite">*</i>年限</li>
</ul>
</el-col>
<el-col
......@@ -230,15 +228,15 @@
</template>
<template v-if="!hasSyqx">
<el-col
class="pr10"
:span="5"
:key="childIndex + '7'"
:class="childIndex > 0 ? 'childYT' : ''"
>
<ul>
<li><i class="requisite">*</i>批准用途</li>
<li><i class="requisite">*</i>实际用途</li>
<li><i class="requisite">*</i>土地使用起始时间</li>
<li class="pr10"><i class="requisite">*</i>批准用途</li>
<li class="pr10"><i class="requisite">*</i>实际用途</li>
<li class="pr10"><i class="requisite">*</i>土地使用起始时间</li>
</ul>
</el-col>
<el-col
......@@ -250,6 +248,7 @@
<li>
<el-select-tree
v-if="show"
class="formSelect percent30"
:default-expand-all="defaultExpandAll"
ref="pzytdm"
:multiple="multiple"
......@@ -265,6 +264,7 @@
<li>
<el-select-tree
v-if="show"
class="formSelect percent30"
:default-expand-all="defaultExpandAll"
ref="sjytdm"
:multiple="multiple"
......@@ -294,15 +294,15 @@
</ul>
</el-col>
<el-col
class="pr10"
:span="5"
:key="childIndex + '5'"
:class="childIndex > 0 ? 'childYT' : ''"
>
<ul>
<li>地类编码</li>
<li>地类编码</li>
<li><i class="requisite">*</i>土地使用结束时间</li>
<li class="pr10">地类编码</li>
<li class="pr10">地类编码</li>
<li class="pr10"><i class="requisite">*</i>土地使用结束时间</li>
</ul>
</el-col>
<el-col
......@@ -350,6 +350,7 @@
<div class="title">
<el-select-tree
v-if="show"
class="formSelect"
:disabled="formData.qszt!='0'"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -779,7 +780,7 @@ export default {
position: relative;
border-bottom: 1px solid #E6E6E6;
.pr10{
padding-right: 10px;
padding-right: 10px!important;
}
.el-col {
// height: 100%;
......
......@@ -136,7 +136,7 @@
</tr>
<tr>
<td colspan="12" align="center">
<td colspan="12" style="padding-right: 0;" align="center">
<Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
</td>
</tr>
......