Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
2fd6f005 by weimo934
Options

feat(fg):修改宗地分割前样式

1 parent 2f62c379
Inline Side-by-side
Showing 2 changed files with 249 additions and 131 deletions
...@@ -216,3 +216,18 @@ export function exportShp(data) { ...@@ -216,3 +216,18 @@ export function exportShp(data) {
216 responseType: 'arraybuffer' 216 responseType: 'arraybuffer'
217 }) 217 })
218 } 218 }
219
220
221 /**
222 * 获取该宗地上的所有自然幢
223 */
224 export function getZrz(zdBsm) {
225 return request({
226 url:"/bg/zdSplitMerge/byZdbsm",
227 method:"get",
228 params:{
229 zdBsm
230 }
231 })
232 }
233
......
...@@ -3,45 +3,39 @@ ...@@ -3,45 +3,39 @@
3 <el-tabs v-model="tabName" type="card" class="menu"> 3 <el-tabs v-model="tabName" type="card" class="menu">
4 <el-tab-pane label="宗地分割" name="zd"> 4 <el-tab-pane label="宗地分割" name="zd">
5 <div class="fg-tabs"> 5 <div class="fg-tabs">
6 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
7 <div class="table">
8 <span class="tips">分割前宗地信息</span> 6 <span class="tips">分割前宗地信息</span>
9 <table border="1"> 7 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
10 <tr> 8 <div class="fgq">
11 <th class="xh">序号</th> 9 <div class="data">
12 <th class="zddm">宗地代码</th> 10 <ul>
13 <th class="bdcdyh">不动产单元号</th> 11 <li>宗地代码:{{zdFgqData.zddm}}</li>
14 <th class="xmmc">项目名称</th> 12 <li>不动产单元号:{{zdFgqData.bdcdyh}}</li>
15 <th class="bdcqzh">不动产权证号</th> 13 <li>项目名称:{{zdFgqData.xmmc}}</li>
16 <th class="qlr">权利人</th> 14 <li>不动产权证号:{{zdFgqData.bdcqzh}}</li>
17 <th class="zl">坐落</th> 15 <li>权利人:{{zdFgqData.qlr}}</li>
18 </tr> 16 <li>坐落:{{zdFgqData.zl}}</li>
19 <tr v-if="Object.keys(zdFgqData)==0"> 17 </ul>
20 <td colspan="7"> 18 </div>
21 <span class="noData">暂无数据</span> 19 <div class="zxx">
22 </td> 20 <div class="dz">
23 </tr> 21 <div class="title">
24 <tr v-else> 22 <span>多幢信息({{zdZxx.zrzList.length}}个)</span>
25 <td class="xh">1</td> 23 </div>
26 <td class="zddm"><input type="text" class="formInput" v-model="zdFgqData.zddm" 24 <ul>
27 readonly="readonly"/> 25 <li v-for="(item,index) in zdZxx.zrzList" :key="index">{{item.xmmc}}</li>
28 </td> 26 </ul>
29 <td class="bdcdyh"><input type="text" class="formInput" v-model="zdFgqData.bdcdyh" 27 </div>
30 readonly="readonly"/> 28 <div class="zrz">
31 </td> 29 <div class="title">
32 <td class="xmmc"><input type="text" class="formInput" v-model="zdFgqData.xmmc" 30 <span>自然幢信息({{zdZxx.dzList.length}}个)</span>
33 readonly="readonly"/> 31 </div>
34 </td> 32 <ul>
35 <td class="bdcqzh"><input type="text" class="formInput" v-model="zdFgqData.bdcqzh" 33 <li v-for="(item,index) in zdZxx.dzList" :key="index"
36 readonly="readonly"/> 34 :class="(index+1)%2==0?'':'border'">{{item.xmmc}}
37 </td> 35 </li>
38 <td class="qlr"><input type="text" class="formInput" v-model="zdFgqData.qlr" 36 </ul>
39 readonly="readonly"/> 37 </div>
40 </td> 38 </div>
41 <td class="zl"><input type="text" class="formInput" v-model="zdFgqData.zl"
42 readonly="readonly"/></td>
43 </tr>
44 </table>
45 </div> 39 </div>
46 <div class="fgh"> 40 <div class="fgh">
47 <span class="tips">分割后宗地信息</span> 41 <span class="tips">分割后宗地信息</span>
...@@ -120,8 +114,35 @@ ...@@ -120,8 +114,35 @@
120 <input type="text" v-model="item.xmmc" class="formInput"/> 114 <input type="text" v-model="item.xmmc" class="formInput"/>
121 </td> 115 </td>
122 <td class="zxx"> 116 <td class="zxx">
123 <!-- {{item.fwlist.zbsm}}--> 117 <!--<el-select placeholder="请选择多幢" @change="xzDz(i.bsm,index)" v-model="zdFghData.newZdlist.fwlist[1].zbsm">
124 <span @click="xzzrz(index)" class="xz">选择</span> 118 <el-option
119 v-for="i in zdZxx.dzList"
120 :key="i.bsm"
121 :label="i.xmmc"
122 :value="i.bsm">
123 </el-option>
124 </el-select>
125 <el-select placeholder="请选择自然幢" @change="xzZrz(i.bsm,index)" v-model="zdFghData.newZdlist.fwlist[1].zbsm">
126 <el-option
127 v-for="i in zdZxx.zrzList"
128 :key="i.bsm"
129 :label="i.xmmc"
130 :value="i.bsm">
131 </el-option>
132 </el-select>-->
133 <!-- <span @click="xzzrz(index)" class="xz">选择</span>-->
134 <el-dropdown @command="handleCommand">
135 <span class="el-dropdown-link">
136 选择多幢<i class="el-icon-arrow-down el-icon--right"></i>
137 </span>
138 <el-dropdown-menu slot="dropdown" >
139 <el-dropdown-item v-for="(ce,index) in zdZxx.dzList" :key="index" :command="ce" >{{ce.xmmc}}</el-dropdown-item>
140 <!--<el-dropdown-item command="b">狮子头</el-dropdown-item>
141 <el-dropdown-item command="c">螺蛳粉</el-dropdown-item>
142 <el-dropdown-item command="d" disabled>双皮奶</el-dropdown-item>
143 <el-dropdown-item command="e" divided>蚵仔煎</el-dropdown-item>-->
144 </el-dropdown-menu>
145 </el-dropdown>
125 </td> 146 </td>
126 </tr> 147 </tr>
127 <tr> 148 <tr>
...@@ -195,45 +216,39 @@ ...@@ -195,45 +216,39 @@
195 </el-tab-pane> 216 </el-tab-pane>
196 <el-tab-pane label="多幢分割" name="dz"> 217 <el-tab-pane label="多幢分割" name="dz">
197 <div class="fg-tabs"> 218 <div class="fg-tabs">
198 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
199 <div class="table">
200 <span class="tips">分割前多幢信息</span> 219 <span class="tips">分割前多幢信息</span>
201 <table border="1"> 220 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
202 <tr> 221 <div class="fgq">
203 <th class="xh">序号</th> 222 <div class="data">
204 <th class="zddm">宗地代码</th> 223 <ul>
205 <th class="bdcdyh">不动产单元号</th> 224 <li>宗地代码:{{dzFgqData.zddm}}</li>
206 <th class="xmmc">项目名称</th> 225 <li>不动产单元号:{{dzFgqData.bdcdyh}}</li>
207 <th class="bdcqzh">不动产权证号</th> 226 <li>项目名称:{{dzFgqData.xmmc}}</li>
208 <th class="qlr">权利人</th> 227 <li>不动产权证号:{{dzFgqData.bdcqzh}}</li>
209 <th class="zl">坐落</th> 228 <li>权利人:{{dzFgqData.qlr}}</li>
210 </tr> 229 <li>坐落:{{dzFgqData.zl}}</li>
211 <tr v-if="Object.keys(dzFgqData)==0"> 230 </ul>
212 <td colspan="7"> 231 </div>
213 <span class="noData">暂无数据</span> 232 <div class="zxx">
214 </td> 233 <div class="dz">
215 </tr> 234 <div class="title">
216 <tr v-else> 235 <span class="title">多幢信息({{zdZxx.zrzList.length}}个)</span>
217 <td class="xh">1</td> 236 </div>
218 <td class="zddm"><input type="text" class="formInput" v-model="dzFgqData.zddm" 237 <ul>
219 readonly="readonly"/> 238 <li v-for="(item,index) in zdZxx.zrzList" :key="index">{{item.xmmc}}</li>
220 </td> 239 </ul>
221 <td class="bdcdyh"><input type="text" class="formInput" v-model="dzFgqData.bdcdyh" 240 </div>
222 readonly="readonly"/> 241 <div class="zrz">
223 </td> 242 <div class="title">
224 <td class="xmmc"><input type="text" class="formInput" v-model="dzFgqData.xmmc" 243 <span class="title">自然幢信息({{zdZxx.dzList.length}}个)</span>
225 readonly="readonly"/> 244 </div>
226 </td> 245 <ul>
227 <td class="bdcqzh"><input type="text" class="formInput" v-model="dzFgqData.bdcqzh" 246 <li v-for="(item,index) in zdZxx.dzList" :key="index"
228 readonly="readonly"/> 247 :class="(index+1)%2==0?'':'border'">{{item.xmmc}}
229 </td> 248 </li>
230 <td class="qlr"><input type="text" class="formInput" v-model="dzFgqData.qlr" 249 </ul>
231 readonly="readonly"/> 250 </div>
232 </td> 251 </div>
233 <td class="zl"><input type="text" class="formInput" v-model="dzFgqData.zl"
234 readonly="readonly"/></td>
235 </tr>
236 </table>
237 </div> 252 </div>
238 <div class="fgh"> 253 <div class="fgh">
239 <span class="tips">分割后多幢信息</span> 254 <span class="tips">分割后多幢信息</span>
...@@ -386,45 +401,39 @@ ...@@ -386,45 +401,39 @@
386 </el-tab-pane> 401 </el-tab-pane>
387 <el-tab-pane label="户分割" name="h"> 402 <el-tab-pane label="户分割" name="h">
388 <div class="fg-tabs"> 403 <div class="fg-tabs">
389 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
390 <div class="table">
391 <span class="tips">分割前户信息</span> 404 <span class="tips">分割前户信息</span>
392 <table border="1"> 405 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
393 <tr> 406 <div class="fgq">
394 <th class="xh">序号</th> 407 <div class="data">
395 <th class="zddm">宗地代码</th> 408 <ul>
396 <th class="bdcdyh">不动产单元号</th> 409 <li>宗地代码:{{zdFgqData.zddm}}</li>
397 <th class="xmmc">项目名称</th> 410 <li>不动产单元号:{{zdFgqData.bdcdyh}}</li>
398 <th class="bdcqzh">不动产权证号</th> 411 <li>项目名称:{{zdFgqData.xmmc}}</li>
399 <th class="qlr">权利人</th> 412 <li>不动产权证号:{{zdFgqData.bdcqzh}}</li>
400 <th class="zl">坐落</th> 413 <li>权利人:{{zdFgqData.qlr}}</li>
401 </tr> 414 <li>坐落:{{zdFgqData.zl}}</li>
402 <tr v-if="Object.keys(hFgqData)==0"> 415 </ul>
403 <td colspan="7"> 416 </div>
404 <span class="noData">暂无数据</span> 417 <div class="zxx">
405 </td> 418 <div class="dz">
406 </tr> 419 <div class="title">
407 <tr v-else> 420 <span>多幢信息({{zdZxx.zrzList.length}}个)</span>
408 <td class="xh">1</td> 421 </div>
409 <td class="zddm"><input type="text" class="formInput" v-model="hFgqData.zddm" 422 <ul>
410 readonly="readonly"/> 423 <li v-for="(item,index) in zdZxx.zrzList" :key="index">{{item.xmmc}}</li>
411 </td> 424 </ul>
412 <td class="bdcdyh"><input type="text" class="formInput" v-model="hFgqData.bdcdyh" 425 </div>
413 readonly="readonly"/> 426 <div class="zrz">
414 </td> 427 <div class="title">
415 <td class="xmmc"><input type="text" class="formInput" v-model="hFgqData.xmmc" 428 <span>自然幢信息({{zdZxx.dzList.length}}个)</span>
416 readonly="readonly"/> 429 </div>
417 </td> 430 <ul>
418 <td class="bdcqzh"><input type="text" class="formInput" v-model="hFgqData.bdcqzh" 431 <li v-for="(item,index) in zdZxx.dzList" :key="index"
419 readonly="readonly"/> 432 :class="(index+1)%2==0?'':'border'">{{item.xmmc}}
420 </td> 433 </li>
421 <td class="qlr"><input type="text" class="formInput" v-model="hFgqData.qlr" 434 </ul>
422 readonly="readonly"/> 435 </div>
423 </td> 436 </div>
424 <td class="zl"><input type="text" class="formInput" v-model="hFgqData.zl"
425 readonly="readonly"/></td>
426 </tr>
427 </table>
428 </div> 437 </div>
429 <div class="fgh"> 438 <div class="fgh">
430 <span class="tips">分割后户信息</span> 439 <span class="tips">分割后户信息</span>
...@@ -587,8 +596,8 @@ ...@@ -587,8 +596,8 @@
587 getListByPbsm, 596 getListByPbsm,
588 getDdicByMC 597 getDdicByMC
589 } from "./../../../../api/common"; 598 } from "./../../../../api/common";
590 import {getQjZdjbxxDetailById,zdfg} from './../../../../api/zd' 599 import {getQjZdjbxxDetailById, zdfg, getZrz} from './../../../../api/zd'
591 import {getZdxx,ZdfggetZxx} from './../../../../api/dz' 600 import {getZdxx, ZdfggetZxx} from './../../../../api/dz'
592 import {getHZdxx} from './../../../../api/h' 601 import {getHZdxx} from './../../../../api/h'
593 import QueryData from './../../../../components/queryData/queryData' 602 import QueryData from './../../../../components/queryData/queryData'
594 import zdQueryData from './../../../../components/zdQueryData/zdQueryData' 603 import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
...@@ -607,7 +616,11 @@ ...@@ -607,7 +616,11 @@
607 zdFgqData: {}, // 宗地分割前数据 616 zdFgqData: {}, // 宗地分割前数据
608 dzFgqData: {}, //多幢分割前数据 617 dzFgqData: {}, //多幢分割前数据
609 hFgqData: {}, // 户分割前数据 618 hFgqData: {}, // 户分割前数据
610 zdZxx:{}, // 宗地选择幢 619 zdZxx: {
620 zrzList: [],
621 dzList: []
622 }, // 宗地选择幢
623 zdAllZrz: [],
611 xzq: [], 624 xzq: [],
612 djq: [], 625 djq: [],
613 djzq: [], 626 djzq: [],
...@@ -709,11 +722,27 @@ ...@@ -709,11 +722,27 @@
709 }) 722 })
710 }, 723 },
711 methods: { 724 methods: {
712 ZdgetDzXx(zdbsm){ 725 xzDz(bsm,index){
713 ZdfggetZxx(zdbsm).then(res=>{ 726 this.zdFghData.newZdlist.fwlist[index].push({
727 zbsm:bsm,
728 ztype:'dz'
729 })
730 console.log(this.zdFghData,'zdFghData')
731 },
732 xzZrz(bsm,index){
733 this.zdFghData.newZdlist.fwlist[index].push({
734 zbsm:bsm,
735 ztype:'zrz'
736 })
737 console.log(this.zdFghData,'zdFghData')
738 },
739 handleCommand(command) {
740 this.$message('click on item ' + command);
741 },
742 ZdgetDzXx(zdbsm) {
743 ZdfggetZxx(zdbsm).then(res => {
714 if (res.success) { 744 if (res.success) {
715 this.zdZxx=res.result; 745 this.zdZxx = res.result;
716 console.log(res.result,"宗地分割多幢信息");
717 } 746 }
718 }) 747 })
719 }, 748 },
...@@ -788,8 +817,8 @@ ...@@ -788,8 +817,8 @@
788 this.checkedData.fwlist = [{zbsm: '', ztype: ''}] 817 this.checkedData.fwlist = [{zbsm: '', ztype: ''}]
789 }) 818 })
790 }, 819 },
791 getDzZdjbxx(id){ 820 getDzZdjbxx(id) {
792 getZdxx(id).then(res=>{ 821 getZdxx(id).then(res => {
793 this.checkedData = res.result 822 this.checkedData = res.result
794 // 用户bsm暂时传空 823 // 用户bsm暂时传空
795 this.checkedData.userbsm = '' 824 this.checkedData.userbsm = ''
...@@ -797,8 +826,8 @@ ...@@ -797,8 +826,8 @@
797 this.checkedData.fwlist = [{zbsm: '', ztype: ''}] 826 this.checkedData.fwlist = [{zbsm: '', ztype: ''}]
798 }) 827 })
799 }, 828 },
800 getHZdxx(id){ 829 getHZdxx(id) {
801 getHZdxx(id).then(res=>{ 830 getHZdxx(id).then(res => {
802 this.checkedData = res.result 831 this.checkedData = res.result
803 // 用户bsm暂时传空 832 // 用户bsm暂时传空
804 this.checkedData.userbsm = '' 833 this.checkedData.userbsm = ''
...@@ -995,7 +1024,7 @@ ...@@ -995,7 +1024,7 @@
995 hFgqData: { 1024 hFgqData: {
996 handler: function (item) { 1025 handler: function (item) {
997 this.hFgqData.oldZdbsm = item.glbsm; 1026 this.hFgqData.oldZdbsm = item.glbsm;
998 console.log(item.glbsm,"户bsm") 1027 console.log(item.glbsm, "户bsm")
999 this.getHZdxx(item.glbsm); 1028 this.getHZdxx(item.glbsm);
1000 }, 1029 },
1001 deep: true 1030 deep: true
...@@ -1057,6 +1086,79 @@ ...@@ -1057,6 +1086,79 @@
1057 z-index: 99 !important; 1086 z-index: 99 !important;
1058 } 1087 }
1059 1088
1089 .fgq {
1090 margin-left: 20px;
1091 margin-top: 20px;
1092 display: flex;
1093 flex-direction: column;
1094 flex-flow: nowrap;
1095 .data {
1096 background-color: white;
1097 height: 180px;
1098 overflow: auto;
1099 ul {
1100 li {
1101 padding: 5px;
1102 line-height: 20px;
1103 }
1104 }
1105 }
1106 .zxx {
1107 display: flex;
1108 flex-direction: column;
1109 flex-flow: nowrap;
1110 background-color: white;
1111 .title {
1112 color: red;
1113 text-align: center;
1114 }
1115 .dz {
1116 width: 33%;
1117 border-right: 1px solid #000;
1118 height: 180px;
1119 overflow: auto;
1120 ul {
1121 overflow: auto;
1122 li {
1123 padding: 5px;
1124 text-align: center;
1125 line-height: 20px;
1126
1127 }
1128 }
1129 }
1130 .zrz {
1131 width: 66%;
1132 height: 180px;
1133 overflow: auto;
1134 ul {
1135 li {
1136 padding: 5px;
1137 width: 48%;
1138 text-align: center;
1139 display: inline-block;
1140
1141 }
1142 }
1143 }
1144 }
1145 }
1146
1147 .border {
1148 border-right: 1px solid #000;
1149 }
1150
1151 .fgq .data {
1152 width: 30%;
1153 border: 1px solid #000;
1154 }
1155
1156 .fgq .zxx {
1157 width: 67%;
1158 margin-left: 20px;
1159 border: 1px solid #000;
1160 }
1161
1060 .fg-tabs { 1162 .fg-tabs {
1061 height: auto; 1163 height: auto;
1062 width: 100%; 1164 width: 100%;
...@@ -1067,10 +1169,10 @@ ...@@ -1067,10 +1169,10 @@
1067 padding: 18px; 1169 padding: 18px;
1068 } 1170 }
1069 .addBtn { 1171 .addBtn {
1070 position: absolute; 1172 /* position: absolute;
1071 right: 30px; 1173 right: 30px;
1072 top: -46px; 1174 top: -46px;
1073 z-index: 999; 1175 z-index: 999;*/
1074 } 1176 }
1075 table { 1177 table {
1076 margin-top: 10px; 1178 margin-top: 10px;
...@@ -1116,7 +1218,7 @@ ...@@ -1116,7 +1218,7 @@
1116 } 1218 }
1117 .fgh { 1219 .fgh {
1118 box-sizing: border-box; 1220 box-sizing: border-box;
1119 padding: 0 18px; 1221 /*padding: 0 18px;*/
1120 margin-top: 10px; 1222 margin-top: 10px;
1121 } 1223 }
1122 .header-button { 1224 .header-button {
...@@ -1134,6 +1236,7 @@ ...@@ -1134,6 +1236,7 @@
1134 } 1236 }
1135 .tips { 1237 .tips {
1136 color: #9B9B9B; 1238 color: #9B9B9B;
1239 margin-left: 20px;
1137 } 1240 }
1138 } 1241 }
1139 1242
......