1938c0ce by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents d5567c13 f8e3b5fb
...@@ -73,12 +73,12 @@ ...@@ -73,12 +73,12 @@
73 <el-form :model="formData" class="qlrForm"> 73 <el-form :model="formData" class="qlrForm">
74 <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1"> 74 <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
75 <tr> 75 <tr>
76 <td colspan="2" class="tdright"><i class="requisite">*</i>权利人名称</td> 76 <td colspan="4" class="tdright"><i class="requisite">*</i>权利人名称</td>
77 <td colspan="3"> 77 <td colspan="6">
78 <input type="text" class="formInput" v-model="formData.qlrmc" /> 78 <input type="text" class="formInput" v-model="formData.qlrmc" />
79 </td> 79 </td>
80 <td colspan="2" class="tdright"><i class="requisite">*</i>权利人类型</td> 80 <td colspan="4" class="tdright"><i class="requisite">*</i>权利人类型</td>
81 <td colspan="3"> 81 <td colspan="6">
82 <el-select class="formSelect" v-model="formData.qlrlxbsm"> 82 <el-select class="formSelect" v-model="formData.qlrlxbsm">
83 <el-option 83 <el-option
84 v-for="item in $store.state.qlrlxList" 84 v-for="item in $store.state.qlrlxList"
...@@ -91,8 +91,8 @@ ...@@ -91,8 +91,8 @@
91 </td> 91 </td>
92 </tr> 92 </tr>
93 <tr> 93 <tr>
94 <td colspan="2" class="tdright"><i class="requisite">*</i>证件类型</td> 94 <td colspan="4" class="tdright"><i class="requisite">*</i>证件类型</td>
95 <td colspan="3"> 95 <td colspan="6">
96 <el-select class="formSelect" v-model="formData.zjzlbsm"> 96 <el-select class="formSelect" v-model="formData.zjzlbsm">
97 <el-option 97 <el-option
98 v-for="item in $store.state.zjzlList" 98 v-for="item in $store.state.zjzlList"
...@@ -103,25 +103,25 @@ ...@@ -103,25 +103,25 @@
103 </el-option> 103 </el-option>
104 </el-select> 104 </el-select>
105 </td> 105 </td>
106 <td colspan="2" class="tdright"><i class="requisite">*</i>证件号</td> 106 <td colspan="4" class="tdright"><i class="requisite">*</i>证件号</td>
107 <td colspan="3"> 107 <td colspan="6">
108 <input type="text" class="formInput" maxlength="18" v-model="formData.zjh" /> 108 <input type="text" class="formInput" maxlength="18" v-model="formData.zjh" />
109 </td> 109 </td>
110 </tr> 110 </tr>
111 <tr> 111 <tr>
112 <td colspan="2" class="tdright"><i class="requisite">*</i>电话</td> 112 <td colspan="4" class="tdright"><i class="requisite">*</i>电话</td>
113 <td colspan="3"> 113 <td colspan="6">
114 <!-- @blur="inputBlur($event)"--> 114 <!-- @blur="inputBlur($event)"-->
115 <input type="text" class="formInput" v-model="formData.dh" /> 115 <input type="text" class="formInput" v-model="formData.dh" />
116 </td> 116 </td>
117 <td colspan="2" class="tdright"><i class="requisite">*</i>地址</td> 117 <td colspan="4" class="tdright"><i class="requisite">*</i>地址</td>
118 <td colspan="3"> 118 <td colspan="6">
119 <input type="text" class="formInput" v-model="formData.dz" /> 119 <input type="text" class="formInput" v-model="formData.dz" />
120 </td> 120 </td>
121 </tr> 121 </tr>
122 <tr> 122 <tr>
123 <td colspan="2" class="tdright">国家</td> 123 <td colspan="4" class="tdright">国家</td>
124 <td colspan="3"> 124 <td colspan="6">
125 <el-select class="formSelect" v-model="formData.gjbsm"> 125 <el-select class="formSelect" v-model="formData.gjbsm">
126 <el-option 126 <el-option
127 v-for="item in $store.state.gjList" 127 v-for="item in $store.state.gjList"
...@@ -132,8 +132,8 @@ ...@@ -132,8 +132,8 @@
132 </el-option> 132 </el-option>
133 </el-select> 133 </el-select>
134 </td> 134 </td>
135 <td colspan="2" class="tdright">户籍所在省市</td> 135 <td colspan="4" class="tdright">户籍所在省市</td>
136 <td colspan="3"> 136 <td colspan="6">
137 <el-select class="formSelect" v-model="formData.hjszssbsm"> 137 <el-select class="formSelect" v-model="formData.hjszssbsm">
138 <el-option 138 <el-option
139 v-for="item in $store.state.ssList" 139 v-for="item in $store.state.ssList"
...@@ -146,8 +146,8 @@ ...@@ -146,8 +146,8 @@
146 </td> 146 </td>
147 </tr> 147 </tr>
148 <tr> 148 <tr>
149 <td colspan="2" class="tdright">性别</td> 149 <td colspan="4" class="tdright">性别</td>
150 <td colspan="3"> 150 <td colspan="6">
151 <el-select class="formSelect" v-model="formData.xbbsm"> 151 <el-select class="formSelect" v-model="formData.xbbsm">
152 <el-option 152 <el-option
153 v-for="item in $store.state.xbList" 153 v-for="item in $store.state.xbList"
...@@ -158,14 +158,14 @@ ...@@ -158,14 +158,14 @@
158 </el-option> 158 </el-option>
159 </el-select> 159 </el-select>
160 </td> 160 </td>
161 <td colspan="2" class="tdright">邮编</td> 161 <td colspan="4" class="tdright">邮编</td>
162 <td colspan="3"> 162 <td colspan="6">
163 <input type="text" class="formInput" v-model="formData.yb" /> 163 <input type="text" class="formInput" v-model="formData.yb" />
164 </td> 164 </td>
165 </tr> 165 </tr>
166 <tr> 166 <tr>
167 <td colspan="2" class="tdright">所属行业</td> 167 <td colspan="4" class="tdright">所属行业</td>
168 <td colspan="3"> 168 <td colspan="6">
169 <el-select class="formSelect" v-model="formData.sshy"> 169 <el-select class="formSelect" v-model="formData.sshy">
170 <el-option 170 <el-option
171 v-for="item in $store.state.sshyList" 171 v-for="item in $store.state.sshyList"
...@@ -176,25 +176,25 @@ ...@@ -176,25 +176,25 @@
176 </el-option> 176 </el-option>
177 </el-select> 177 </el-select>
178 </td> 178 </td>
179 <td colspan="2" class="tdright">电子邮件</td> 179 <td colspan="4" class="tdright">电子邮件</td>
180 <td colspan="3"> 180 <td colspan="6">
181 <input type="text" class="formInput" v-model="formData.dzyj" /> 181 <input type="text" class="formInput" v-model="formData.dzyj" />
182 </td> 182 </td>
183 </tr> 183 </tr>
184 <tr> 184 <tr>
185 <th colspan="10">法人信息</th> 185 <th colspan="20">法人信息</th>
186 </tr> 186 </tr>
187 <tr> 187 <tr>
188 <td colspan="2" class="tdright">法定代表人或负责人姓名</td> 188 <td colspan="4" class="tdright">法定代表人或负责人姓名</td>
189 <td colspan="3"> 189 <td colspan="6">
190 <input 190 <input
191 type="text" 191 type="text"
192 class="formInput" 192 class="formInput"
193 v-model="formData.fr.dlrfrmc" 193 v-model="formData.fr.dlrfrmc"
194 /> 194 />
195 </td> 195 </td>
196 <td colspan="2" class="tdright">证件类型</td> 196 <td colspan="4" class="tdright">证件类型</td>
197 <td colspan="3"> 197 <td colspan="6">
198 <el-select class="formSelect" v-model="formData.fr.zjzlbsm"> 198 <el-select class="formSelect" v-model="formData.fr.zjzlbsm">
199 <el-option 199 <el-option
200 v-for="item in $store.state.zjzlList" 200 v-for="item in $store.state.zjzlList"
...@@ -207,40 +207,37 @@ ...@@ -207,40 +207,37 @@
207 </td> 207 </td>
208 </tr> 208 </tr>
209 <tr> 209 <tr>
210 <td colspan="2" class="tdright">证件号码</td> 210 <td colspan="4" class="tdright">证件号码</td>
211 <td colspan="3"> 211 <td colspan="6">
212 <input type="text" class="formInput" v-model="formData.fr.zjh" /> 212 <input type="text" class="formInput" v-model="formData.fr.zjh" />
213 </td> 213 </td>
214 <td colspan="2" class="tdright">电话</td> 214 <td colspan="4" class="tdright">电话</td>
215 <td colspan="3"> 215 <td colspan="6">
216 <input type="text" class="formInput" v-model="formData.fr.dh" /> 216 <input type="text" class="formInput" v-model="formData.fr.dh" />
217 </td> 217 </td>
218 </tr> 218 </tr>
219 <tr> 219 <tr>
220 <th colspan="10">代理人信息</th> 220 <th colspan="20">代理人信息</th>
221 </tr> 221 </tr>
222 <template v-for="(item, index) in formData.dlrList"> 222 <template v-for="(item, index) in formData.dlrList">
223 <tr :key="item.index"> 223 <tr :key="item.index">
224 <td rowspan="2" class="btnCol"> 224 <td :rowspan="(formData.dlrList.length-1)*2+2" v-if="index == 0" class="btnCol">
225 <el-button 225 <span :style="{'padding-top':(formData.dlrList.length-1)*36 + 20 + 'px'}">
226 type="primary" 226 <i v-show=" index == 0" class="iconfont iconicon-test2" @click="handleClick(item, index, 'add')"></i>
227 class="changeBtn inAdd addMinus" 227 </span>
228 @click="handleClick(item, index, 'add')" 228 <!-- <div class="line" v-show=" index != formData.dlrList.length-1"></div> -->
229 >+</el-button 229 </td>
230 > 230 <td rowspan="2" class="minusBtnCol">
231 <el-button 231 <span>
232 type="primary" 232 <i class="iconfont icon-" @click="handleClick(item, index, 'minus')"></i>
233 class="changeBtn inMinus addMinus" 233 </span>
234 @click="handleClick(item, index, 'minus')"
235 >-</el-button
236 >
237 </td> 234 </td>
238 <td class="tdright">代理人姓名</td> 235 <td class="tdright" colspan="2">代理人姓名</td>
239 <td colspan="3"> 236 <td colspan="6">
240 <input type="text" class="formInput" v-model="item.dlrfrmc" /> 237 <input type="text" class="formInput" v-model="item.dlrfrmc" />
241 </td> 238 </td>
242 <td colspan="2" class="tdright">证件类型</td> 239 <td colspan="4" class="tdright">证件类型</td>
243 <td colspan="3"> 240 <td colspan="6">
244 <el-select class="formSelect" v-model="item.zjzlbsm"> 241 <el-select class="formSelect" v-model="item.zjzlbsm">
245 <el-option 242 <el-option
246 v-for="item in $store.state.zjzlList" 243 v-for="item in $store.state.zjzlList"
...@@ -254,23 +251,23 @@ ...@@ -254,23 +251,23 @@
254 </tr> 251 </tr>
255 <!-- <tr :key="item.dh">--> 252 <!-- <tr :key="item.dh">-->
256 <tr :key="'dh'+index"> 253 <tr :key="'dh'+index">
257 <td class="tdright">证件号码</td> 254 <td class="tdright" colspan="2">证件号码</td>
258 <td colspan="3"> 255 <td colspan="6">
259 <input type="text" class="formInput" v-model="item.zjh" /> 256 <input type="text" class="formInput" v-model="item.zjh" />
260 </td> 257 </td>
261 <td colspan="2" class="tdright">电话</td> 258 <td colspan="4" class="tdright">电话</td>
262 <td colspan="3"> 259 <td colspan="6">
263 <input type="text" class="formInput" v-model="item.dh" /> 260 <input type="text" class="formInput" v-model="item.dh" />
264 </td> 261 </td>
265 </tr> 262 </tr>
266 </template> 263 </template>
267 264
268 <tr> 265 <tr>
269 <th colspan="10">权利信息</th> 266 <th colspan="20">权利信息</th>
270 </tr> 267 </tr>
271 <tr> 268 <tr>
272 <td colspan="2" class="tdright">共有方式</td> 269 <td colspan="4" class="tdright">共有方式</td>
273 <td colspan="3"> 270 <td colspan="6">
274 <el-select class="formSelect" v-model="formData.gyfsbsm"> 271 <el-select class="formSelect" v-model="formData.gyfsbsm">
275 <el-option 272 <el-option
276 v-for="item in $store.state.gyfsList" 273 v-for="item in $store.state.gyfsList"
...@@ -281,23 +278,23 @@ ...@@ -281,23 +278,23 @@
281 </el-option> 278 </el-option>
282 </el-select> 279 </el-select>
283 </td> 280 </td>
284 <td colspan="2" class="tdright">权利比例(%)</td> 281 <td colspan="4" class="tdright">权利比例(%)</td>
285 <td colspan="3"> 282 <td colspan="6">
286 <input type="text" class="formInput" v-model="formData.qlbl" /> 283 <input type="text" class="formInput" v-model="formData.qlbl" />
287 </td> 284 </td>
288 </tr> 285 </tr>
289 <tr> 286 <tr>
290 <td colspan="2" class="tdright">房产证号</td> 287 <td colspan="4" class="tdright">房产证号</td>
291 <td colspan="3"> 288 <td colspan="6">
292 <input type="text" class="formInput" v-model="formData.fczh" /> 289 <input type="text" class="formInput" v-model="formData.fczh" />
293 </td> 290 </td>
294 <td colspan="2" class="tdright">土地证号</td> 291 <td colspan="4" class="tdright">土地证号</td>
295 <td colspan="3"> 292 <td colspan="6">
296 <input type="text" class="formInput" v-model="formData.tdzh" /> 293 <input type="text" class="formInput" v-model="formData.tdzh" />
297 </td> 294 </td>
298 </tr> 295 </tr>
299 <tr> 296 <tr>
300 <td colspan="2" class="tdright">共有情况</td> 297 <td colspan="4" class="tdright">共有情况</td>
301 <td colspan="8"> 298 <td colspan="8">
302 <input type="text" class="formInput" v-model="formData.gyqk" /> 299 <input type="text" class="formInput" v-model="formData.gyqk" />
303 </td> 300 </td>
...@@ -741,23 +738,33 @@ ...@@ -741,23 +738,33 @@
741 width: 100%; 738 width: 100%;
742 border-bottom: 1px solid #000; 739 border-bottom: 1px solid #000;
743 740
744 .btnCol { 741 .btnCol,.minusBtnCol {
745 position: relative; 742 position: relative;
746 width: 60px; 743 padding-right: 0;
747 .changeBtn { 744 span{
748 width: 30px; 745 display: inline-block;
749 height: 30px; 746 width: 100%;
750 font-size: 25px; 747 height: 100%;
751 padding: 0px 0px; 748 position: relative;
752 position: absolute; 749 box-sizing: border-box;
753 top: 50%; 750 padding-right: 10px;
754 left: 50%; 751 padding-top: 20px;
755 margin-top: -32px; 752 }
756 margin-left: -15px; 753 .line{
757 } 754 width: 100%;
758 .el-button + .el-button { 755 height: 2px;
759 margin-left: -15px; 756 background: #fff;
760 margin-top: 2px; 757 }
758 i{
759 color: #66b1ff;
760 font-size: 36px;
761 cursor: pointer;
762 z-index: 1;
763 }
764 }
765 .minusBtnCol{
766 i{
767 color: #FA6400;
761 } 768 }
762 } 769 }
763 th { 770 th {
......
...@@ -435,7 +435,7 @@ export default { ...@@ -435,7 +435,7 @@ export default {
435 height: 72px!important; 435 height: 72px!important;
436 .header-top { 436 .header-top {
437 height: 72px; 437 height: 72px;
438 border-bottom: 1px solid#EAEAEA; 438 // border-bottom: 1px solid#EAEAEA;
439 box-sizing: border-box; 439 box-sizing: border-box;
440 .top-items { 440 .top-items {
441 cursor: pointer; 441 cursor: pointer;
......