b47fca91 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 5fa7af8d 4e66a9cf
...@@ -275,4 +275,9 @@ ol, ul { list-style:none; } ...@@ -275,4 +275,9 @@ ol, ul { list-style:none; }
275 } 275 }
276 .el-input__prefix, .el-input__suffix{ 276 .el-input__prefix, .el-input__suffix{
277 top: -2px; 277 top: -2px;
278 }
279 //表单label居左显示
280 .tdright {
281 text-align: right!important;
282 padding-right: 10px!important;
278 } 283 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -59,11 +59,11 @@ ...@@ -59,11 +59,11 @@
59 <el-form :model="formData" class="qlrForm"> 59 <el-form :model="formData" class="qlrForm">
60 <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1"> 60 <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
61 <tr> 61 <tr>
62 <td colspan="2">权利人名称<i class="requisite">*</i></td> 62 <td colspan="2" class="tdright">权利人名称<i class="requisite">*</i></td>
63 <td colspan="3"> 63 <td colspan="3">
64 <input type="text" class="formInput" v-model="formData.qlrmc" /> 64 <input type="text" class="formInput" v-model="formData.qlrmc" />
65 </td> 65 </td>
66 <td colspan="2">权利人类型<i class="requisite">*</i></td> 66 <td colspan="2" class="tdright">权利人类型<i class="requisite">*</i></td>
67 <td colspan="3"> 67 <td colspan="3">
68 <el-select class="formSelect" v-model="formData.qlrlxbsm"> 68 <el-select class="formSelect" v-model="formData.qlrlxbsm">
69 <el-option 69 <el-option
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
77 </td> 77 </td>
78 </tr> 78 </tr>
79 <tr> 79 <tr>
80 <td colspan="2">证件类型<i class="requisite">*</i></td> 80 <td colspan="2" class="tdright">证件类型<i class="requisite">*</i></td>
81 <td colspan="3"> 81 <td colspan="3">
82 <el-select class="formSelect" v-model="formData.zjzlbsm"> 82 <el-select class="formSelect" v-model="formData.zjzlbsm">
83 <el-option 83 <el-option
...@@ -89,23 +89,23 @@ ...@@ -89,23 +89,23 @@
89 </el-option> 89 </el-option>
90 </el-select> 90 </el-select>
91 </td> 91 </td>
92 <td colspan="2">证件号<i class="requisite">*</i></td> 92 <td colspan="2" class="tdright">证件号<i class="requisite">*</i></td>
93 <td colspan="3"> 93 <td colspan="3">
94 <input type="text" class="formInput" maxlength="18" v-model="formData.zjh" /> 94 <input type="text" class="formInput" maxlength="18" v-model="formData.zjh" />
95 </td> 95 </td>
96 </tr> 96 </tr>
97 <tr> 97 <tr>
98 <td colspan="2">电话<i class="requisite">*</i></td> 98 <td colspan="2" class="tdright">电话<i class="requisite">*</i></td>
99 <td colspan="3"> 99 <td colspan="3">
100 <input type="text" class="formInput" v-model="formData.dh" /> 100 <input type="text" class="formInput" v-model="formData.dh" />
101 </td> 101 </td>
102 <td colspan="2">地址<i class="requisite">*</i></td> 102 <td colspan="2" class="tdright">地址<i class="requisite">*</i></td>
103 <td colspan="3"> 103 <td colspan="3">
104 <input type="text" class="formInput" v-model="formData.dz" /> 104 <input type="text" class="formInput" v-model="formData.dz" />
105 </td> 105 </td>
106 </tr> 106 </tr>
107 <tr> 107 <tr>
108 <td colspan="2">国家</td> 108 <td colspan="2" class="tdright">国家</td>
109 <td colspan="3"> 109 <td colspan="3">
110 <el-select class="formSelect" v-model="formData.gjbsm"> 110 <el-select class="formSelect" v-model="formData.gjbsm">
111 <el-option 111 <el-option
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
117 </el-option> 117 </el-option>
118 </el-select> 118 </el-select>
119 </td> 119 </td>
120 <td colspan="2">户籍所在省市</td> 120 <td colspan="2" class="tdright">户籍所在省市</td>
121 <td colspan="3"> 121 <td colspan="3">
122 <el-select class="formSelect" v-model="formData.hjszssbsm"> 122 <el-select class="formSelect" v-model="formData.hjszssbsm">
123 <el-option 123 <el-option
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
131 </td> 131 </td>
132 </tr> 132 </tr>
133 <tr> 133 <tr>
134 <td colspan="2">性别</td> 134 <td colspan="2" class="tdright">性别</td>
135 <td colspan="3"> 135 <td colspan="3">
136 <el-select class="formSelect" v-model="formData.xbbsm"> 136 <el-select class="formSelect" v-model="formData.xbbsm">
137 <el-option 137 <el-option
...@@ -143,13 +143,13 @@ ...@@ -143,13 +143,13 @@
143 </el-option> 143 </el-option>
144 </el-select> 144 </el-select>
145 </td> 145 </td>
146 <td colspan="2">邮编</td> 146 <td colspan="2" class="tdright">邮编</td>
147 <td colspan="3"> 147 <td colspan="3">
148 <input type="text" class="formInput" v-model="formData.yb" /> 148 <input type="text" class="formInput" v-model="formData.yb" />
149 </td> 149 </td>
150 </tr> 150 </tr>
151 <tr> 151 <tr>
152 <td colspan="2">所属行业</td> 152 <td colspan="2" class="tdright">所属行业</td>
153 <td colspan="3"> 153 <td colspan="3">
154 <el-select class="formSelect" v-model="formData.sshy"> 154 <el-select class="formSelect" v-model="formData.sshy">
155 <el-option 155 <el-option
...@@ -161,16 +161,16 @@ ...@@ -161,16 +161,16 @@
161 </el-option> 161 </el-option>
162 </el-select> 162 </el-select>
163 </td> 163 </td>
164 <td colspan="2">电子邮件</td> 164 <td colspan="2" class="tdright">电子邮件</td>
165 <td colspan="3"> 165 <td colspan="3">
166 <input type="text" class="formInput" v-model="formData.dzyj" /> 166 <input type="text" class="formInput" v-model="formData.dzyj" />
167 </td> 167 </td>
168 </tr> 168 </tr>
169 <tr> 169 <tr>
170 <td colspan="10">法人信息</td> 170 <th colspan="10">法人信息</th>
171 </tr> 171 </tr>
172 <tr> 172 <tr>
173 <td colspan="2">法定代表人或负责人姓名</td> 173 <td colspan="2" class="tdright">法定代表人或负责人姓名</td>
174 <td colspan="3"> 174 <td colspan="3">
175 <input 175 <input
176 type="text" 176 type="text"
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
178 v-model="formData.fr.dlrfrmc" 178 v-model="formData.fr.dlrfrmc"
179 /> 179 />
180 </td> 180 </td>
181 <td colspan="2">证件类型</td> 181 <td colspan="2" class="tdright">证件类型</td>
182 <td colspan="3"> 182 <td colspan="3">
183 <el-select class="formSelect" v-model="formData.fr.zjzlbsm"> 183 <el-select class="formSelect" v-model="formData.fr.zjzlbsm">
184 <el-option 184 <el-option
...@@ -192,17 +192,17 @@ ...@@ -192,17 +192,17 @@
192 </td> 192 </td>
193 </tr> 193 </tr>
194 <tr> 194 <tr>
195 <td colspan="2">证件号码</td> 195 <td colspan="2" class="tdright">证件号码</td>
196 <td colspan="3"> 196 <td colspan="3">
197 <input type="text" class="formInput" v-model="formData.fr.zjh" /> 197 <input type="text" class="formInput" v-model="formData.fr.zjh" />
198 </td> 198 </td>
199 <td colspan="2">电话</td> 199 <td colspan="2" class="tdright">电话</td>
200 <td colspan="3"> 200 <td colspan="3">
201 <input type="text" class="formInput" v-model="formData.fr.dh" /> 201 <input type="text" class="formInput" v-model="formData.fr.dh" />
202 </td> 202 </td>
203 </tr> 203 </tr>
204 <tr> 204 <tr>
205 <td colspan="10">代理人信息</td> 205 <th colspan="10">代理人信息</th>
206 </tr> 206 </tr>
207 <template v-for="(item, index) in formData.dlrList"> 207 <template v-for="(item, index) in formData.dlrList">
208 <tr :key="item.index"> 208 <tr :key="item.index">
...@@ -220,11 +220,11 @@ ...@@ -220,11 +220,11 @@
220 >-</el-button 220 >-</el-button
221 > 221 >
222 </td> 222 </td>
223 <td>代理人姓名</td> 223 <td class="tdright">代理人姓名</td>
224 <td colspan="3"> 224 <td colspan="3">
225 <input type="text" class="formInput" v-model="item.dlrfrmc" /> 225 <input type="text" class="formInput" v-model="item.dlrfrmc" />
226 </td> 226 </td>
227 <td colspan="2">证件类型</td> 227 <td colspan="2" class="tdright">证件类型</td>
228 <td colspan="3"> 228 <td colspan="3">
229 <el-select class="formSelect" v-model="item.zjzlbsm"> 229 <el-select class="formSelect" v-model="item.zjzlbsm">
230 <el-option 230 <el-option
...@@ -239,11 +239,11 @@ ...@@ -239,11 +239,11 @@
239 </tr> 239 </tr>
240 <!-- <tr :key="item.dh">--> 240 <!-- <tr :key="item.dh">-->
241 <tr :key="'dh'+index"> 241 <tr :key="'dh'+index">
242 <td>证件号码</td> 242 <td class="tdright">证件号码</td>
243 <td colspan="3"> 243 <td colspan="3">
244 <input type="text" class="formInput" v-model="item.zjh" /> 244 <input type="text" class="formInput" v-model="item.zjh" />
245 </td> 245 </td>
246 <td colspan="2">电话</td> 246 <td colspan="2" class="tdright">电话</td>
247 <td colspan="3"> 247 <td colspan="3">
248 <input type="text" class="formInput" v-model="item.dh" /> 248 <input type="text" class="formInput" v-model="item.dh" />
249 </td> 249 </td>
...@@ -251,10 +251,10 @@ ...@@ -251,10 +251,10 @@
251 </template> 251 </template>
252 252
253 <tr> 253 <tr>
254 <td colspan="10">权利信息</td> 254 <th colspan="10">权利信息</th>
255 </tr> 255 </tr>
256 <tr> 256 <tr>
257 <td colspan="2">共有方式</td> 257 <td colspan="2" class="tdright">共有方式</td>
258 <td colspan="3"> 258 <td colspan="3">
259 <el-select class="formSelect" v-model="formData.gyfsbsm"> 259 <el-select class="formSelect" v-model="formData.gyfsbsm">
260 <el-option 260 <el-option
...@@ -266,23 +266,23 @@ ...@@ -266,23 +266,23 @@
266 </el-option> 266 </el-option>
267 </el-select> 267 </el-select>
268 </td> 268 </td>
269 <td colspan="2">权利比例(%)</td> 269 <td colspan="2" class="tdright">权利比例(%)</td>
270 <td colspan="3"> 270 <td colspan="3">
271 <input type="text" class="formInput" v-model="formData.qlbl" /> 271 <input type="text" class="formInput" v-model="formData.qlbl" />
272 </td> 272 </td>
273 </tr> 273 </tr>
274 <tr> 274 <tr>
275 <td colspan="2">房产证号</td> 275 <td colspan="2" class="tdright">房产证号</td>
276 <td colspan="3"> 276 <td colspan="3">
277 <input type="text" class="formInput" v-model="formData.fczh" /> 277 <input type="text" class="formInput" v-model="formData.fczh" />
278 </td> 278 </td>
279 <td colspan="2">土地证号</td> 279 <td colspan="2" class="tdright">土地证号</td>
280 <td colspan="3"> 280 <td colspan="3">
281 <input type="text" class="formInput" v-model="formData.tdzh" /> 281 <input type="text" class="formInput" v-model="formData.tdzh" />
282 </td> 282 </td>
283 </tr> 283 </tr>
284 <tr> 284 <tr>
285 <td colspan="2">共有情况</td> 285 <td colspan="2" class="tdright">共有情况</td>
286 <td colspan="8"> 286 <td colspan="8">
287 <input type="text" class="formInput" v-model="formData.gyqk" /> 287 <input type="text" class="formInput" v-model="formData.gyqk" />
288 </td> 288 </td>
...@@ -672,6 +672,7 @@ ...@@ -672,6 +672,7 @@
672 height: 500px; 672 height: 500px;
673 overflow-y: scroll; 673 overflow-y: scroll;
674 } 674 }
675
675 .zdjbxxTable { 676 .zdjbxxTable {
676 margin: 10px 0; 677 margin: 10px 0;
677 background-color: #fff; 678 background-color: #fff;
...@@ -701,12 +702,11 @@ ...@@ -701,12 +702,11 @@
701 th { 702 th {
702 height: 36px; 703 height: 36px;
703 line-height: 36px; 704 line-height: 36px;
704 font-size: 16px;
705 } 705 }
706 td { 706 td {
707 text-align: center; 707 text-align: right;
708 height: 36px; 708 height: 36px;
709 padding: 0; 709 padding-right: 10px;
710 } 710 }
711 /deep/.el-input__inner { 711 /deep/.el-input__inner {
712 margin: 0; 712 margin: 0;
......
...@@ -550,7 +550,7 @@ export default { ...@@ -550,7 +550,7 @@ export default {
550 height: 38px; 550 height: 38px;
551 } 551 }
552 .logo-text { 552 .logo-text {
553 font-size: 14px; 553 font-size: 18px;
554 color: rgba(255, 255, 255, 1); 554 color: rgba(255, 255, 255, 1);
555 line-height: 14px; 555 line-height: 14px;
556 } 556 }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <table border="1" width="100%" cellspacing="0" cellpadding="0" class="dzTable"> 5 <table border="1" width="100%" cellspacing="0" cellpadding="0" class="dzTable">
6 <tbody> 6 <tbody>
7 <tr height="30"> 7 <tr height="30">
8 <td colspan="12" align="center" ><font size="4">多幢基本信息</font></td> 8 <th colspan="12"><font size="4"></font>多幢基本信息</th>
9 </tr> 9 </tr>
10 <tr height="30"> 10 <tr height="30">
11 <td colspan="2" align="center" >宗地代码</td> 11 <td colspan="2" align="center" >宗地代码</td>
...@@ -540,9 +540,17 @@ ...@@ -540,9 +540,17 @@
540 table-layout: fixed; 540 table-layout: fixed;
541 } 541 }
542 542
543 th {
544 height: 36px;
545 line-height: 36px;
546 font-size: 16px;
547 }
548
543 td{ 549 td{
544 height: 36px; 550 height: 36px;
545 width:8.33%; 551 width:8.33%;
552 text-align: right;
553 padding-right: 10px;
546 } 554 }
547 555
548 .el-select{ 556 .el-select{
......
...@@ -136,10 +136,10 @@ export default { ...@@ -136,10 +136,10 @@ export default {
136 fwsxbgbl(params) 136 fwsxbgbl(params)
137 .then((res) => { 137 .then((res) => {
138 if (res.code == 200) { 138 if (res.code == 200) {
139 this.$message({ 139 // this.$message({
140 message: res.message, 140 // message: res.message,
141 type: "变更成功", 141 // type: "变更成功",
142 }); 142 // });
143 let path = ""; 143 let path = "";
144 switch (row.dylx) { 144 switch (row.dylx) {
145 case "zrz": 145 case "zrz":
......
...@@ -164,6 +164,7 @@ ...@@ -164,6 +164,7 @@
164 <!-- </el-option>--> 164 <!-- </el-option>-->
165 <!-- </el-select>--> 165 <!-- </el-select>-->
166 <el-select-tree 166 <el-select-tree
167 style="width:100%"
167 v-if="show" 168 v-if="show"
168 :default-expand-all="defaultExpandAll" 169 :default-expand-all="defaultExpandAll"
169 :multiple="multiple" 170 :multiple="multiple"
...@@ -624,7 +625,7 @@ ...@@ -624,7 +625,7 @@
624 625
625 //不动产单元号再次生成提示框 626 //不动产单元号再次生成提示框
626 open() { 627 open() {
627 this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', { 628 this.$confirm('已经存在宗地代码或不动产单元号, 是否继续?', '提示', {
628 confirmButtonText: '确定', 629 confirmButtonText: '确定',
629 cancelButtonText: '取消', 630 cancelButtonText: '取消',
630 type: 'warning' 631 type: 'warning'
...@@ -983,10 +984,6 @@ ...@@ -983,10 +984,6 @@
983 height: 36px; 984 height: 36px;
984 border-color: #E6E6E6; 985 border-color: #E6E6E6;
985 } 986 }
986 .tdright {
987 text-align: right;
988 padding-right: 10px;
989 }
990 987
991 /deep/ .el-input__inner { 988 /deep/ .el-input__inner {
992 margin: 0; 989 margin: 0;
......
...@@ -894,7 +894,9 @@ ...@@ -894,7 +894,9 @@
894 894
895 td{ 895 td{
896 //bgcolor:#F1F4FC; 896 //bgcolor:#F1F4FC;
897 width:8.33% 897 width:8.33%;
898 text-align: right;
899 padding-right: 10px;
898 } 900 }
899 901
900 .el-select{ 902 .el-select{
......
...@@ -72,6 +72,14 @@ ...@@ -72,6 +72,14 @@
72 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span> 72 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
73 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span> 73 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
74 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span> 74 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
75 <ul class="dyzt">
76 <li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
77 <li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
78 <li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
79 <li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
80 <li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
81 <li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
82 </ul>
75 </td> 83 </td>
76 </tr> 84 </tr>
77 </table> 85 </table>
...@@ -130,6 +138,14 @@ ...@@ -130,6 +138,14 @@
130 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span> 138 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
131 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span> 139 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
132 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span> 140 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
141 <ul class="dyzt">
142 <li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
143 <li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
144 <li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
145 <li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
146 <li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
147 <li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
148 </ul>
133 </td> 149 </td>
134 </tr> 150 </tr>
135 </table> 151 </table>
...@@ -194,6 +210,14 @@ ...@@ -194,6 +210,14 @@
194 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span> 210 <span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'"></span>
195 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span> 211 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
196 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span> 212 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
213 <ul class="dyzt">
214 <li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
215 <li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
216 <li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
217 <li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
218 <li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
219 <li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
220 </ul>
197 </td> 221 </td>
198 </tr> 222 </tr>
199 </table> 223 </table>
...@@ -241,12 +265,12 @@ ...@@ -241,12 +265,12 @@
241 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span> 265 <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
242 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span> 266 <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
243 <ul class="dyzt"> 267 <ul class="dyzt">
244 <li style="background-color:#6EDEE1"></li> 268 <li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
245 <li style="background-color:#8ADC88"></li> 269 <li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
246 <li style="background-color:#FF8282"></li> 270 <li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
247 <li style="background-color:#D7CECF"></li> 271 <li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
248 <li style="background-color:#D4A3EB"></li> 272 <li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
249 <li style="background-color:#A5A3FB"></li> 273 <li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
250 </ul> 274 </ul>
251 </td> 275 </td>
252 </tr> 276 </tr>
......
...@@ -822,10 +822,6 @@ ...@@ -822,10 +822,6 @@
822 text-align: center; 822 text-align: center;
823 height: 36px; 823 height: 36px;
824 } 824 }
825 .tdright {
826 text-align: right;
827 padding-right: 10px;
828 }
829 825
830 /deep/ .el-input__inner { 826 /deep/ .el-input__inner {
831 margin: 0; 827 margin: 0;
......