Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
7d457289 by 焦泽平
Options

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

2 parents 6fed58f4 a6c7c8f5
Inline Side-by-side
Showing 4 changed files with 111 additions and 26 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 }
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 </el-col> 21 </el-col>
22 <el-col :span="8"> 22 <el-col :span="8">
23 <el-form-item label="不动产单元号"> 23 <el-form-item label="不动产单元号">
24 <el-input 24 <el-input
25 maxlength="28" 25 maxlength="28"
26 v-model="queryData.bdcdyh" 26 v-model="queryData.bdcdyh"
27 placeholder="输入不动产单元号" 27 placeholder="输入不动产单元号"
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
23 </div> 23 </div>
24 <ul> 24 <ul>
25 <li v-for="(item,index) in zdZxx.dzList" :key="index" 25 <li v-for="(item,index) in zdZxx.dzList" :key="index"
26 :class="[{'border':'((index+1)%2) == 0'},{'nosearch':zdDzList.includes(item)}]" 26 :class="[{'border':'((index+1)%2) == 0'},{'nosearch':!zdDzList.includes(item)}]"
27 >{{item.xmmc}}</li> 27 >{{item.displays}}</li>
28 </ul> 28 </ul>
29 </div> 29 </div>
30 <div class="zrz"> 30 <div class="zrz">
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 </div> 33 </div>
34 <ul> 34 <ul>
35 <li v-for="(item,index) in zdZxx.zrzList" :key="index" 35 <li v-for="(item,index) in zdZxx.zrzList" :key="index"
36 :class="[{'border':'((index+1)%2) == 0'},{'nosearch':zdZrzList.includes(item)}]">{{item.xmmc}} 36 :class="[{'border':'((index+1)%2) == 0'},{'nosearch':!zdZrzList.includes(item)}]">{{item.displays}}
37 </li> 37 </li>
38 </ul> 38 </ul>
39 </div> 39 </div>
...@@ -730,6 +730,31 @@ ...@@ -730,6 +730,31 @@
730 }) 730 })
731 }, 731 },
732 methods: { 732 methods: {
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 },
733 xzDz(bsm, index) { 758 xzDz(bsm, index) {
734 this.zdFghData.newZdlist.fwlist[index].push({ 759 this.zdFghData.newZdlist.fwlist[index].push({
735 zbsm: bsm, 760 zbsm: bsm,
...@@ -945,12 +970,7 @@ ...@@ -945,12 +970,7 @@
945 syqlxbsm: "", 970 syqlxbsm: "",
946 zdtzmbsm: "", 971 zdtzmbsm: "",
947 userbsm: "", 972 userbsm: "",
948 fwlist: [ 973 fwlist: []
949 /* {
950 zbsm: "",
951 ztype: ""
952 }*/
953 ]
954 }); 974 });
955 this.changeXzq(this.checkedData.xzqbsm) 975 this.changeXzq(this.checkedData.xzqbsm)
956 this.changeDjq(this.checkedData.djqbsm) 976 this.changeDjq(this.checkedData.djqbsm)
...@@ -965,12 +985,7 @@ ...@@ -965,12 +985,7 @@
965 syqlxbsm: "", 985 syqlxbsm: "",
966 zdtzmbsm: "", 986 zdtzmbsm: "",
967 userbsm: "", 987 userbsm: "",
968 fwlist: [ 988 fwlist: []
969 {
970 zbsm: "",
971 ztype: ""
972 }
973 ]
974 }); 989 });
975 this.changeXzq(this.checkedData.xzqbsm) 990 this.changeXzq(this.checkedData.xzqbsm)
976 this.changeDjq(this.checkedData.djqbsm) 991 this.changeDjq(this.checkedData.djqbsm)
...@@ -985,12 +1000,7 @@ ...@@ -985,12 +1000,7 @@
985 syqlxbsm: "", 1000 syqlxbsm: "",
986 zdtzmbsm: "", 1001 zdtzmbsm: "",
987 userbsm: "", 1002 userbsm: "",
988 fwlist: [ 1003 fwlist: []
989 {
990 zbsm: "",
991 ztype: ""
992 }
993 ]
994 }); 1004 });
995 this.changeXzq(this.checkedData.xzqbsm) 1005 this.changeXzq(this.checkedData.xzqbsm)
996 this.changeDjq(this.checkedData.djqbsm) 1006 this.changeDjq(this.checkedData.djqbsm)
...@@ -1019,6 +1029,7 @@ ...@@ -1019,6 +1029,7 @@
1019 this.centerDialogVisible = false; 1029 this.centerDialogVisible = false;
1020 }, 1030 },
1021 newAdd: function () { 1031 newAdd: function () {
1032 this.result();
1022 this.centerDialogVisible = true; 1033 this.centerDialogVisible = true;
1023 }, 1034 },
1024 getData: function (data) { 1035 getData: function (data) {
...@@ -1157,7 +1168,6 @@ ...@@ -1157,7 +1168,6 @@
1157 padding: 5px; 1168 padding: 5px;
1158 text-align: center; 1169 text-align: center;
1159 line-height: 20px; 1170 line-height: 20px;
1160 color: #BBB;
1161 } 1171 }
1162 } 1172 }
1163 } 1173 }
...@@ -1171,7 +1181,6 @@ ...@@ -1171,7 +1181,6 @@
1171 width: 48%; 1181 width: 48%;
1172 text-align: center; 1182 text-align: center;
1173 display: inline-block; 1183 display: inline-block;
1174 color: #BBB;
1175 } 1184 }
1176 } 1185 }
1177 } 1186 }
...@@ -1253,7 +1262,12 @@ ...@@ -1253,7 +1262,12 @@
1253 .fgh { 1262 .fgh {
1254 box-sizing: border-box; 1263 box-sizing: border-box;
1255 /*padding: 0 18px;*/ 1264 /*padding: 0 18px;*/
1265 height: 480px;
1266 overflow: auto;
1256 margin-top: 10px; 1267 margin-top: 10px;
1268 table{
1269 margin: 0 20px ;
1270 }
1257 } 1271 }
1258 .header-button { 1272 .header-button {
1259 height: 50px; 1273 height: 50px;
...@@ -1294,6 +1308,6 @@ ...@@ -1294,6 +1308,6 @@
1294 width: 150px; 1308 width: 150px;
1295 } 1309 }
1296 .nosearch{ 1310 .nosearch{
1297 color: #000 !important; 1311 color: #BBB !important;
1298 } 1312 }
1299 </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
......