Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
5a5ec20b by 杨威
Options

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

2 parents 69bd0ece a9651d72
Inline Side-by-side
Showing 3 changed files with 504 additions and 182 deletions
...@@ -7,41 +7,41 @@ ...@@ -7,41 +7,41 @@
7 <div class="table"> 7 <div class="table">
8 <span class="tips">分割前宗地信息</span> 8 <span class="tips">分割前宗地信息</span>
9 <table border="1"> 9 <table border="1">
10 <tr> 10 <tr>
11 <th class="xh">序号</th> 11 <th class="xh">序号</th>
12 <th class="zddm">宗地代码</th> 12 <th class="zddm">宗地代码</th>
13 <th class="bdcdyh">不动产单元号</th> 13 <th class="bdcdyh">不动产单元号</th>
14 <th class="xmmc">项目名称</th> 14 <th class="xmmc">项目名称</th>
15 <th class="bdcqzh">不动产权证号</th> 15 <th class="bdcqzh">不动产权证号</th>
16 <th class="qlr">权利人</th> 16 <th class="qlr">权利人</th>
17 <th class="zl">坐落</th> 17 <th class="zl">坐落</th>
18 </tr> 18 </tr>
19 <tr v-if="Object.keys(bgqData)==0"> 19 <tr v-if="Object.keys(bgqData)==0">
20 <td colspan="7"> 20 <td colspan="7">
21 <span class="noData">暂无数据</span> 21 <span class="noData">暂无数据</span>
22 </td> 22 </td>
23 </tr> 23 </tr>
24 <tr v-else> 24 <tr v-else>
25 <td class="xh">1</td> 25 <td class="xh">1</td>
26 <td class="zddm"><input type="text" class="formInput" v-model="bgqData.zddm" 26 <td class="zddm"><input type="text" class="formInput" v-model="bgqData.zddm"
27 readonly="readonly"/> 27 readonly="readonly"/>
28 </td> 28 </td>
29 <td class="bdcdyh"><input type="text" class="formInput" v-model="bgqData.bdcdyh" 29 <td class="bdcdyh"><input type="text" class="formInput" v-model="bgqData.bdcdyh"
30 readonly="readonly"/> 30 readonly="readonly"/>
31 </td> 31 </td>
32 <td class="xmmc"><input type="text" class="formInput" v-model="bgqData.xmmc" 32 <td class="xmmc"><input type="text" class="formInput" v-model="bgqData.xmmc"
33 readonly="readonly"/> 33 readonly="readonly"/>
34 </td> 34 </td>
35 <td class="bdcqzh"><input type="text" class="formInput" v-model="bgqData.bdcqzh" 35 <td class="bdcqzh"><input type="text" class="formInput" v-model="bgqData.bdcqzh"
36 readonly="readonly"/> 36 readonly="readonly"/>
37 </td> 37 </td>
38 <td class="qlr"><input type="text" class="formInput" v-model="bgqData.qlr" 38 <td class="qlr"><input type="text" class="formInput" v-model="bgqData.qlr"
39 readonly="readonly"/> 39 readonly="readonly"/>
40 </td> 40 </td>
41 <td class="zl"><input type="text" class="formInput" v-model="bgqData.zl" 41 <td class="zl"><input type="text" class="formInput" v-model="bgqData.zl"
42 readonly="readonly"/></td> 42 readonly="readonly"/></td>
43 </tr> 43 </tr>
44 </table> 44 </table>
45 </div> 45 </div>
46 <div class="fgh"> 46 <div class="fgh">
47 <span class="tips">分割后宗地信息</span> 47 <span class="tips">分割后宗地信息</span>
...@@ -56,13 +56,14 @@ ...@@ -56,13 +56,14 @@
56 <th class="xmmc">项目名称</th> 56 <th class="xmmc">项目名称</th>
57 <th class="zxx">幢信息</th> 57 <th class="zxx">幢信息</th>
58 </tr> 58 </tr>
59 <tr v-for="(item,index) in fghData.newzdlist" :key="index"> 59 <tr v-for="(item,index) in fghData.newZdlist" :key="index">
60 <td class="cz"> 60 <td class="cz">
61 <el-button 61 <el-button
62 type="primary" 62 type="primary"
63 class="changeBtn outMinus addMinus" 63 class="changeBtn outMinus addMinus"
64 @click="delRow(index)" 64 @click="delRow(index)"
65 >-</el-button 65 >-
66 </el-button
66 > 67 >
67 </td> 68 </td>
68 <td class="xzq"> 69 <td class="xzq">
...@@ -124,12 +125,15 @@ ...@@ -124,12 +125,15 @@
124 </td> 125 </td>
125 </tr> 126 </tr>
126 <tr> 127 <tr>
127 <td><el-button 128 <td>
128 type="primary" 129 <el-button
129 class="changeBtn outAdd addMinus" 130 type="primary"
130 @click="addRow" 131 class="changeBtn outAdd addMinus"
131 >+</el-button 132 @click="addRow"
132 ></td> 133 >+
134 </el-button
135 >
136 </td>
133 <td></td> 137 <td></td>
134 <td></td> 138 <td></td>
135 <td></td> 139 <td></td>
...@@ -142,7 +146,7 @@ ...@@ -142,7 +146,7 @@
142 </div> 146 </div>
143 147
144 <el-dialog 148 <el-dialog
145 v-if="fghData.newzdlist.length>0" 149 v-if="fghData.newZdlist.length>0"
146 title="提示" 150 title="提示"
147 :visible.sync="isopenXz" 151 :visible.sync="isopenXz"
148 width="50%" 152 width="50%"
...@@ -155,7 +159,7 @@ ...@@ -155,7 +159,7 @@
155 <td>幢类型</td> 159 <td>幢类型</td>
156 <td>幢信息</td> 160 <td>幢信息</td>
157 </tr> 161 </tr>
158 <tr v-for="(item,index) in fghData.newzdlist[selectIndex].fwlist" :key="index"> 162 <tr v-for="(item,index) in fghData.newZdlist[selectIndex].fwlist" :key="index">
159 <td> 163 <td>
160 <el-select v-model="item.ztype" 164 <el-select v-model="item.ztype"
161 > 165 >
...@@ -244,13 +248,14 @@ ...@@ -244,13 +248,14 @@
244 <th class="xmmc">项目名称</th> 248 <th class="xmmc">项目名称</th>
245 <th class="zxx">幢信息</th> 249 <th class="zxx">幢信息</th>
246 </tr> 250 </tr>
247 <tr v-for="(item,index) in fghData.newzdlist" :key="index"> 251 <tr v-for="(item,index) in fghData.newZdlist" :key="index">
248 <td class="cz"> 252 <td class="cz">
249 <el-button 253 <el-button
250 type="primary" 254 type="primary"
251 class="changeBtn outMinus addMinus" 255 class="changeBtn outMinus addMinus"
252 @click="delRow(index)" 256 @click="delRow(index)"
253 >-</el-button 257 >-
258 </el-button
254 > 259 >
255 </td> 260 </td>
256 <td class="xzq"> 261 <td class="xzq">
...@@ -312,7 +317,14 @@ ...@@ -312,7 +317,14 @@
312 </td> 317 </td>
313 </tr> 318 </tr>
314 <tr> 319 <tr>
315 <td @click="addRow">+</td> 320 <td>
321 <el-button
322 type="primary"
323 class="changeBtn outAdd addMinus"
324 @click="addRow"
325 >+
326 </el-button>
327 </td>
316 <td></td> 328 <td></td>
317 <td></td> 329 <td></td>
318 <td></td> 330 <td></td>
...@@ -325,7 +337,7 @@ ...@@ -325,7 +337,7 @@
325 </div> 337 </div>
326 338
327 <el-dialog 339 <el-dialog
328 v-if="fghData.newzdlist.length>0" 340 v-if="fghData.newZdlist.length>0"
329 title="提示" 341 title="提示"
330 :visible.sync="isopenXz" 342 :visible.sync="isopenXz"
331 :modal-append-to-body="false" 343 :modal-append-to-body="false"
...@@ -338,7 +350,7 @@ ...@@ -338,7 +350,7 @@
338 <td>幢类型</td> 350 <td>幢类型</td>
339 <td>幢信息</td> 351 <td>幢信息</td>
340 </tr> 352 </tr>
341 <tr v-for="(item,index) in fghData.newzdlist[selectIndex].fwlist" :key="index"> 353 <tr v-for="(item,index) in fghData.newZdlist[selectIndex].fwlist" :key="index">
342 <td> 354 <td>
343 <el-select v-model="item.ztype" 355 <el-select v-model="item.ztype"
344 > 356 >
...@@ -427,14 +439,15 @@ ...@@ -427,14 +439,15 @@
427 <th class="xmmc">项目名称</th> 439 <th class="xmmc">项目名称</th>
428 <th class="zxx">幢信息</th> 440 <th class="zxx">幢信息</th>
429 </tr> 441 </tr>
430 <tr v-for="(item,index) in fghData.newzdlist" :key="index"> 442 <tr v-for="(item,index) in fghData.newZdlist" :key="index">
431 443
432 <td class="cz"> 444 <td class="cz">
433 <el-button 445 <el-button
434 type="primary" 446 type="primary"
435 class="changeBtn outMinus addMinus" 447 class="changeBtn outMinus addMinus"
436 @click="delRow(index)" 448 @click="delRow(index)"
437 >-</el-button 449 >-
450 </el-button
438 > 451 >
439 </td> 452 </td>
440 <td class="xzq"> 453 <td class="xzq">
...@@ -496,7 +509,14 @@ ...@@ -496,7 +509,14 @@
496 </td> 509 </td>
497 </tr> 510 </tr>
498 <tr> 511 <tr>
499 <td @click="addRow">+</td> 512 <td>
513 <el-button
514 type="primary"
515 class="changeBtn outAdd addMinus"
516 @click="addRow"
517 >+
518 </el-button>
519 </td>
500 <td></td> 520 <td></td>
501 <td></td> 521 <td></td>
502 <td></td> 522 <td></td>
...@@ -509,7 +529,7 @@ ...@@ -509,7 +529,7 @@
509 </div> 529 </div>
510 530
511 <el-dialog 531 <el-dialog
512 v-if="fghData.newzdlist.length>0" 532 v-if="fghData.newZdlist.length>0"
513 title="提示" 533 title="提示"
514 :visible.sync="isopenXz" 534 :visible.sync="isopenXz"
515 :modal-append-to-body="false" 535 :modal-append-to-body="false"
...@@ -522,7 +542,7 @@ ...@@ -522,7 +542,7 @@
522 <td>幢类型</td> 542 <td>幢类型</td>
523 <td>幢信息</td> 543 <td>幢信息</td>
524 </tr> 544 </tr>
525 <tr v-for="(item,index) in fghData.newzdlist[selectIndex].fwlist" :key="index"> 545 <tr v-for="(item,index) in fghData.newZdlist[selectIndex].fwlist" :key="index">
526 <td> 546 <td>
527 <el-select v-model="item.ztype" 547 <el-select v-model="item.ztype"
528 > 548 >
...@@ -558,19 +578,6 @@ ...@@ -558,19 +578,6 @@
558 </el-tab-pane> 578 </el-tab-pane>
559 </el-tabs> 579 </el-tabs>
560 </div> 580 </div>
561 <!-- <div class="lpb">
562 <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
563 <el-tab-pane label="编辑楼盘" name="edit">
564 <bjlp></bjlp>
565 </el-tab-pane>
566 <el-tab-pane label="预览楼盘" name="preview">
567 <yllp></yllp>
568 </el-tab-pane>
569 <el-tab-pane label="详细信息" name="detail">
570 <xxxx></xxxx>
571 </el-tab-pane>
572 </el-tabs>
573 </div> -->
574 </template> 581 </template>
575 582
576 <script> 583 <script>
...@@ -673,8 +680,8 @@ ...@@ -673,8 +680,8 @@
673 fwlist: [] 680 fwlist: []
674 }, 681 },
675 fghData: { 682 fghData: {
676 oldzdbsm: "", 683 oldZdbsm: "",
677 newzdlist: [] 684 newZdlist: []
678 }, 685 },
679 fgBoxWidth: 0, 686 fgBoxWidth: 0,
680 } 687 }
...@@ -693,7 +700,7 @@ ...@@ -693,7 +700,7 @@
693 console.log(node, 'node'); 700 console.log(node, 'node');
694 console.log(node.parent, 'node.parent') 701 console.log(node.parent, 'node.parent')
695 console.log(node.children, 'node.children') 702 console.log(node.children, 'node.children')
696 this.fghData.newzdlist[this.selectIndex].fwlist.push({ 703 this.fghData.newZdlist[this.selectIndex].fwlist.push({
697 zbsm: node.label, 704 zbsm: node.label,
698 ztype: '多幢' 705 ztype: '多幢'
699 } 706 }
...@@ -759,8 +766,8 @@ ...@@ -759,8 +766,8 @@
759 this.djq = []; 766 this.djq = [];
760 this.djzq = []; 767 this.djzq = [];
761 if (index != undefined) { 768 if (index != undefined) {
762 this.fghData.newzdlist[index].djqbsm = '' 769 this.fghData.newZdlist[index].djqbsm = ''
763 this.fghData.newzdlist[index].djzqbsm = '' 770 this.fghData.newZdlist[index].djzqbsm = ''
764 } 771 }
765 getListByXzqbsm(id) 772 getListByXzqbsm(id)
766 .then((res) => { 773 .then((res) => {
...@@ -776,7 +783,7 @@ ...@@ -776,7 +783,7 @@
776 changeDjq(item, index) { 783 changeDjq(item, index) {
777 this.djzq = []; 784 this.djzq = [];
778 if (index != undefined) { 785 if (index != undefined) {
779 this.fghData.newzdlist[index].djzqbsm = '' 786 this.fghData.newZdlist[index].djzqbsm = ''
780 } 787 }
781 if (item == null) { 788 if (item == null) {
782 } else { 789 } else {
...@@ -793,7 +800,7 @@ ...@@ -793,7 +800,7 @@
793 } 800 }
794 }, 801 },
795 addRow() { 802 addRow() {
796 this.fghData.newzdlist.push({ 803 this.fghData.newZdlist.push({
797 xzqbsm: "", 804 xzqbsm: "",
798 djqbsm: "", 805 djqbsm: "",
799 djzqbsm: "", 806 djzqbsm: "",
...@@ -810,10 +817,10 @@ ...@@ -810,10 +817,10 @@
810 }); 817 });
811 this.changeXzq(this.checkedData.xzqbsm) 818 this.changeXzq(this.checkedData.xzqbsm)
812 this.changeDjq(this.checkedData.djqbsm) 819 this.changeDjq(this.checkedData.djqbsm)
813 this.$set(this.fghData.newzdlist, this.fghData.newzdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData))) 820 this.$set(this.fghData.newZdlist, this.fghData.newZdlist.length - 1, JSON.parse(JSON.stringify(this.checkedData)))
814 }, 821 },
815 delRow(index) { 822 delRow(index) {
816 this.fghData.newzdlist.splice(index, 1) 823 this.fghData.newZdlist.splice(index, 1)
817 }, 824 },
818 close: function () { 825 close: function () {
819 this.centerDialogVisible = false; 826 this.centerDialogVisible = false;
...@@ -833,7 +840,7 @@ ...@@ -833,7 +840,7 @@
833 watch: { 840 watch: {
834 bgqData: { 841 bgqData: {
835 handler: function (item) { 842 handler: function (item) {
836 this.fghData.oldzdbsm = item.glbsm 843 this.fghData.oldZdbsm = item.glbsm
837 this.getJbxx(item.glbsm) 844 this.getJbxx(item.glbsm)
838 }, 845 },
839 deep: true 846 deep: true
...@@ -991,7 +998,7 @@ ...@@ -991,7 +998,7 @@
991 width: 100px; 998 width: 100px;
992 } 999 }
993 1000
994 .xzq, .djq, djzq { 1001 .xzq, .djq, .djzq {
995 width: 150px; 1002 width: 150px;
996 } 1003 }
997 </style> 1004 </style>
......
...@@ -3,14 +3,9 @@ ...@@ -3,14 +3,9 @@
3 <el-tabs v-model="tabName" class="menu" @tab-click="handleClick"> 3 <el-tabs v-model="tabName" class="menu" @tab-click="handleClick">
4 <el-tab-pane label="宗地合并" name="zd"> 4 <el-tab-pane label="宗地合并" name="zd">
5 <div class="hb-tabs"> 5 <div class="hb-tabs">
6
7 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> 6 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
8 <div class="header"> 7 <div class="hbq">
9 <span>合并后项目名称</span> 8 <span class="tips">合并前宗地信息</span>
10 <el-input></el-input>
11 </div>
12
13 <div class="table">
14 <table border="1"> 9 <table border="1">
15 <tr> 10 <tr>
16 <td class="xh">序号</td> 11 <td class="xh">序号</td>
...@@ -28,12 +23,90 @@ ...@@ -28,12 +23,90 @@
28 </tr> 23 </tr>
29 <tr v-else v-for="(item,index) in bgqData" :key="index"> 24 <tr v-else v-for="(item,index) in bgqData" :key="index">
30 <td class="xh">{{index+1}}</td> 25 <td class="xh">{{index+1}}</td>
31 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm" readonly="readonly"/></td> 26 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
32 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh" readonly="readonly"/></td> 27 readonly="readonly"/></td>
33 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc" readonly="readonly"/></td> 28 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
34 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh" readonly="readonly"/></td> 29 readonly="readonly"/></td>
35 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr" readonly="readonly"/></td> 30 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
36 <td class="zl"><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td> 31 readonly="readonly"/></td>
32 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
33 readonly="readonly"/></td>
34 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
35 readonly="readonly"/></td>
36 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
37 readonly="readonly"/></td>
38 </tr>
39 </table>
40 </div>
41 <div class="hbh">
42 <span class="tips">合并后宗地信息</span>
43 <table border="1">
44 <tr>
45 <th class="xzq">行政区</th>
46 <th class="djq">地籍区</th>
47 <th class="djzq">地籍子区</th>
48 <th class="syqlx">所有权类型</th>
49 <th class="tdtzm">土地特征码</th>
50 <th class="xmmc">项目名称</th>
51 <th class="zxx">幢信息</th>
52 </tr>
53 <tr>
54 <td class="xzq">
55 <el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)">
56 <el-option
57 v-for="i in xzq"
58 :key="i.bsm"
59 :label="i.mc"
60 :value="i.bsm"
61 ></el-option>
62 </el-select>
63 </td>
64 <td class="djq">
65 <el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)">
66 <el-option
67 v-for="i in djq"
68 :key="i.bsm"
69 :label="i.mc"
70 :value="i.bsm"
71 ></el-option>
72 </el-select>
73 </td>
74 <td class="syqlx">
75 <el-select v-model="hbhData.djzqbsm">
76 <el-option
77 v-for="i in djzq"
78 :key="i.bsm"
79 :label="i.mc"
80 :value="i.bsm"
81 ></el-option>
82 </el-select>
83 </td>
84 <td class="tdtzm">
85 <el-select v-model="hbhData.syqlxbsm">
86 <el-option
87 v-for="i in syq"
88 :key="i.value"
89 :label="i.label"
90 :value="i.value"
91 ></el-option>
92 </el-select>
93 </td>
94 <td class="syqlx">
95 <el-select v-model="hbhData.zdtzmbsm">
96 <el-option
97 v-for="i in tdtzm"
98 :key="i.bsm"
99 :label="i.mc"
100 :value="i.bsm"
101 ></el-option>
102 </el-select>
103 </td>
104 <td class="xmmc">
105 <input type="text" v-model="hbhData.xmmc" class="formInput"/>
106 </td>
107 <td class="zxx">
108 <span class="xz">选择</span>
109 </td>
37 </tr> 110 </tr>
38 </table> 111 </table>
39 </div> 112 </div>
...@@ -48,11 +121,8 @@ ...@@ -48,11 +121,8 @@
48 <el-tab-pane label="多幢合并" name="dz"> 121 <el-tab-pane label="多幢合并" name="dz">
49 <div class="hb-tabs"> 122 <div class="hb-tabs">
50 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> 123 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
51 <div class="header"> 124 <div class="hbq">
52 <span>合并后项目名称</span> 125 <span class="tips">合并前宗地信息</span>
53 <el-input></el-input>
54 </div>
55 <div class="table">
56 <table border="1"> 126 <table border="1">
57 <tr> 127 <tr>
58 <td class="xh">序号</td> 128 <td class="xh">序号</td>
...@@ -70,12 +140,90 @@ ...@@ -70,12 +140,90 @@
70 </tr> 140 </tr>
71 <tr v-else v-for="(item,index) in bgqData" :key="index"> 141 <tr v-else v-for="(item,index) in bgqData" :key="index">
72 <td class="xh">{{index+1}}</td> 142 <td class="xh">{{index+1}}</td>
73 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm" readonly="readonly"/></td> 143 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
74 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh" readonly="readonly"/></td> 144 readonly="readonly"/></td>
75 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc" readonly="readonly"/></td> 145 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
76 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh" readonly="readonly"/></td> 146 readonly="readonly"/></td>
77 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr" readonly="readonly"/></td> 147 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
78 <td class="zl"><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td> 148 readonly="readonly"/></td>
149 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
150 readonly="readonly"/></td>
151 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
152 readonly="readonly"/></td>
153 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
154 readonly="readonly"/></td>
155 </tr>
156 </table>
157 </div>
158 <div class="hbh">
159 <span class="tips">合并后宗地信息</span>
160 <table border="1">
161 <tr>
162 <th class="xzq">行政区</th>
163 <th class="djq">地籍区</th>
164 <th class="djzq">地籍子区</th>
165 <th class="syqlx">所有权类型</th>
166 <th class="tdtzm">土地特征码</th>
167 <th class="xmmc">项目名称</th>
168 <th class="zxx">幢信息</th>
169 </tr>
170 <tr>
171 <td class="xzq">
172 <el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)">
173 <el-option
174 v-for="i in xzq"
175 :key="i.bsm"
176 :label="i.mc"
177 :value="i.bsm"
178 ></el-option>
179 </el-select>
180 </td>
181 <td class="djq">
182 <el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)">
183 <el-option
184 v-for="i in djq"
185 :key="i.bsm"
186 :label="i.mc"
187 :value="i.bsm"
188 ></el-option>
189 </el-select>
190 </td>
191 <td class="syqlx">
192 <el-select v-model="hbhData.djzqbsm">
193 <el-option
194 v-for="i in djzq"
195 :key="i.bsm"
196 :label="i.mc"
197 :value="i.bsm"
198 ></el-option>
199 </el-select>
200 </td>
201 <td class="tdtzm">
202 <el-select v-model="hbhData.syqlxbsm">
203 <el-option
204 v-for="i in syq"
205 :key="i.value"
206 :label="i.label"
207 :value="i.value"
208 ></el-option>
209 </el-select>
210 </td>
211 <td class="syqlx">
212 <el-select v-model="hbhData.zdtzmbsm">
213 <el-option
214 v-for="i in tdtzm"
215 :key="i.bsm"
216 :label="i.mc"
217 :value="i.bsm"
218 ></el-option>
219 </el-select>
220 </td>
221 <td class="xmmc">
222 <input type="text" v-model="hbhData.xmmc" class="formInput"/>
223 </td>
224 <td class="zxx">
225 <span class="xz">选择</span>
226 </td>
79 </tr> 227 </tr>
80 </table> 228 </table>
81 </div> 229 </div>
...@@ -89,11 +237,8 @@ ...@@ -89,11 +237,8 @@
89 <el-tab-pane label="户合并" name="h"> 237 <el-tab-pane label="户合并" name="h">
90 <div class="hb-tabs"> 238 <div class="hb-tabs">
91 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> 239 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
92 <div class="header"> 240 <div class="hbq">
93 <span>合并后项目名称</span> 241 <span class="tips">合并前宗地信息</span>
94 <el-input></el-input>
95 </div>
96 <div class="table">
97 <table border="1"> 242 <table border="1">
98 <tr> 243 <tr>
99 <td class="xh">序号</td> 244 <td class="xh">序号</td>
...@@ -111,12 +256,90 @@ ...@@ -111,12 +256,90 @@
111 </tr> 256 </tr>
112 <tr v-else v-for="(item,index) in bgqData" :key="index"> 257 <tr v-else v-for="(item,index) in bgqData" :key="index">
113 <td class="xh">{{index+1}}</td> 258 <td class="xh">{{index+1}}</td>
114 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm" readonly="readonly"/></td> 259 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
115 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh" readonly="readonly"/></td> 260 readonly="readonly"/></td>
116 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc" readonly="readonly"/></td> 261 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
117 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh" readonly="readonly"/></td> 262 readonly="readonly"/></td>
118 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr" readonly="readonly"/></td> 263 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
119 <td class="zl"><input type="text" class="formInput" v-model="item.zl" readonly="readonly"/></td> 264 readonly="readonly"/></td>
265 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
266 readonly="readonly"/></td>
267 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
268 readonly="readonly"/></td>
269 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
270 readonly="readonly"/></td>
271 </tr>
272 </table>
273 </div>
274 <div class="hbh">
275 <span class="tips">合并后宗地信息</span>
276 <table border="1">
277 <tr>
278 <th class="xzq">行政区</th>
279 <th class="djq">地籍区</th>
280 <th class="djzq">地籍子区</th>
281 <th class="syqlx">所有权类型</th>
282 <th class="tdtzm">土地特征码</th>
283 <th class="xmmc">项目名称</th>
284 <th class="zxx">幢信息</th>
285 </tr>
286 <tr>
287 <td class="xzq">
288 <el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)">
289 <el-option
290 v-for="i in xzq"
291 :key="i.bsm"
292 :label="i.mc"
293 :value="i.bsm"
294 ></el-option>
295 </el-select>
296 </td>
297 <td class="djq">
298 <el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)">
299 <el-option
300 v-for="i in djq"
301 :key="i.bsm"
302 :label="i.mc"
303 :value="i.bsm"
304 ></el-option>
305 </el-select>
306 </td>
307 <td class="syqlx">
308 <el-select v-model="hbhData.djzqbsm">
309 <el-option
310 v-for="i in djzq"
311 :key="i.bsm"
312 :label="i.mc"
313 :value="i.bsm"
314 ></el-option>
315 </el-select>
316 </td>
317 <td class="tdtzm">
318 <el-select v-model="hbhData.syqlxbsm">
319 <el-option
320 v-for="i in syq"
321 :key="i.value"
322 :label="i.label"
323 :value="i.value"
324 ></el-option>
325 </el-select>
326 </td>
327 <td class="syqlx">
328 <el-select v-model="hbhData.zdtzmbsm">
329 <el-option
330 v-for="i in tdtzm"
331 :key="i.bsm"
332 :label="i.mc"
333 :value="i.bsm"
334 ></el-option>
335 </el-select>
336 </td>
337 <td class="xmmc">
338 <input type="text" v-model="hbhData.xmmc" class="formInput"/>
339 </td>
340 <td class="zxx">
341 <span class="xz">选择</span>
342 </td>
120 </tr> 343 </tr>
121 </table> 344 </table>
122 </div> 345 </div>
...@@ -132,6 +355,12 @@ ...@@ -132,6 +355,12 @@
132 </template> 355 </template>
133 356
134 <script> 357 <script>
358 import {
359 getAllList,
360 getListByXzqbsm,
361 getListByPbsm,
362 getDdicByMC
363 } from "./../../../../api/common";
135 import QueryData from './../../../../components/queryData/queryData' 364 import QueryData from './../../../../components/queryData/queryData'
136 365
137 export default { 366 export default {
...@@ -143,17 +372,84 @@ ...@@ -143,17 +372,84 @@
143 tabName: 'zd', 372 tabName: 'zd',
144 centerDialogVisible: false, 373 centerDialogVisible: false,
145 bgqData: [], 374 bgqData: [],
146 fgBoxWidth:0 375 hbhData: {},
376 fgBoxWidth: 0,
377 xzq: [],
378 djq: [],
379 djzq: [],
380 tdtzm: [],
381 syq: [
382 {
383 label: "国家所有",
384 value: "G",
385 },
386 {
387 label: "集体所有",
388 value: "J",
389 },
390 {
391 label: "土地所有权未确定或有争议",
392 value: "Z",
393 }
394 ],
147 } 395 }
148 }, 396 },
149 created() { 397 created() {
150 }, 398 },
151 mounted() { 399 mounted() {
152 this.$nextTick(()=>{ 400 this.getXzqList();
401 this.getzdtzm();
402 this.$nextTick(() => {
153 this.fgBoxWidth = this.$refs.hbBox.clientWidth; 403 this.fgBoxWidth = this.$refs.hbBox.clientWidth;
154 }) 404 })
155 }, 405 },
156 methods: { 406 methods: {
407 getzdtzm() {
408 getDdicByMC('宗地（宗海）特征码').then(res => {
409 this.tdtzm = res.result
410 })
411 },
412 getXzqList() {
413 getAllList()
414 .then((res) => {
415 this.xzq = res.result;
416 })
417 .catch((error) => {
418 });
419 },
420 changeXzq(id) {
421 this.djq = [];
422 this.djzq = [];
423 this.hbhData.djqbsm = ''
424 this.hbhData.djzqbsm = ''
425 getListByXzqbsm(id)
426 .then((res) => {
427 if (res.result == null) {
428 this.djq = null;
429 } else {
430 this.djq = res.result;
431 }
432 })
433 .catch((error) => {
434 });
435 },
436 changeDjq(item) {
437 this.djzq = [];
438 this.hbhData.djzqbsm = ''
439 if (item == null) {
440 } else {
441 getListByPbsm(item)
442 .then((res) => {
443 if (res.result == null) {
444 this.djzq = null;
445 } else {
446 this.djzq = res.result;
447 }
448 })
449 .catch((error) => {
450 });
451 }
452 },
157 handleClick(tab, event) { 453 handleClick(tab, event) {
158 console.log(tab, event); 454 console.log(tab, event);
159 }, 455 },
...@@ -177,56 +473,57 @@ ...@@ -177,56 +473,57 @@
177 </script> 473 </script>
178 <style scoped lang="less"> 474 <style scoped lang="less">
179 475
180 .hb{ 476 .hb {
181 .menu{ 477 .menu {
182 /deep/.el-tabs__content{ 478 /deep/ .el-tabs__content {
183 position: unset; 479 position: unset;
184 margin-top: 62px; 480 margin-top: 62px;
185 overflow: visible; 481 overflow: visible;
186 } 482 }
187 /deep/.el-tabs__header{ 483 /deep/ .el-tabs__header {
188 position: -webkit-fixed; 484 position: -webkit-fixed;
189 position: fixed; 485 position: fixed;
190 top: 120px; 486 top: 120px;
191 z-index: 999; 487 z-index: 999;
192 width: 100%; 488 width: 100%;
193 margin-bottom: 0; 489 margin-bottom: 0;
194 border: 0; 490 border: 0;
195 /deep/.el-tabs__nav-scroll{ 491 /deep/ .el-tabs__nav-scroll {
196 height: 50px; 492 height: 50px;
197 box-sizing: border-box; 493 box-sizing: border-box;
198 padding-left: 20px; 494 padding-left: 20px;
199 .el-tabs__active-bar{ 495 .el-tabs__active-bar {
200 display: none; 496 display: none;
201 }
202 >.el-tabs__nav{
203 border: 0;
204 >.el-tabs__item{
205 border: 1px solid #DEDEDE;
206 height: 36px;
207 line-height: 36px;
208 padding: 0 20px;
209 margin: 9px 10px 9px 0;
210 background-color: #ffffff;
211 } 497 }
212 .is-active{ 498 > .el-tabs__nav {
213 color: #006CFF; 499 border: 0;
214 border: 1px solid #006CFF; 500 > .el-tabs__item {
501 border: 1px solid #DEDEDE;
502 height: 36px;
503 line-height: 36px;
504 padding: 0 20px;
505 margin: 9px 10px 9px 0;
506 background-color: #ffffff;
507 }
508 .is-active {
509 color: #006CFF;
510 border: 1px solid #006CFF;
511 }
215 } 512 }
216 } 513 }
217 } 514 /deep/ .el-tabs__nav-wrap::after {
218 /deep/.el-tabs__nav-wrap::after{ 515 width: 0;
219 width: 0; 516 }
220 } 517 }
221 } 518 }
222 } 519 }
223 } 520
224 .hb-tabs { 521 .hb-tabs {
225 height: auto; 522 height: auto;
226 width: 100%; 523 width: 100%;
227 position: relative; 524 position: relative;
228 525
229 .addBtn{ 526 .addBtn {
230 position: absolute; 527 position: absolute;
231 right: 30px; 528 right: 30px;
232 top: -46px; 529 top: -46px;
...@@ -255,18 +552,14 @@ ...@@ -255,18 +552,14 @@
255 text-align: center; 552 text-align: center;
256 background-color: #ffffff; 553 background-color: #ffffff;
257 } 554 }
258 .table{
259 box-sizing: border-box;
260 padding: 0 18px;
261 }
262 table { 555 table {
263 margin-top: 10px; 556 margin-top: 10px;
264 background-color: #fff; 557 background-color: #fff;
265 font-size: 14px; 558 font-size: 14px;
266 width: 100%; 559 width: 100%;
267 tr:nth-of-type(odd){ 560 tr:nth-of-type(odd) {
268 background: #FAFAFA; 561 background: #FAFAFA;
269 th{ 562 th {
270 height: 36px; 563 height: 36px;
271 } 564 }
272 } 565 }
...@@ -280,7 +573,7 @@ ...@@ -280,7 +573,7 @@
280 text-align: center; 573 text-align: center;
281 cursor: text; 574 cursor: text;
282 } 575 }
283 tr:hover{ 576 tr:hover {
284 background-color: #F5F7FA; 577 background-color: #F5F7FA;
285 } 578 }
286 579
...@@ -299,18 +592,34 @@ ...@@ -299,18 +592,34 @@
299 .noData { 592 .noData {
300 color: #b2b2b2; 593 color: #b2b2b2;
301 } 594 }
302 .saveBtn{ 595 .saveBtn {
303 background-color: #00CACD; 596 background-color: #00CACD;
304 border-color: #00CACD; 597 border-color: #00CACD;
305 padding: 10px 30px; 598 padding: 10px 30px;
306 margin-top: 8px; 599 margin-top: 8px;
307 } 600 }
308 .saveBtn:hover{ 601 .saveBtn:hover {
309 background-color: rgba(0, 202, 205, .8); 602 background-color: rgba(0, 202, 205, .8);
310 border-color: rgba(0, 202, 205, .8); 603 border-color: rgba(0, 202, 205, .8);
311 } 604 }
312 .xh{ 605 .xh {
313 width: 100px; 606 width: 100px;
314 } 607 }
608 .xzq, .djq, .djzq {
609 width: 150px;
610 }
611 .tips {
612 color: #9B9B9B;
613 }
614 .hbq {
615 margin-top: 12px;
616 box-sizing: border-box;
617 padding: 18px;
618 }
619 .hbh {
620 box-sizing: border-box;
621 padding: 0 18px;
622 margin-top: 10px;
623 }
315 } 624 }
316 </style> 625 </style>
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
41 class="radioBtn" 41 class="radioBtn"
42 label="4" 42 label="4"
43 border 43 border
44 @click="plcVisible" 44 @click="openPlC"
45 >批量层</el-button 45 >批量层</el-button
46 > 46 >
47 <el-button 47 <el-button
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
238 <!-- 批量操作弹出框 --> 238 <!-- 批量操作弹出框 -->
239 <pl-h :plh-visible="plhVisible" :bsms="bsms" @close="plhClose" @lodding="lodding"></pl-h> 239 <pl-h :plh-visible="plhVisible" :bsms="bsms" @close="plhClose" @lodding="lodding"></pl-h>
240 <pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose" @lodding="lodding"></pl-zl> 240 <pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose" @lodding="lodding"></pl-zl>
241 <pl-c :plc-visible="plcVisible" :bsms="bsms" @close="plcClose" @lodding="lodding"></pl-c> 241 <pl-c :plc-visible="plcVisible" :bsms="cbsmList" @close="plcClose" @lodding="lodding"></pl-c>
242 <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose" @lodding="lodding"></pl-sh> 242 <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose" @lodding="lodding"></pl-sh>
243 <h-cxlz 243 <h-cxlz
244 :h-cxlz-visble="hcxlzVisible" 244 :h-cxlz-visble="hcxlzVisible"
...@@ -393,6 +393,13 @@ export default { ...@@ -393,6 +393,13 @@ export default {
393 }, 100); 393 }, 100);
394 }, 394 },
395 methods: { 395 methods: {
396 openPlC(){
397 if (this.cbsmList.length <= 0) {
398 Message.warning("请选择层")
399 return
400 }
401 this.plcVisible=true
402 },
396 openPl(val){ 403 openPl(val){
397 if (this.bsms.length <= 0) { 404 if (this.bsms.length <= 0) {
398 Message.warning("请选择操作户") 405 Message.warning("请选择操作户")
...@@ -413,8 +420,7 @@ export default { ...@@ -413,8 +420,7 @@ export default {
413 } 420 }
414 }, 421 },
415 lodding(){ 422 lodding(){
416 let zrzbsm=this.$store.state.zrzbsm; 423 this.getlpbData();
417 this.$refs.lpbContent.getLpb(zrzbsm,this.syclx);
418 }, 424 },
419 hcxlzClose() { 425 hcxlzClose() {
420 this.hcxlzVisible = false; 426 this.hcxlzVisible = false;
...@@ -534,7 +540,7 @@ export default { ...@@ -534,7 +540,7 @@ export default {
534 }, 540 },
535 //户保存 541 //户保存
536 hbjSaveInfo() { 542 hbjSaveInfo() {
537 this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.syclx); 543 this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
538 }, 544 },
539 //户编辑表单重置 545 //户编辑表单重置
540 hbjResetInfo() { 546 hbjResetInfo() {
...@@ -542,7 +548,7 @@ export default { ...@@ -542,7 +548,7 @@ export default {
542 }, 548 },
543 //调用楼盘表信息查询接口 549 //调用楼盘表信息查询接口
544 getlpbData() { 550 getlpbData() {
545 this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm,this.syclx); 551 this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm);
546 //改变楼盘表子组件的key值，重新渲染 552 //改变楼盘表子组件的key值，重新渲染
547 this.time = new Date().getTime(); 553 this.time = new Date().getTime();
548 }, 554 },
......