Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
7fcc0686 by 杨威
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents b5105c8a a6c7c8f5
Inline Side-by-side
Showing 4 changed files with 185 additions and 63 deletions
...@@ -231,3 +231,13 @@ export function getZrz(zdBsm) { ...@@ -231,3 +231,13 @@ export function getZrz(zdBsm) {
231 }) 231 })
232 } 232 }
233 233
234 /**
235 * 宗地合并
236 */
237 export function ZdHb(data) {
238 return request({
239 url:"/bg/zdSplitMerge/zdHb",
240 method:'post',
241 data:data
242 })
243 }
......
...@@ -19,19 +19,21 @@ ...@@ -19,19 +19,21 @@
19 <div class="zxx"> 19 <div class="zxx">
20 <div class="dz"> 20 <div class="dz">
21 <div class="title"> 21 <div class="title">
22 <span>多幢信息({{zdZxx.zrzList.length}}个)</span> 22 <span>多幢信息({{zdZxx.dzList.length}}个)</span>
23 </div> 23 </div>
24 <ul> 24 <ul>
25 <li v-for="(item,index) in zdZxx.zrzList" :key="index">{{item.xmmc}}</li> 25 <li v-for="(item,index) in zdZxx.dzList" :key="index"
26 :class="[{'border':'((index+1)%2) == 0'},{'nosearch':!zdDzList.includes(item)}]"
27 >{{item.displays}}</li>
26 </ul> 28 </ul>
27 </div> 29 </div>
28 <div class="zrz"> 30 <div class="zrz">
29 <div class="title"> 31 <div class="title">
30 <span>自然幢信息({{zdZxx.dzList.length}}个)</span> 32 <span>自然幢信息({{zdZxx.zrzList.length}}个)</span>
31 </div> 33 </div>
32 <ul> 34 <ul>
33 <li v-for="(item,index) in zdZxx.dzList" :key="index" 35 <li v-for="(item,index) in zdZxx.zrzList" :key="index"
34 :class="(index+1)%2==0?'':'border'">{{item.xmmc}} 36 :class="[{'border':'((index+1)%2) == 0'},{'nosearch':!zdZrzList.includes(item)}]">{{item.displays}}
35 </li> 37 </li>
36 </ul> 38 </ul>
37 </div> 39 </div>
...@@ -49,6 +51,7 @@ ...@@ -49,6 +51,7 @@
49 <th class="tdtzm">土地特征码</th> 51 <th class="tdtzm">土地特征码</th>
50 <th class="xmmc">项目名称</th> 52 <th class="xmmc">项目名称</th>
51 <th class="zxx">幢信息</th> 53 <th class="zxx">幢信息</th>
54 <th class="">选择</th>
52 </tr> 55 </tr>
53 <tr v-for="(item,index) in zdFghData.newZdlist" :key="index"> 56 <tr v-for="(item,index) in zdFghData.newZdlist" :key="index">
54 <td class="cz"> 57 <td class="cz">
...@@ -114,33 +117,36 @@ ...@@ -114,33 +117,36 @@
114 <input type="text" v-model="item.xmmc" class="formInput"/> 117 <input type="text" v-model="item.xmmc" class="formInput"/>
115 </td> 118 </td>
116 <td class="zxx"> 119 <td class="zxx">
117 <!--<el-select placeholder="请选择多幢" @change="xzDz(i.bsm,index)" v-model="zdFghData.newZdlist.fwlist[1].zbsm"> 120 <span>多幢:</span>
118 <el-option 121 <ul>
119 v-for="i in zdZxx.dzList" 122 <li v-for="(dzItem,dzIndex) in item.dz" :key="dzIndex">{{dzItem}}</li>
120 :key="i.bsm" 123 </ul>
121 :label="i.xmmc" 124 <span>自然幢:</span>
122 :value="i.bsm"> 125 <ul>
123 </el-option> 126 <li v-for="(dzItem,dzIndex) in item.zrz" :key="dzIndex">{{dzItem}}</li>
124 </el-select> 127 </ul>
125 <el-select placeholder="请选择自然幢" @change="xzZrz(i.bsm,index)" v-model="zdFghData.newZdlist.fwlist[1].zbsm"> 128 </td>
126 <el-option 129 <td class="">
127 v-for="i in zdZxx.zrzList" 130 <el-dropdown @command="dzHandleCommand($event,index)">
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"> 131 <span class="el-dropdown-link">
136 选择多幢<i class="el-icon-arrow-down el-icon--right"></i> 132 选择多幢<i class="el-icon-arrow-down el-icon--right"></i>
137 </span> 133 </span>
138 <el-dropdown-menu slot="dropdown" > 134 <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> 135 <el-dropdown-item v-for="(childItem,childIndex) in zdDzList"
140 <!--<el-dropdown-item command="b">狮子头</el-dropdown-item> 136 :key="childIndex" :command="childItem.bsm">
141 <el-dropdown-item command="c">螺蛳粉</el-dropdown-item> 137 {{childItem.xmmc}}
142 <el-dropdown-item command="d" disabled>双皮奶</el-dropdown-item> 138 </el-dropdown-item>
143 <el-dropdown-item command="e" divided>蚵仔煎</el-dropdown-item>--> 139 </el-dropdown-menu>
140 </el-dropdown>
141 <el-dropdown @command="zrzHandleCommand($event,index)">
142 <span class="el-dropdown-link">
143 选择自然幢<i class="el-icon-arrow-down el-icon--right"></i>
144 </span>
145 <el-dropdown-menu slot="dropdown">
146 <el-dropdown-item v-for="(childItem,childIndex) in zdZrzList"
147 :key="childIndex" :command="childItem.bsm">
148 {{childItem.xmmc}}
149 </el-dropdown-item>
144 </el-dropdown-menu> 150 </el-dropdown-menu>
145 </el-dropdown> 151 </el-dropdown>
146 </td> 152 </td>
...@@ -616,6 +622,8 @@ ...@@ -616,6 +622,8 @@
616 zdFgqData: {}, // 宗地分割前数据 622 zdFgqData: {}, // 宗地分割前数据
617 dzFgqData: {}, //多幢分割前数据 623 dzFgqData: {}, //多幢分割前数据
618 hFgqData: {}, // 户分割前数据 624 hFgqData: {}, // 户分割前数据
625 zdZrzList: [], // 宗地自然幢集合
626 zdDzList: [], // 宗地多幢集合
619 zdZxx: { 627 zdZxx: {
620 zrzList: [], 628 zrzList: [],
621 dzList: [] 629 dzList: []
...@@ -722,27 +730,72 @@ ...@@ -722,27 +730,72 @@
722 }) 730 })
723 }, 731 },
724 methods: { 732 methods: {
725 xzDz(bsm,index){ 733 // 重置数据
734 result(){
735 switch (this.tabName) {
736 case "zd":
737 this.zdFghData={
738 oldZdbsm: "",
739 newZdlist: []
740 }
741 break
742 case "dz":
743 this.dzFghData={
744 oldZdbsm: "",
745 newZdlist: []
746 }
747 break
748 case "h":
749 this.hFghData={
750 oldZdbsm: "",
751 newZdlist: []
752 }
753 break;
754 default:
755 break
756 }
757 },
758 xzDz(bsm, index) {
726 this.zdFghData.newZdlist.fwlist[index].push({ 759 this.zdFghData.newZdlist.fwlist[index].push({
727 zbsm:bsm, 760 zbsm: bsm,
728 ztype:'dz' 761 ztype: 'dz'
729 }) 762 })
730 console.log(this.zdFghData,'zdFghData') 763 console.log(this.zdFghData, 'zdFghData')
731 }, 764 },
732 xzZrz(bsm,index){ 765 xzZrz(bsm, index) {
733 this.zdFghData.newZdlist.fwlist[index].push({ 766 this.zdFghData.newZdlist.fwlist[index].push({
734 zbsm:bsm, 767 zbsm: bsm,
735 ztype:'zrz' 768 ztype: 'zrz'
736 }) 769 })
737 console.log(this.zdFghData,'zdFghData') 770 console.log(this.zdFghData, 'zdFghData')
738 }, 771 },
739 handleCommand(command) { 772 dzHandleCommand(command, index) {
740 this.$message('click on item ' + command); 773 console.log(command,"============")
774 let item = this.zdDzList.filter(i => i.bsm == command)[0];
775 console.log(item,"item........")
776 console.log(this.zdDzList,"zdDzlist")
777 this.zdFghData.newZdlist[index].fwlist.push({
778 zbsm: command,
779 ztype: 'dz'
780 });
781 this.zdFghData.newZdlist[index].dz.push(item.xmmc)
782 this.zdDzList = this.zdDzList.filter(i => i.bsm !== command);
783 },
784 zrzHandleCommand(command, index) {
785 let item = this.zdZrzList.filter(i => i.bsm == command)[0];
786 this.zdFghData.newZdlist[index].fwlist.push({
787 zbsm: command,
788 ztype: 'zrz'
789 })
790 this.zdFghData.newZdlist[index].zrz.push(item.xmmc)
791 this.zdZrzList = this.zdZrzList.filter(i => i.bsm !== command);
741 }, 792 },
742 ZdgetDzXx(zdbsm) { 793 ZdgetDzXx(zdbsm) {
743 ZdfggetZxx(zdbsm).then(res => { 794 ZdfggetZxx(zdbsm).then(res => {
744 if (res.success) { 795 if (res.success) {
745 this.zdZxx = res.result; 796 this.zdZxx = res.result;
797 this.zdZrzList = res.result.zrzList
798 this.zdDzList = res.result.dzList
746 } 799 }
747 }) 800 })
748 }, 801 },
...@@ -813,8 +866,10 @@ ...@@ -813,8 +866,10 @@
813 this.checkedData = res.result 866 this.checkedData = res.result
814 // 用户bsm暂时传空 867 // 用户bsm暂时传空
815 this.checkedData.userbsm = '' 868 this.checkedData.userbsm = ''
869 this.checkedData.dz=[],
870 this.checkedData.zrz=[],
816 // fwlist 暂时传空 871 // fwlist 暂时传空
817 this.checkedData.fwlist = [{zbsm: '', ztype: ''}] 872 this.checkedData.fwlist = []
818 }) 873 })
819 }, 874 },
820 getDzZdjbxx(id) { 875 getDzZdjbxx(id) {
...@@ -822,8 +877,10 @@ ...@@ -822,8 +877,10 @@
822 this.checkedData = res.result 877 this.checkedData = res.result
823 // 用户bsm暂时传空 878 // 用户bsm暂时传空
824 this.checkedData.userbsm = '' 879 this.checkedData.userbsm = ''
880 this.checkedData.dz=[],
881 this.checkedData.zrz=[],
825 // fwlist 暂时传空 882 // fwlist 暂时传空
826 this.checkedData.fwlist = [{zbsm: '', ztype: ''}] 883 this.checkedData.fwlist = []
827 }) 884 })
828 }, 885 },
829 getHZdxx(id) { 886 getHZdxx(id) {
...@@ -831,8 +888,10 @@ ...@@ -831,8 +888,10 @@
831 this.checkedData = res.result 888 this.checkedData = res.result
832 // 用户bsm暂时传空 889 // 用户bsm暂时传空
833 this.checkedData.userbsm = '' 890 this.checkedData.userbsm = ''
891 this.checkedData.dz=[],
892 this.checkedData.zrz=[],
834 // fwlist 暂时传空 893 // fwlist 暂时传空
835 this.checkedData.fwlist = [{zbsm: '', ztype: ''}] 894 this.checkedData.fwlist = []
836 }) 895 })
837 }, 896 },
838 getzdtzm() { 897 getzdtzm() {
...@@ -911,12 +970,7 @@ ...@@ -911,12 +970,7 @@
911 syqlxbsm: "", 970 syqlxbsm: "",
912 zdtzmbsm: "", 971 zdtzmbsm: "",
913 userbsm: "", 972 userbsm: "",
914 fwlist: [ 973 fwlist: []
915 {
916 zbsm: "",
917 ztype: ""
918 }
919 ]
920 }); 974 });
921 this.changeXzq(this.checkedData.xzqbsm) 975 this.changeXzq(this.checkedData.xzqbsm)
922 this.changeDjq(this.checkedData.djqbsm) 976 this.changeDjq(this.checkedData.djqbsm)
...@@ -931,12 +985,7 @@ ...@@ -931,12 +985,7 @@
931 syqlxbsm: "", 985 syqlxbsm: "",
932 zdtzmbsm: "", 986 zdtzmbsm: "",
933 userbsm: "", 987 userbsm: "",
934 fwlist: [ 988 fwlist: []
935 {
936 zbsm: "",
937 ztype: ""
938 }
939 ]
940 }); 989 });
941 this.changeXzq(this.checkedData.xzqbsm) 990 this.changeXzq(this.checkedData.xzqbsm)
942 this.changeDjq(this.checkedData.djqbsm) 991 this.changeDjq(this.checkedData.djqbsm)
...@@ -951,12 +1000,7 @@ ...@@ -951,12 +1000,7 @@
951 syqlxbsm: "", 1000 syqlxbsm: "",
952 zdtzmbsm: "", 1001 zdtzmbsm: "",
953 userbsm: "", 1002 userbsm: "",
954 fwlist: [ 1003 fwlist: []
955 {
956 zbsm: "",
957 ztype: ""
958 }
959 ]
960 }); 1004 });
961 this.changeXzq(this.checkedData.xzqbsm) 1005 this.changeXzq(this.checkedData.xzqbsm)
962 this.changeDjq(this.checkedData.djqbsm) 1006 this.changeDjq(this.checkedData.djqbsm)
...@@ -985,6 +1029,7 @@ ...@@ -985,6 +1029,7 @@
985 this.centerDialogVisible = false; 1029 this.centerDialogVisible = false;
986 }, 1030 },
987 newAdd: function () { 1031 newAdd: function () {
1032 this.result();
988 this.centerDialogVisible = true; 1033 this.centerDialogVisible = true;
989 }, 1034 },
990 getData: function (data) { 1035 getData: function (data) {
...@@ -1123,7 +1168,6 @@ ...@@ -1123,7 +1168,6 @@
1123 padding: 5px; 1168 padding: 5px;
1124 text-align: center; 1169 text-align: center;
1125 line-height: 20px; 1170 line-height: 20px;
1126
1127 } 1171 }
1128 } 1172 }
1129 } 1173 }
...@@ -1137,7 +1181,6 @@ ...@@ -1137,7 +1181,6 @@
1137 width: 48%; 1181 width: 48%;
1138 text-align: center; 1182 text-align: center;
1139 display: inline-block; 1183 display: inline-block;
1140
1141 } 1184 }
1142 } 1185 }
1143 } 1186 }
...@@ -1219,7 +1262,12 @@ ...@@ -1219,7 +1262,12 @@
1219 .fgh { 1262 .fgh {
1220 box-sizing: border-box; 1263 box-sizing: border-box;
1221 /*padding: 0 18px;*/ 1264 /*padding: 0 18px;*/
1265 height: 480px;
1266 overflow: auto;
1222 margin-top: 10px; 1267 margin-top: 10px;
1268 table{
1269 margin: 0 20px ;
1270 }
1223 } 1271 }
1224 .header-button { 1272 .header-button {
1225 height: 50px; 1273 height: 50px;
...@@ -1259,4 +1307,7 @@ ...@@ -1259,4 +1307,7 @@
1259 .xzq, .djq, .djzq { 1307 .xzq, .djq, .djzq {
1260 width: 150px; 1308 width: 150px;
1261 } 1309 }
1310 .nosearch{
1311 color: #BBB !important;
1312 }
1262 </style> 1313 </style>
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
15 <td class="bdcqzh">不动产权证号</td> 15 <td class="bdcqzh">不动产权证号</td>
16 <td class="qlr">权利人</td> 16 <td class="qlr">权利人</td>
17 <td class="zl">坐落</td> 17 <td class="zl">坐落</td>
18 <td class="cz">操作</td>
18 </tr> 19 </tr>
19 <tr v-if="zdhbqData.length==0"> 20 <tr v-if="zdhbqData.length==0">
20 <td colspan="7"> 21 <td colspan="7">
...@@ -35,6 +36,7 @@ ...@@ -35,6 +36,7 @@
35 readonly="readonly"/></td> 36 readonly="readonly"/></td>
36 <td class="zl"><input type="text" class="formInput" v-model="item.zl" 37 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
37 readonly="readonly"/></td> 38 readonly="readonly"/></td>
39 <td class="cz" @click="deleteData(index)"><span>删除</span></td>
38 </tr> 40 </tr>
39 </table> 41 </table>
40 </div> 42 </div>
...@@ -114,7 +116,7 @@ ...@@ -114,7 +116,7 @@
114 @close="close"></zd-query-data> 116 @close="close"></zd-query-data>
115 117
116 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 118 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
117 <el-button type="primary" class="saveBtn">保存</el-button> 119 <el-button type="primary" class="saveBtn" @click="save">保存</el-button>
118 </div> 120 </div>
119 </div> 121 </div>
120 </el-tab-pane> 122 </el-tab-pane>
...@@ -361,6 +363,7 @@ ...@@ -361,6 +363,7 @@
361 getListByPbsm, 363 getListByPbsm,
362 getDdicByMC 364 getDdicByMC
363 } from "./../../../../api/common"; 365 } from "./../../../../api/common";
366 import {ZdHb} from "./../../../../api/zd"
364 import QueryData from './../../../../components/queryData/queryData' 367 import QueryData from './../../../../components/queryData/queryData'
365 import zdQueryData from './../../../../components/zdQueryData/zdQueryData' 368 import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
366 369
...@@ -409,6 +412,64 @@ ...@@ -409,6 +412,64 @@
409 }) 412 })
410 }, 413 },
411 methods: { 414 methods: {
415 save(){
416 switch (this.tabName) {
417 case "zd":
418 this.zdHb();
419 break
420 case "dz":
421 break
422 case "h":
423 break;
424 default:
425 break
426 }
427 },
428 zdHb(){
429 let oldBsm= this.zdhbqData.map(function (item,index) {
430 return item.zdbsm;
431 }).join(",")
432 let data={
433 newzddjqbsm: this.zdhbhData.djqbsm,
434 newzddjzqbsm: this.zdhbhData.djzqbsm,
435 newzdsyqlxbsm: this.zdhbqData.syqlxbsm,
436 newzduserbsm: "",
437 newzdxmmc: this.zdhbqData.xmmc,
438 newzdxzqbsm: this.zdhbqData.xzqbsm,
439 newzdzdtzmbsm: this.zdhbqData.zdtzmbsm,
440 oldzdbsms: oldBsm
441 }
442 console.log(this.zdhbhData,"宗地合并后数据");
443 console.log(this.zdhbqData,"宗地合并前数据")
444 ZdHb(data).then(res=>{
445 if (res.success) {
446 this.$message.success("合并成功")
447 }else {
448 this.$message.error("合并失败")
449 }
450 })
451 },
452 dzHb(){
453
454 },
455 hHb(){
456
457 },
458 deleteData(index){
459 switch (this.tabName) {
460 case "zd":
461 this.zdhbqData.splice(index,1)
462 break
463 case "dz":
464 this.dzhbqData.splice(index,1)
465 break
466 case "h":
467 this.hhbqData.splice(index,1)
468 break
469 default:
470 break
471 }
472 },
412 getzdtzm() { 473 getzdtzm() {
413 getDdicByMC('宗地（宗海）特征码').then(res => { 474 getDdicByMC('宗地（宗海）特征码').then(res => {
414 this.tdtzm = res.result 475 this.tdtzm = res.result
......