Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
10900e63 by 焦泽平
Options

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

2 parents 7d457289 90ccb6e9
Expand all
Inline Side-by-side
Showing 8 changed files with 80 additions and 23 deletions
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 table{ 37 table{
38 border-width: 0; 38 border-width: 0;
39 } 39 }
40 table,td,tr,.el-col,.title{ 40 table,tr,.el-col,.title{
41 border-color: #E6E6E6 !important; 41 border-color: #E6E6E6 !important;
42 } 42 }
43 .el-table th{ 43 .el-table th{
......
...@@ -537,7 +537,6 @@ ...@@ -537,7 +537,6 @@
537 if(this.$store.state.gyfsList.length>0){ 537 if(this.$store.state.gyfsList.length>0){
538 this.gyfs=this.$store.state.gyfsList[0].bsm; 538 this.gyfs=this.$store.state.gyfsList[0].bsm;
539 } 539 }
540
541 }, 540 },
542 }; 541 };
543 </script> 542 </script>
......
...@@ -760,20 +760,15 @@ ...@@ -760,20 +760,15 @@
760 zbsm: bsm, 760 zbsm: bsm,
761 ztype: 'dz' 761 ztype: 'dz'
762 }) 762 })
763 console.log(this.zdFghData, 'zdFghData')
764 }, 763 },
765 xzZrz(bsm, index) { 764 xzZrz(bsm, index) {
766 this.zdFghData.newZdlist.fwlist[index].push({ 765 this.zdFghData.newZdlist.fwlist[index].push({
767 zbsm: bsm, 766 zbsm: bsm,
768 ztype: 'zrz' 767 ztype: 'zrz'
769 }) 768 })
770 console.log(this.zdFghData, 'zdFghData')
771 }, 769 },
772 dzHandleCommand(command, index) { 770 dzHandleCommand(command, index) {
773 console.log(command,"============")
774 let item = this.zdDzList.filter(i => i.bsm == command)[0]; 771 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({ 772 this.zdFghData.newZdlist[index].fwlist.push({
778 zbsm: command, 773 zbsm: command,
779 ztype: 'dz' 774 ztype: 'dz'
...@@ -846,11 +841,17 @@ ...@@ -846,11 +841,17 @@
846 }, 841 },
847 saveZd() { 842 saveZd() {
848 zdfg(this.zdFghData).then(res => { 843 zdfg(this.zdFghData).then(res => {
849 console.log(res)
850 if (res.success) { 844 if (res.success) {
851 Message.success('保存成功') 845 Message.success('保存成功')
846 this.$router.push({
847 path: '/zd',
848 query: {
849 bsm: res.result[0],
850 source: 2
851 }
852 });
852 } else { 853 } else {
853 Message.error(res.message) 854 Message.error("保存失败")
854 } 855 }
855 }) 856 })
856 }, 857 },
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +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 <td>操作</td>
19 </tr> 19 </tr>
20 <tr v-if="zdhbqData.length==0"> 20 <tr v-if="zdhbqData.length==0">
21 <td colspan="7"> 21 <td colspan="7">
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
112 </tr> 112 </tr>
113 </table> 113 </table>
114 </div> 114 </div>
115 <zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" 115 <zd-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :isZdClose="true"
116 @close="close"></zd-query-data> 116 @close="close"></zd-query-data>
117 117
118 <div class="header-button" :style="{width:fgBoxWidth+'px'}"> 118 <div class="header-button" :style="{width:fgBoxWidth+'px'}">
...@@ -572,7 +572,6 @@ ...@@ -572,7 +572,6 @@
572 } 572 }
573 </script> 573 </script>
574 <style scoped lang="less"> 574 <style scoped lang="less">
575
576 .hb { 575 .hb {
577 .menu { 576 .menu {
578 /deep/ .el-tabs__content { 577 /deep/ .el-tabs__content {
...@@ -722,4 +721,11 @@ ...@@ -722,4 +721,11 @@
722 margin-top: 10px; 721 margin-top: 10px;
723 } 722 }
724 } 723 }
724 .cz{
725 color: blue;
726 }
727 .cz:hover{
728 color: blue;
729 text-decoration: underline;
730 }
725 </style> 731 </style>
......
...@@ -265,7 +265,12 @@ export default { ...@@ -265,7 +265,12 @@ export default {
265 this.$store.state.zdbsm = res.result; 265 this.$store.state.zdbsm = res.result;
266 //todo 跳转到宗地基本信息内容表页面 (预留) 266 //todo 跳转到宗地基本信息内容表页面 (预留)
267 this.close(); 267 this.close();
268 this.$router.push("/zd"); 268 this.$router.push({
269 path: '/zd', query:{
270 source: 2,
271 bsm:res.result
272 }
273 });
269 } else { 274 } else {
270 this.$message.error(res.message); 275 this.$message.error(res.message);
271 } 276 }
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main">
3 <div class="formMenu"> 3 <div class="formMenu">
4 <Qlr ref="qlrxxModule" :bsm="$store.state.zdbsm" :qszt="formData.qszt"></Qlr> 4 <Qlr ref="qlrxxModule" :bsm="curZdbsm" :qszt="formData.qszt"></Qlr>
5 <!-- <el-button 5 <!-- <el-button
6 type="primary" 6 type="primary"
7 class="changeBtn" 7 class="changeBtn"
...@@ -407,12 +407,12 @@ export default { ...@@ -407,12 +407,12 @@ export default {
407 { label: "-", value: "-" }, 407 { label: "-", value: "-" },
408 ], 408 ],
409 formData: {}, 409 formData: {},
410
411 dpdm:'', //宗地底盘代码 410 dpdm:'', //宗地底盘代码
411 curZdbsm:'',
412 }; 412 };
413 }, 413 },
414 created() { 414 created() {
415 415 this.curZdbsm = this.$route.query.bsm;
416 }, 416 },
417 mounted() { 417 mounted() {
418 this.getZdjbxxData(this.$store.state.zdbsm); 418 this.getZdjbxxData(this.$store.state.zdbsm);
...@@ -453,8 +453,44 @@ export default { ...@@ -453,8 +453,44 @@ export default {
453 "tdzh": "" 453 "tdzh": ""
454 }) 454 })
455 } 455 }
456 this.$nextTick(()=>{
456 //权利性质数据传给子组件 457 //权利性质数据传给子组件
457 this.$refs.qlxzModule.countList = res.result.list; 458 this.$refs.qlxzModule.countList = res.result.list;
459 })
460 }else{
461 this.$nextTick(()=>{
462 //权利性质数据传给子组件
463 this.$refs.qlxzModule.countList = [
464 {
465 id: Math.random(),
466 isInside: false,
467 hasNotBorder: false,
468 bsm: "", //权利性质标识码
469 glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
470 qlxzdm: "",
471 zhqlxzlx: "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
472 list: [
473 {
474 pzdjbsm: "",
475 pzdjmc: "",
476 pzytdm: "",
477 pzytmc: "",
478 pzytmj: 0,
479 qlxzbsm: "",
480 sjdjbsm: "",
481 sjdjmc: "",
482 sjytdm: "",
483 sjytmc: "",
484 sjytmj: 0,
485 syqx: "",
486 tdsyjssj: "",
487 tdsyqssj: "",
488 tdzh: "",
489 },
490 ],
491 },
492 ];
493 })
458 } 494 }
459 } 495 }
460 }) 496 })
...@@ -678,6 +714,7 @@ export default { ...@@ -678,6 +714,7 @@ export default {
678 }, 714 },
679 zdbsm:function (val) { 715 zdbsm:function (val) {
680 this.getZdjbxxData(val) 716 this.getZdjbxxData(val)
717 this.curZdbsm = this.$route.query.bsm;
681 } 718 }
682 }, 719 },
683 }; 720 };
......
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
138 v-for="(item, index) in dyztList" 138 v-for="(item, index) in dyztList"
139 :key="index" 139 :key="index"
140 class="cp" 140 class="cp"
141 @click="handleChoosedH(item.bsms)" 141 @click="handleChoosedH(item.bsms,item.color)"
142 > 142 >
143 <td> 143 <td>
144 <i class="fa fa-circle" :style="{ color: item.color }"></i 144 <i class="fa fa-circle" :style="{ color: item.color }"></i
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
165 v-for="(item, index) in fwxzList" 165 v-for="(item, index) in fwxzList"
166 :key="index" 166 :key="index"
167 class="cp" 167 class="cp"
168 @click="handleChoosedH(item.bsms)" 168 @click="handleChoosedH(item.bsms,item.color)"
169 > 169 >
170 <td> 170 <td>
171 <i class="fa fa-circle" :style="{ color: item.color }"></i 171 <i class="fa fa-circle" :style="{ color: item.color }"></i
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
195 v-for="(item, index) in fwytList" 195 v-for="(item, index) in fwytList"
196 :key="index" 196 :key="index"
197 class="cp" 197 class="cp"
198 @click="handleChoosedH(item.bsms)" 198 @click="handleChoosedH(item.bsms,item.color)"
199 > 199 >
200 <td> 200 <td>
201 <i class="fa fa-circle" :style="{ color: item.color }"></i 201 <i class="fa fa-circle" :style="{ color: item.color }"></i
...@@ -596,14 +596,23 @@ export default { ...@@ -596,14 +596,23 @@ export default {
596 } 596 }
597 }); 597 });
598 }, 598 },
599 //选中房屋状态 599 //切换房屋状态
600 handleChoosedH(bsms) { 600 handleChoosedH(bsms,color) {
601 console.log(bsms,'bsms'); 601 //每次切换房屋状态，将之前高亮的户边框颜色重置为默认
602 this.$refs.lpbContent.choosedList = [];
603 this.$refs.lpbContent.$refs.hBsm.forEach((item) => {
604 item.style.borderColor = '#E6E6E6';
605 });
606 // console.log(bsms,'bsms');
607 // console.log(color,'color');
602 // Dyzt:{list:[],mj:''} 608 // Dyzt:{list:[],mj:''}
603 //清除选中户 609 //清除选中户
604 this.$refs.lpbContent.clearChoosedH(); 610 // this.$refs.lpbContent.clearChoosedH();
611 this.$nextTick(()=>{
605 //给hBsmList传值 612 //给hBsmList传值
606 this.$refs.lpbContent.choosedList = bsms; 613 this.$refs.lpbContent.choosedList = bsms;
614 this.$refs.lpbContent.borderColor = color;
615 })
607 }, 616 },
608 //批量添加不动产单元号 617 //批量添加不动产单元号
609 addBdcdyh() { 618 addBdcdyh() {
......