1938c0ce by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents d5567c13 f8e3b5fb
......@@ -73,12 +73,12 @@
<el-form :model="formData" class="qlrForm">
<table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>权利人名称</td>
<td colspan="3">
<td colspan="4" class="tdright"><i class="requisite">*</i>权利人名称</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.qlrmc" />
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>权利人类型</td>
<td colspan="3">
<td colspan="4" class="tdright"><i class="requisite">*</i>权利人类型</td>
<td colspan="6">
<el-select class="formSelect" v-model="formData.qlrlxbsm">
<el-option
v-for="item in $store.state.qlrlxList"
......@@ -91,8 +91,8 @@
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>证件类型</td>
<td colspan="3">
<td colspan="4" class="tdright"><i class="requisite">*</i>证件类型</td>
<td colspan="6">
<el-select class="formSelect" v-model="formData.zjzlbsm">
<el-option
v-for="item in $store.state.zjzlList"
......@@ -103,25 +103,25 @@
</el-option>
</el-select>
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>证件号</td>
<td colspan="3">
<td colspan="4" class="tdright"><i class="requisite">*</i>证件号</td>
<td colspan="6">
<input type="text" class="formInput" maxlength="18" v-model="formData.zjh" />
</td>
</tr>
<tr>
<td colspan="2" class="tdright"><i class="requisite">*</i>电话</td>
<td colspan="3">
<td colspan="4" class="tdright"><i class="requisite">*</i>电话</td>
<td colspan="6">
<!-- @blur="inputBlur($event)"-->
<input type="text" class="formInput" v-model="formData.dh" />
</td>
<td colspan="2" class="tdright"><i class="requisite">*</i>地址</td>
<td colspan="3">
<td colspan="4" class="tdright"><i class="requisite">*</i>地址</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.dz" />
</td>
</tr>
<tr>
<td colspan="2" class="tdright">国家</td>
<td colspan="3">
<td colspan="4" class="tdright">国家</td>
<td colspan="6">
<el-select class="formSelect" v-model="formData.gjbsm">
<el-option
v-for="item in $store.state.gjList"
......@@ -132,8 +132,8 @@
</el-option>
</el-select>
</td>
<td colspan="2" class="tdright">户籍所在省市</td>
<td colspan="3">
<td colspan="4" class="tdright">户籍所在省市</td>
<td colspan="6">
<el-select class="formSelect" v-model="formData.hjszssbsm">
<el-option
v-for="item in $store.state.ssList"
......@@ -146,8 +146,8 @@
</td>
</tr>
<tr>
<td colspan="2" class="tdright">性别</td>
<td colspan="3">
<td colspan="4" class="tdright">性别</td>
<td colspan="6">
<el-select class="formSelect" v-model="formData.xbbsm">
<el-option
v-for="item in $store.state.xbList"
......@@ -158,14 +158,14 @@
</el-option>
</el-select>
</td>
<td colspan="2" class="tdright">邮编</td>
<td colspan="3">
<td colspan="4" class="tdright">邮编</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.yb" />
</td>
</tr>
<tr>
<td colspan="2" class="tdright">所属行业</td>
<td colspan="3">
<td colspan="4" class="tdright">所属行业</td>
<td colspan="6">
<el-select class="formSelect" v-model="formData.sshy">
<el-option
v-for="item in $store.state.sshyList"
......@@ -176,25 +176,25 @@
</el-option>
</el-select>
</td>
<td colspan="2" class="tdright">电子邮件</td>
<td colspan="3">
<td colspan="4" class="tdright">电子邮件</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.dzyj" />
</td>
</tr>
<tr>
<th colspan="10">法人信息</th>
<th colspan="20">法人信息</th>
</tr>
<tr>
<td colspan="2" class="tdright">法定代表人或负责人姓名</td>
<td colspan="3">
<td colspan="4" class="tdright">法定代表人或负责人姓名</td>
<td colspan="6">
<input
type="text"
class="formInput"
v-model="formData.fr.dlrfrmc"
/>
</td>
<td colspan="2" class="tdright">证件类型</td>
<td colspan="3">
<td colspan="4" class="tdright">证件类型</td>
<td colspan="6">
<el-select class="formSelect" v-model="formData.fr.zjzlbsm">
<el-option
v-for="item in $store.state.zjzlList"
......@@ -207,40 +207,37 @@
</td>
</tr>
<tr>
<td colspan="2" class="tdright">证件号码</td>
<td colspan="3">
<td colspan="4" class="tdright">证件号码</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.fr.zjh" />
</td>
<td colspan="2" class="tdright">电话</td>
<td colspan="3">
<td colspan="4" class="tdright">电话</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.fr.dh" />
</td>
</tr>
<tr>
<th colspan="10">代理人信息</th>
<th colspan="20">代理人信息</th>
</tr>
<template v-for="(item, index) in formData.dlrList">
<tr :key="item.index">
<td rowspan="2" class="btnCol">
<el-button
type="primary"
class="changeBtn inAdd addMinus"
@click="handleClick(item, index, 'add')"
>+</el-button
>
<el-button
type="primary"
class="changeBtn inMinus addMinus"
@click="handleClick(item, index, 'minus')"
>-</el-button
>
<td :rowspan="(formData.dlrList.length-1)*2+2" v-if="index == 0" class="btnCol">
<span :style="{'padding-top':(formData.dlrList.length-1)*36 + 20 + 'px'}">
<i v-show=" index == 0" class="iconfont iconicon-test2" @click="handleClick(item, index, 'add')"></i>
</span>
<!-- <div class="line" v-show=" index != formData.dlrList.length-1"></div> -->
</td>
<td rowspan="2" class="minusBtnCol">
<span>
<i class="iconfont icon-" @click="handleClick(item, index, 'minus')"></i>
</span>
</td>
<td class="tdright">代理人姓名</td>
<td colspan="3">
<td class="tdright" colspan="2">代理人姓名</td>
<td colspan="6">
<input type="text" class="formInput" v-model="item.dlrfrmc" />
</td>
<td colspan="2" class="tdright">证件类型</td>
<td colspan="3">
<td colspan="4" class="tdright">证件类型</td>
<td colspan="6">
<el-select class="formSelect" v-model="item.zjzlbsm">
<el-option
v-for="item in $store.state.zjzlList"
......@@ -254,23 +251,23 @@
</tr>
<!-- <tr :key="item.dh">-->
<tr :key="'dh'+index">
<td class="tdright">证件号码</td>
<td colspan="3">
<td class="tdright" colspan="2">证件号码</td>
<td colspan="6">
<input type="text" class="formInput" v-model="item.zjh" />
</td>
<td colspan="2" class="tdright">电话</td>
<td colspan="3">
<td colspan="4" class="tdright">电话</td>
<td colspan="6">
<input type="text" class="formInput" v-model="item.dh" />
</td>
</tr>
</template>
<tr>
<th colspan="10">权利信息</th>
<th colspan="20">权利信息</th>
</tr>
<tr>
<td colspan="2" class="tdright">共有方式</td>
<td colspan="3">
<td colspan="4" class="tdright">共有方式</td>
<td colspan="6">
<el-select class="formSelect" v-model="formData.gyfsbsm">
<el-option
v-for="item in $store.state.gyfsList"
......@@ -281,23 +278,23 @@
</el-option>
</el-select>
</td>
<td colspan="2" class="tdright">权利比例(%)</td>
<td colspan="3">
<td colspan="4" class="tdright">权利比例(%)</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.qlbl" />
</td>
</tr>
<tr>
<td colspan="2" class="tdright">房产证号</td>
<td colspan="3">
<td colspan="4" class="tdright">房产证号</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.fczh" />
</td>
<td colspan="2" class="tdright">土地证号</td>
<td colspan="3">
<td colspan="4" class="tdright">土地证号</td>
<td colspan="6">
<input type="text" class="formInput" v-model="formData.tdzh" />
</td>
</tr>
<tr>
<td colspan="2" class="tdright">共有情况</td>
<td colspan="4" class="tdright">共有情况</td>
<td colspan="8">
<input type="text" class="formInput" v-model="formData.gyqk" />
</td>
......@@ -741,25 +738,35 @@
width: 100%;
border-bottom: 1px solid #000;
.btnCol {
position: relative;
width: 60px;
.changeBtn {
width: 30px;
height: 30px;
font-size: 25px;
padding: 0px 0px;
position: absolute;
top: 50%;
left: 50%;
margin-top: -32px;
margin-left: -15px;
}
.el-button + .el-button {
margin-left: -15px;
margin-top: 2px;
}
}
.btnCol,.minusBtnCol {
position: relative;
padding-right: 0;
span{
display: inline-block;
width: 100%;
height: 100%;
position: relative;
box-sizing: border-box;
padding-right: 10px;
padding-top: 20px;
}
.line{
width: 100%;
height: 2px;
background: #fff;
}
i{
color: #66b1ff;
font-size: 36px;
cursor: pointer;
z-index: 1;
}
}
.minusBtnCol{
i{
color: #FA6400;
}
}
th {
height: 36px;
line-height: 36px;
......
......@@ -435,7 +435,7 @@ export default {
height: 72px!important;
.header-top {
height: 72px;
border-bottom: 1px solid#EAEAEA;
// border-bottom: 1px solid#EAEAEA;
box-sizing: border-box;
.top-items {
cursor: pointer;
......