Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
b9128c2b by 杨威
Options

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

2 parents 7f039401 aaeee444
Inline Side-by-side
Showing 4 changed files with 79 additions and 11 deletions
...@@ -249,3 +249,13 @@ export function ZdHb(data) { ...@@ -249,3 +249,13 @@ export function ZdHb(data) {
249 }) 249 })
250 } 250 }
251 251
252 /**
253 * 多幢合并
254 */
255 export function dzHb(data) {
256 return request({
257 url:"/bg/dzSplitMerge/dzHb",
258 method:'post',
259 data:data
260 })
261 }
......
...@@ -11,13 +11,16 @@ ...@@ -11,13 +11,16 @@
11 <td class="bdcqzh">不动产权证号</td> 11 <td class="bdcqzh">不动产权证号</td>
12 <td class="qlr">权利人</td> 12 <td class="qlr">权利人</td>
13 <td class="zl">坐落</td> 13 <td class="zl">坐落</td>
14 <td class="zl">类型</td>
14 <td class=""> 15 <td class="">
16 多幢:
15 <el-button 17 <el-button
16 type="primary" 18 type="primary"
17 class="changeBtn outAdd addMinus" 19 class="changeBtn outAdd addMinus"
18 @click="newAddDz" 20 @click="newAddDz"
19 >+ 21 >+
20 </el-button> 22 </el-button>
23 自然幢:
21 <el-button 24 <el-button
22 type="primary" 25 type="primary"
23 class="changeBtn outAdd addMinus" 26 class="changeBtn outAdd addMinus"
...@@ -27,7 +30,7 @@ ...@@ -27,7 +30,7 @@
27 </td> 30 </td>
28 </tr> 31 </tr>
29 <tr v-if="dzhbqData.length==0"> 32 <tr v-if="dzhbqData.length==0">
30 <td colspan="8"> 33 <td colspan="9">
31 <span class="noData">暂无数据</span> 34 <span class="noData">暂无数据</span>
32 </td> 35 </td>
33 </tr> 36 </tr>
...@@ -39,6 +42,7 @@ ...@@ -39,6 +42,7 @@
39 <td class="bdcqzh">{{item.bdcqzh}}</td> 42 <td class="bdcqzh">{{item.bdcqzh}}</td>
40 <td class="qlr">{{item.qlr}}</td> 43 <td class="qlr">{{item.qlr}}</td>
41 <td class="zl">{{item.zl}}</td> 44 <td class="zl">{{item.zl}}</td>
45 <td class="zl">{{item.type=='zrz'?'自然幢':'多幢'}}</td>
42 <td class="cz"> 46 <td class="cz">
43 <el-button 47 <el-button
44 type="primary" 48 type="primary"
...@@ -60,7 +64,8 @@ ...@@ -60,7 +64,8 @@
60 <li> 64 <li>
61 <span class="label">行政区:</span> 65 <span class="label">行政区:</span>
62 <span class="value"> 66 <span class="value">
63 <el-select v-model="dzhbhData.xzqbsm" @change="changeXzq(dzhbhData.xzqbsm)"> 67 <el-select v-model="dzhbhData.xzqbsm" @change="changeXzq(dzhbhData.xzqbsm)"
68 disabled>
64 <el-option 69 <el-option
65 v-for="i in xzq" 70 v-for="i in xzq"
66 :key="i.bsm" 71 :key="i.bsm"
...@@ -73,7 +78,8 @@ ...@@ -73,7 +78,8 @@
73 <li> 78 <li>
74 <span class="label">地籍区:</span> 79 <span class="label">地籍区:</span>
75 <span class="value"> 80 <span class="value">
76 <el-select v-model="dzhbhData.djqbsm" @change="changeDjq(dzhbhData.djqbsm)"> 81 <el-select v-model="dzhbhData.djqbsm" @change="changeDjq(dzhbhData.djqbsm)"
82 disabled>
77 <el-option 83 <el-option
78 v-for="i in djq" 84 v-for="i in djq"
79 :key="i.bsm" 85 :key="i.bsm"
...@@ -86,7 +92,7 @@ ...@@ -86,7 +92,7 @@
86 <li> 92 <li>
87 <span class="label">地籍子区:</span> 93 <span class="label">地籍子区:</span>
88 <span class="value"> 94 <span class="value">
89 <el-select v-model="dzhbhData.djzqbsm" @change="$forceUpdate()"> 95 <el-select v-model="dzhbhData.djzqbsm" @change="$forceUpdate()" disabled>
90 <el-option 96 <el-option
91 v-for="i in djzq" 97 v-for="i in djzq"
92 :key="i.bsm" 98 :key="i.bsm"
...@@ -99,7 +105,7 @@ ...@@ -99,7 +105,7 @@
99 <li> 105 <li>
100 <span class="label">所有权类型:</span> 106 <span class="label">所有权类型:</span>
101 <span class="value"> 107 <span class="value">
102 <el-select v-model="dzhbhData.syqlxbsm"> 108 <el-select v-model="dzhbhData.syqlxbsm" disabled>
103 <el-option 109 <el-option
104 v-for="i in syq" 110 v-for="i in syq"
105 :key="i.value" 111 :key="i.value"
...@@ -112,7 +118,7 @@ ...@@ -112,7 +118,7 @@
112 <li> 118 <li>
113 <span class="label">宗地特征码:</span> 119 <span class="label">宗地特征码:</span>
114 <span class="value"> 120 <span class="value">
115 <el-select v-model="dzhbhData.zdtzmbsm"> 121 <el-select v-model="dzhbhData.zdtzmbsm" disabled>
116 <el-option 122 <el-option
117 v-for="i in $store.state.zdtzmList" 123 v-for="i in $store.state.zdtzmList"
118 :key="i.bsm" 124 :key="i.bsm"
...@@ -360,7 +366,7 @@ ...@@ -360,7 +366,7 @@
360 getDdicByMC 366 getDdicByMC
361 } from "@api/common"; 367 } from "@api/common";
362 import {dzList, zrzList} from './../../api/search' 368 import {dzList, zrzList} from './../../api/search'
363 import {getQjZdjbxxDetailById} from './../../api/zd' 369 import {getQjZdjbxxDetailById, dzHb} from './../../api/zd'
364 370
365 export default { 371 export default {
366 name: "dzHb", 372 name: "dzHb",
...@@ -448,6 +454,25 @@ ...@@ -448,6 +454,25 @@
448 } 454 }
449 }, 455 },
450 save() { 456 save() {
457 let data = {
458 fwlist: this.dzhbqData,
459 newdzxmmc: this.dzhbhData.xmmc,
460 zdbsm: this.zdbsm
461 }
462
463 dzHb(data).then(res => {
464 if (res.success) {
465 console.log(res)
466 this.$message.success("多幢合并成功")
467 this.$router.push({
468 path: '/dz',
469 query: {
470 source: 1,
471 bsm: res.result
472 }
473 })
474 }
475 })
451 }, 476 },
452 dzClose() { 477 dzClose() {
453 this.dzIsVisible = false; 478 this.dzIsVisible = false;
...@@ -494,6 +519,7 @@ ...@@ -494,6 +519,7 @@
494 this.$confirm('当前选择多幢不在同一宗地下,是否继续选择？') 519 this.$confirm('当前选择多幢不在同一宗地下,是否继续选择？')
495 .then(_ => { 520 .then(_ => {
496 this.dzList.push(data) 521 this.dzList.push(data)
522 data['type'] = 'dz'
497 this.addData(data) 523 this.addData(data)
498 return 524 return
499 }) 525 })
...@@ -502,6 +528,7 @@ ...@@ -502,6 +528,7 @@
502 }); 528 });
503 } else { 529 } else {
504 this.dzList.push(data); 530 this.dzList.push(data);
531 data['type'] = 'dz'
505 this.addData(data) 532 this.addData(data)
506 } 533 }
507 }, 534 },
...@@ -517,14 +544,16 @@ ...@@ -517,14 +544,16 @@
517 this.$confirm('当前选择多幢不在同一宗地下,是否继续选择？') 544 this.$confirm('当前选择多幢不在同一宗地下,是否继续选择？')
518 .then(_ => { 545 .then(_ => {
519 this.zrzList.push(data) 546 this.zrzList.push(data)
547 data['type'] = 'zrz'
520 this.addData(data) 548 this.addData(data)
521 return 549 return
522 }) 550 })
523 .catch(_ => { 551 .catch(_ => {
524 return 552 return
525 }); 553 });
526 }else { 554 } else {
527 this.zrzList.push(data) 555 this.zrzList.push(data)
556 data['type'] = 'zrz';
528 this.addData(data) 557 this.addData(data)
529 } 558 }
530 }, 559 },
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row> 8 <el-row>
9 <el-col :span="16" class="fl"> 9 <el-col :span="16" class="fl">
10 <el-radio-group v-model="gyfs"> 10 <el-radio-group v-model="gyfs">
11 <el-radio :label="item.bsm" :disabled="qszt!='0'" :key="item.bsm" v-for="item in $store.state.gyfsList">{{item.mc}}</el-radio> 11 <el-radio :label="item.bsm" :disabled="qszt!='0' || item.disabled" :key="item.bsm" v-for="item in gyfsList">{{item.mc}}</el-radio>
12 </el-radio-group> 12 </el-radio-group>
13 </el-col> 13 </el-col>
14 <el-col :span="4" class="fr" v-show="qszt=='0'"> 14 <el-col :span="4" class="fr" v-show="qszt=='0'">
...@@ -325,6 +325,7 @@ ...@@ -325,6 +325,7 @@
325 // bsm:'', 325 // bsm:'',
326 gyfs: '', 326 gyfs: '',
327 tableData: [], 327 tableData: [],
328 gyfsList:[],
328 //表格选中项 329 //表格选中项
329 multipleSelection: [], 330 multipleSelection: [],
330 dialogVisible: false, 331 dialogVisible: false,
...@@ -463,6 +464,16 @@ ...@@ -463,6 +464,16 @@
463 this.formData.fr=row.frList[0]; 464 this.formData.fr=row.frList[0];
464 } 465 }
465 }, 466 },
467
468 inputBlur(e){
469 if(e.target.value!=''){
470 e.target.style.border=""
471 }else{
472 e.target.style.border="1px solid red";
473 e.target.style.boxSizing = 'border-box';
474 }
475 },
476
466 //删除行数据 477 //删除行数据
467 delRow() { 478 delRow() {
468 if (this.multipleSelection.length > 0) { 479 if (this.multipleSelection.length > 0) {
...@@ -531,12 +542,21 @@ ...@@ -531,12 +542,21 @@
531 }) 542 })
532 } 543 }
533 }, 544 },
534 created(){}, 545 created(){
546 if(this.tableData.length>1){
547 this.gyfsList = this.$store.state.gyfsList.length;
548 for(let i = 0;i<this.gyfsList.length;i++){
549 let item = this.gyfsList[i];
550 this.gyfsList.disabled = item.mc === "单独所有" && item.bsm === this.gyfs;
551 }
552 }
553 },
535 mounted() { 554 mounted() {
536 this.getQlrInfo(); 555 this.getQlrInfo();
537 if(this.$store.state.gyfsList.length>0){ 556 if(this.$store.state.gyfsList.length>0){
538 this.gyfs=this.$store.state.gyfsList[0].bsm; 557 this.gyfs=this.$store.state.gyfsList[0].bsm;
539 } 558 }
559
540 }, 560 },
541 watch:{ 561 watch:{
542 dialogVisible(n){ 562 dialogVisible(n){
...@@ -584,8 +604,17 @@ ...@@ -584,8 +604,17 @@
584 zjzlbsm: "", 604 zjzlbsm: "",
585 } 605 }
586 } 606 }
607 },
608 tableData(){
609 if(this.tableData.length>1){
610 this.gyfsList = this.$store.state.gyfsList;
611 for(let i = 0;i<this.gyfsList.length;i++){
612 let item = this.gyfsList[i];
613 this.gyfsList[i].disabled = item.mc === "单独所有";
587 } 614 }
588 } 615 }
616 },
617 }
589 }; 618 };
590 </script> 619 </script>
591 <style lang="less"> 620 <style lang="less">
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
88 <tr> 88 <tr>
89 <td colspan="2" class="tdright">建筑物高度(m)</td> 89 <td colspan="2" class="tdright">建筑物高度(m)</td>
90 <td colspan="4" > 90 <td colspan="4" >
91 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.jzwgd"> 91 <input class="formInput" type="number" :disabled="form.qszt!='0'" v-model="form.jzwgd">
92 </td> 92 </td>
93 <td colspan="2" class="tdright">地下深度(m)</td> 93 <td colspan="2" class="tdright">地下深度(m)</td>
94 <td colspan="4" > 94 <td colspan="4" >
......