b47fca91 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 5fa7af8d 4e66a9cf
......@@ -275,4 +275,9 @@ ol, ul { list-style:none; }
}
.el-input__prefix, .el-input__suffix{
top: -2px;
}
//表单label居左显示
.tdright {
text-align: right!important;
padding-right: 10px!important;
}
\ No newline at end of file
......
......@@ -59,11 +59,11 @@
<el-form :model="formData" class="qlrForm">
<table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
<tr>
<td colspan="2">权利人名称<i class="requisite">*</i></td>
<td colspan="2" class="tdright">权利人名称<i class="requisite">*</i></td>
<td colspan="3">
<input type="text" class="formInput" v-model="formData.qlrmc" />
</td>
<td colspan="2">权利人类型<i class="requisite">*</i></td>
<td colspan="2" class="tdright">权利人类型<i class="requisite">*</i></td>
<td colspan="3">
<el-select class="formSelect" v-model="formData.qlrlxbsm">
<el-option
......@@ -77,7 +77,7 @@
</td>
</tr>
<tr>
<td colspan="2">证件类型<i class="requisite">*</i></td>
<td colspan="2" class="tdright">证件类型<i class="requisite">*</i></td>
<td colspan="3">
<el-select class="formSelect" v-model="formData.zjzlbsm">
<el-option
......@@ -89,23 +89,23 @@
</el-option>
</el-select>
</td>
<td colspan="2">证件号<i class="requisite">*</i></td>
<td colspan="2" class="tdright">证件号<i class="requisite">*</i></td>
<td colspan="3">
<input type="text" class="formInput" maxlength="18" v-model="formData.zjh" />
</td>
</tr>
<tr>
<td colspan="2">电话<i class="requisite">*</i></td>
<td colspan="2" class="tdright">电话<i class="requisite">*</i></td>
<td colspan="3">
<input type="text" class="formInput" v-model="formData.dh" />
</td>
<td colspan="2">地址<i class="requisite">*</i></td>
<td colspan="2" class="tdright">地址<i class="requisite">*</i></td>
<td colspan="3">
<input type="text" class="formInput" v-model="formData.dz" />
</td>
</tr>
<tr>
<td colspan="2">国家</td>
<td colspan="2" class="tdright">国家</td>
<td colspan="3">
<el-select class="formSelect" v-model="formData.gjbsm">
<el-option
......@@ -117,7 +117,7 @@
</el-option>
</el-select>
</td>
<td colspan="2">户籍所在省市</td>
<td colspan="2" class="tdright">户籍所在省市</td>
<td colspan="3">
<el-select class="formSelect" v-model="formData.hjszssbsm">
<el-option
......@@ -131,7 +131,7 @@
</td>
</tr>
<tr>
<td colspan="2">性别</td>
<td colspan="2" class="tdright">性别</td>
<td colspan="3">
<el-select class="formSelect" v-model="formData.xbbsm">
<el-option
......@@ -143,13 +143,13 @@
</el-option>
</el-select>
</td>
<td colspan="2">邮编</td>
<td colspan="2" class="tdright">邮编</td>
<td colspan="3">
<input type="text" class="formInput" v-model="formData.yb" />
</td>
</tr>
<tr>
<td colspan="2">所属行业</td>
<td colspan="2" class="tdright">所属行业</td>
<td colspan="3">
<el-select class="formSelect" v-model="formData.sshy">
<el-option
......@@ -161,16 +161,16 @@
</el-option>
</el-select>
</td>
<td colspan="2">电子邮件</td>
<td colspan="2" class="tdright">电子邮件</td>
<td colspan="3">
<input type="text" class="formInput" v-model="formData.dzyj" />
</td>
</tr>
<tr>
<td colspan="10">法人信息</td>
<th colspan="10">法人信息</th>
</tr>
<tr>
<td colspan="2">法定代表人或负责人姓名</td>
<td colspan="2" class="tdright">法定代表人或负责人姓名</td>
<td colspan="3">
<input
type="text"
......@@ -178,7 +178,7 @@
v-model="formData.fr.dlrfrmc"
/>
</td>
<td colspan="2">证件类型</td>
<td colspan="2" class="tdright">证件类型</td>
<td colspan="3">
<el-select class="formSelect" v-model="formData.fr.zjzlbsm">
<el-option
......@@ -192,17 +192,17 @@
</td>
</tr>
<tr>
<td colspan="2">证件号码</td>
<td colspan="2" class="tdright">证件号码</td>
<td colspan="3">
<input type="text" class="formInput" v-model="formData.fr.zjh" />
</td>
<td colspan="2">电话</td>
<td colspan="2" class="tdright">电话</td>
<td colspan="3">
<input type="text" class="formInput" v-model="formData.fr.dh" />
</td>
</tr>
<tr>
<td colspan="10">代理人信息</td>
<th colspan="10">代理人信息</th>
</tr>
<template v-for="(item, index) in formData.dlrList">
<tr :key="item.index">
......@@ -220,11 +220,11 @@
>-</el-button
>
</td>
<td>代理人姓名</td>
<td class="tdright">代理人姓名</td>
<td colspan="3">
<input type="text" class="formInput" v-model="item.dlrfrmc" />
</td>
<td colspan="2">证件类型</td>
<td colspan="2" class="tdright">证件类型</td>
<td colspan="3">
<el-select class="formSelect" v-model="item.zjzlbsm">
<el-option
......@@ -239,11 +239,11 @@
</tr>
<!-- <tr :key="item.dh">-->
<tr :key="'dh'+index">
<td>证件号码</td>
<td class="tdright">证件号码</td>
<td colspan="3">
<input type="text" class="formInput" v-model="item.zjh" />
</td>
<td colspan="2">电话</td>
<td colspan="2" class="tdright">电话</td>
<td colspan="3">
<input type="text" class="formInput" v-model="item.dh" />
</td>
......@@ -251,10 +251,10 @@
</template>
<tr>
<td colspan="10">权利信息</td>
<th colspan="10">权利信息</th>
</tr>
<tr>
<td colspan="2">共有方式</td>
<td colspan="2" class="tdright">共有方式</td>
<td colspan="3">
<el-select class="formSelect" v-model="formData.gyfsbsm">
<el-option
......@@ -266,23 +266,23 @@
</el-option>
</el-select>
</td>
<td colspan="2">权利比例(%)</td>
<td colspan="2" class="tdright">权利比例(%)</td>
<td colspan="3">
<input type="text" class="formInput" v-model="formData.qlbl" />
</td>
</tr>
<tr>
<td colspan="2">房产证号</td>
<td colspan="2" class="tdright">房产证号</td>
<td colspan="3">
<input type="text" class="formInput" v-model="formData.fczh" />
</td>
<td colspan="2">土地证号</td>
<td colspan="2" class="tdright">土地证号</td>
<td colspan="3">
<input type="text" class="formInput" v-model="formData.tdzh" />
</td>
</tr>
<tr>
<td colspan="2">共有情况</td>
<td colspan="2" class="tdright">共有情况</td>
<td colspan="8">
<input type="text" class="formInput" v-model="formData.gyqk" />
</td>
......@@ -672,6 +672,7 @@
height: 500px;
overflow-y: scroll;
}
.zdjbxxTable {
margin: 10px 0;
background-color: #fff;
......@@ -701,12 +702,11 @@
th {
height: 36px;
line-height: 36px;
font-size: 16px;
}
td {
text-align: center;
text-align: right;
height: 36px;
padding: 0;
padding-right: 10px;
}
/deep/.el-input__inner {
margin: 0;
......
......@@ -550,7 +550,7 @@ export default {
height: 38px;
}
.logo-text {
font-size: 14px;
font-size: 18px;
color: rgba(255, 255, 255, 1);
line-height: 14px;
}
......
......@@ -5,7 +5,7 @@
<table border="1" width="100%" cellspacing="0" cellpadding="0" class="dzTable">
<tbody>
<tr height="30">
<td colspan="12" align="center" ><font size="4">多幢基本信息</font></td>
<th colspan="12"><font size="4"></font>多幢基本信息</th>
</tr>
<tr height="30">
<td colspan="2" align="center" >宗地代码</td>
......@@ -540,9 +540,17 @@
table-layout: fixed;
}
th {
height: 36px;
line-height: 36px;
font-size: 16px;
}
td{
height: 36px;
width:8.33%;
text-align: right;
padding-right: 10px;
}
.el-select{
......
......@@ -136,10 +136,10 @@ export default {
fwsxbgbl(params)
.then((res) => {
if (res.code == 200) {
this.$message({
message: res.message,
type: "变更成功",
});
// this.$message({
// message: res.message,
// type: "变更成功",
// });
let path = "";
switch (row.dylx) {
case "zrz":
......
......@@ -164,6 +164,7 @@
<!-- </el-option>-->
<!-- </el-select>-->
<el-select-tree
style="width:100%"
v-if="show"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
......@@ -624,7 +625,7 @@
//不动产单元号再次生成提示框
open() {
this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', {
this.$confirm('已经存在宗地代码或不动产单元号, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
......@@ -983,10 +984,6 @@
height: 36px;
border-color: #E6E6E6;
}
.tdright {
text-align: right;
padding-right: 10px;
}
/deep/ .el-input__inner {
margin: 0;
......
......@@ -894,7 +894,9 @@
td{
//bgcolor:#F1F4FC;
width:8.33%
width:8.33%;
text-align: right;
padding-right: 10px;
}
.el-select{
......
......@@ -72,6 +72,14 @@
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
</ul>
</td>
</tr>
</table>
......@@ -130,6 +138,14 @@
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
</ul>
</td>
</tr>
</table>
......@@ -194,6 +210,14 @@
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
</ul>
</td>
</tr>
</table>
......@@ -241,12 +265,12 @@
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1"></li>
<li style="background-color:#8ADC88"></li>
<li style="background-color:#FF8282"></li>
<li style="background-color:#D7CECF"></li>
<li style="background-color:#D4A3EB"></li>
<li style="background-color:#A5A3FB"></li>
<li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
</ul>
</td>
</tr>
......
......@@ -822,10 +822,6 @@
text-align: center;
height: 36px;
}
.tdright {
text-align: right;
padding-right: 10px;
}
/deep/ .el-input__inner {
margin: 0;
......