Skip to content

任超 / js.CadastralSystem

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

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

2 parents 1201b075 02e1d369
Inline Side-by-side
Showing 8 changed files with 239 additions and 174 deletions
1 <template> 1 <template>
2 <div class="hb-tabs top20"> 2 <div class="hb-tabs top20">
3 <div class="hbq"> 3 <div class="hbq">
4 <span class="tips" style="margin-left:0;">合并前多幢信息</span> 4 <span class="tips" style="margin-left:0;">合并前幢信息(已选择幢{{dzhbqData.length}}个)</span>
5 <table border="1"> 5
6 <tr> 6 <div style="margin-top: 14px">
7 <td class="xh">序号</td> 7 <el-table
8 <td class="zddm">宗地代码</td> 8 :data="dzhbqData"
9 <td class="bdcdyh">不动产单元号</td> 9 border
10 <td class="xmmc">项目名称</td> 10 style="width: 100%"
11 <td class="bdcqzh">不动产权证号</td> 11 height="200px"
12 <td class="qlr">权利人</td> 12 :header-cell-style="{'text-align':'center'}"
13 <td class="zl">坐落</td> 13 :cell-style="{'text-align':'center'}">
14 <td class="zl">类型</td> 14 <el-table-column
15 <td class=""> 15 type="index"
16 多幢: 16 label="序号"
17 <el-button 17 width="80">
18 type="primary" 18 </el-table-column>
19 class="changeBtn outAdd addMinus" 19 <el-table-column
20 @click="newAddDz" 20 prop="zddm"
21 >+ 21 label="宗地代码">
22 </el-button> 22 </el-table-column>
23 自然幢: 23 <el-table-column
24 <el-button 24 prop="bdcdyh"
25 type="primary" 25 label="不动产单元号"
26 class="changeBtn outAdd addMinus" 26 width="350">
27 @click="newAddZrz" 27 </el-table-column>
28 >+ 28 <el-table-column
29 </el-button> 29 prop="xmmc"
30 </td> 30 label="项目名称">
31 </tr> 31 </el-table-column>
32 <tr v-if="dzhbqData.length==0"> 32 <el-table-column
33 <td colspan="9"> 33 prop="bdcqzh"
34 <span class="noData">暂无数据</span> 34 label="不动产权证号">
35 </td> 35 </el-table-column>
36 </tr> 36 <el-table-column
37 <tr v-else v-for="(item,index) in dzhbqData" :key="index"> 37 prop="qlr"
38 <td class="xh">{{index+1}}</td> 38 label="权利人">
39 <td class="zddm">{{item.zddm}}</td> 39 </el-table-column>
40 <td class="bdcdyh">{{item.bdcdyh}}</td> 40 <el-table-column
41 <td class="xmmc">{{item.xmmc}}</td> 41 prop="zl"
42 <td class="bdcqzh">{{item.bdcqzh}}</td> 42 label="坐落">
43 <td class="qlr">{{item.qlr}}</td> 43 </el-table-column>
44 <td class="zl">{{item.zl}}</td> 44 <el-table-column
45 <td class="zl">{{item.type=='zrz'?'自然幢':'多幢'}}</td> 45 width="300">
46 <td class="cz"> 46 <template slot="header">
47 <el-button 47 多幢:
48 type="primary" 48 <el-button
49 class="changeBtn outMinus addMinus" 49 type="primary"
50 @click="deleteData(index)" 50 class="changeBtn outAdd addMinus"
51 >- 51 @click="newAddDz"
52 </el-button> 52 >+
53 </td> 53 </el-button>
54 </tr> 54 自然幢:
55 </table> 55 <el-button
56 type="primary"
57 class="changeBtn outAdd addMinus"
58 @click="newAddZrz"
59 >+
60 </el-button>
61 </template>
62 <template slot-scope="scope">
63 <el-button
64 type="primary"
65 class="changeBtn outMinus addMinus"
66 @click="deleteData(scope.$index)"
67 >-
68 </el-button>
69 </template>
70 </el-table-column>
71 </el-table>
72 </div>
73
56 </div> 74 </div>
57 <div class="hbh dzhbh"> 75 <div class="hbh dzhbh">
58 <span class="tips" style="width:100%;display:block;margin-left:0;">合并后多幢信息</span> 76 <span class="tips" style="width:100%;display:block;margin-left:0;">合并后多幢信息</span>
...@@ -61,47 +79,47 @@ ...@@ -61,47 +79,47 @@
61 <span>多幢基本信息</span> 79 <span>多幢基本信息</span>
62 </div> 80 </div>
63 <ul class="zdjbxx"> 81 <ul class="zdjbxx">
64 <li> 82 <li >
65 <span class="label">行政区:</span> 83 <span class="label">行政区划:</span>
66 <span class="value"> 84 <span class="value">
67 <el-select v-model="dzhbhData.xzqbsm" @change="changeXzq(dzhbhData.xzqbsm)" 85 <el-row>
68 disabled> 86 <el-col :span="7" style="display: inline-block;">
87 <el-select v-model="dzhbhData.xzqbsm" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(dzhbhData.xzqbsm)" disabled>
88 <el-option
89 v-for="item in xzq"
90 :key="item.bsm"
91 :label="item.mc"
92 :value="item.bsm">
93 </el-option>
94 </el-select>
95 </el-col>
96 <el-col :span="1">&nbsp;</el-col>
97 <el-col :span="7">
98 <el-select v-model="dzhbhData.djqbsm" placeholder="地籍区" @change="changeDjq(dzhbhData.djqbsm)" disabled>
69 <el-option 99 <el-option
70 v-for="i in xzq" 100 v-for="item in djq"
71 :key="i.bsm" 101 :key="item.bsm"
72 :label="i.mc" 102 :label="item.mc"
73 :value="i.bsm" 103 :value="item.bsm">
74 ></el-option> 104 </el-option>
75 </el-select> 105 </el-select>
76 </span> 106 </el-col>
77 </li> 107 <el-col :span="1">&nbsp;</el-col>
78 <li> 108 <el-col :span="8">
79 <span class="label">地籍区:</span> 109 <el-select v-model="dzhbhData.djzqbsm" placeholder="地籍子区" @change="$forceUpdate()" disabled>
80 <span class="value">
81 <el-select v-model="dzhbhData.djqbsm" @change="changeDjq(dzhbhData.djqbsm)"
82 disabled>
83 <el-option 110 <el-option
84 v-for="i in djq" 111 v-for="item in djzq"
85 :key="i.bsm" 112 :key="item.bsm"
86 :label="i.mc" 113 :label="item.mc"
87 :value="i.bsm" 114 :value="item.bsm">
88 ></el-option> 115 </el-option>
89 </el-select>
90 </span>
91 </li>
92 <li>
93 <span class="label">地籍子区:</span>
94 <span class="value">
95 <el-select v-model="dzhbhData.djzqbsm" @change="$forceUpdate()" disabled>
96 <el-option
97 v-for="i in djzq"
98 :key="i.bsm"
99 :label="i.mc"
100 :value="i.bsm"
101 ></el-option>
102 </el-select> 116 </el-select>
103 </span> 117 </el-col>
118 </el-row>
119 </span>
104 </li> 120 </li>
121
122
105 <li> 123 <li>
106 <span class="label">所有权类型:</span> 124 <span class="label">所有权类型:</span>
107 <span class="value"> 125 <span class="value">
...@@ -434,6 +452,7 @@ ...@@ -434,6 +452,7 @@
434 this.geZrztData(this.queryData) 452 this.geZrztData(this.queryData)
435 }, 453 },
436 deleteData(index) { 454 deleteData(index) {
455 console.log(JSON.stringify(index)+":row")
437 let data = this.dzhbqData[index]; 456 let data = this.dzhbqData[index];
438 // 多幢 457 // 多幢
439 if (data.zrzCount) { 458 if (data.zrzCount) {
......
...@@ -435,13 +435,13 @@ export default { ...@@ -435,13 +435,13 @@ export default {
435 height: 72px!important; 435 height: 72px!important;
436 .header-top { 436 .header-top {
437 height: 72px; 437 height: 72px;
438 border-bottom: 1px solid#EAEAEA; 438 // border-bottom: 1px solid#EAEAEA;
439 box-sizing: border-box; 439 box-sizing: border-box;
440 .top-items { 440 .top-items {
441 cursor: pointer; 441 cursor: pointer;
442 height: 72px; 442 height: 72px;
443 padding: 0 30px; 443 padding: 0 30px;
444 font-size: 18px; 444 font-size: 20px;
445 line-height: 72px; 445 line-height: 72px;
446 float: left; 446 float: left;
447 position: relative; 447 position: relative;
...@@ -450,7 +450,7 @@ export default { ...@@ -450,7 +450,7 @@ export default {
450 /*border-right: 1px solid #EAEAEA;*/ 450 /*border-right: 1px solid #EAEAEA;*/
451 i { 451 i {
452 margin-right: 6px; 452 margin-right: 6px;
453 font-size: 18px; 453 font-size: 22px;
454 position: relative; 454 position: relative;
455 top: 1px; 455 top: 1px;
456 } 456 }
......
...@@ -34,12 +34,15 @@ ...@@ -34,12 +34,15 @@
34 <style scoped lang="less"> 34 <style scoped lang="less">
35 .el-tabs{ 35 .el-tabs{
36 height: calc(100% - 50px); 36 height: calc(100% - 50px);
37 /deep/.el-tabs__content{ 37 /deep/.el-tabs__content{
38 height: 100%; 38 height: 100%;
39 /deep/.el-tab-pane{ 39 /deep/.el-tab-pane{
40 height: 100%; 40 height: 100%;
41 } 41 }
42 background: #eaedf5; 42 background: #eaedf5;
43 } 43 }
44 /deep/ .el-tabs__item {
45 height: 48px;
46 }
44 } 47 }
45 </style> 48 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -172,6 +172,9 @@ ...@@ -172,6 +172,9 @@
172 } 172 }
173 background: #eaedf5; 173 background: #eaedf5;
174 } 174 }
175 /deep/ .el-tabs__item {
176 height: 48px;
177 }
175 .main { 178 .main {
176 width: 100%; 179 width: 100%;
177 height: 100%; 180 height: 100%;
......
...@@ -3,55 +3,67 @@ ...@@ -3,55 +3,67 @@
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 top20"> 5 <div class="hb-tabs top20">
6 <span class="tips">合并前宗地信息</span> 6 <span class="tips">合并前宗地信息(已选择宗地{{zdhbqData.length}}个)</span>
7 <div class="hbq"> 7 <div class="hbq">
8 <table border="1"> 8
9 <tr> 9 <el-table
10 <td class="xh">序号</td> 10 :data="zdhbqData"
11 <td class="zddm">宗地代码</td> 11 border
12 <td class="bdcdyh">不动产单元号</td> 12 style="width: 100%"
13 <td class="xmmc">项目名称</td> 13 height="200px"
14 <td class="bdcqzh">不动产权证号</td> 14 :header-cell-style="{'text-align':'center'}"
15 <td class="qlr">权利人</td> 15 :cell-style="{'text-align':'center'}">
16 <td class="zl">坐落</td> 16 <el-table-column
17 <td> 17 type="index"
18 label="序号"
19 width="80">
20 </el-table-column>
21 <el-table-column
22 prop="zddm"
23 label="宗地代码">
24 </el-table-column>
25 <el-table-column
26 prop="bdcdyh"
27 label="不动产单元号"
28 width="350">
29 </el-table-column>
30 <el-table-column
31 prop="xmmc"
32 label="项目名称">
33 </el-table-column>
34 <el-table-column
35 prop="bdcqzh"
36 label="不动产权证号">
37 </el-table-column>
38 <el-table-column
39 prop="qlr"
40 label="权利人">
41 </el-table-column>
42 <el-table-column
43 prop="zl"
44 label="坐落">
45 </el-table-column>
46 <el-table-column>
47 <template slot="header">
18 <el-button 48 <el-button
19 type="primary" 49 type="primary"
20 class="changeBtn outAdd addMinus" 50 class="changeBtn outAdd addMinus"
21 @click="newAdd" 51 @click="newAdd"
22 >+ 52 >+
23 </el-button> 53 </el-button>
24 </td> 54 </template>
25 </tr> 55 <template slot-scope="scope">
26 <tr v-if="zdhbqData.length==0">
27 <td colspan="8">
28 <span class="noData">暂无数据</span>
29 </td>
30 </tr>
31 <tr v-else v-for="(item,index) in zdhbqData" :key="index">
32 <td class="xh">{{index+1}}</td>
33 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
34 readonly="readonly"/></td>
35 <td class="bdcdyh"><input type="text" class="formInput" v-model="item.bdcdyh"
36 readonly="readonly"/></td>
37 <td class="xmmc"><input type="text" class="formInput" v-model="item.xmmc"
38 readonly="readonly"/></td>
39 <td class="bdcqzh"><input type="text" class="formInput" v-model="item.bdcqzh"
40 readonly="readonly"/></td>
41 <td class="qlr"><input type="text" class="formInput" v-model="item.qlr"
42 readonly="readonly"/></td>
43 <td class="zl"><input type="text" class="formInput" v-model="item.zl"
44 readonly="readonly"/></td>
45 <td class="cz">
46 <el-button 56 <el-button
47 type="primary" 57 type="primary"
48 class="changeBtn outMinus addMinus" 58 class="changeBtn outMinus addMinus"
49 @click="deleteData(item,index)" 59 @click="deleteData(scope.row,scope.$index)"
50 >- 60 >-
51 </el-button> 61 </el-button>
52 </td> 62 </template>
53 </tr> 63 </el-table-column>
54 </table> 64 </el-table>
65
66
55 </div> 67 </div>
56 <span class="tips">合并后宗地信息</span> 68 <span class="tips">合并后宗地信息</span>
57 <div class="hbh"> 69 <div class="hbh">
...@@ -60,45 +72,51 @@ ...@@ -60,45 +72,51 @@
60 <span>宗地基本信息</span> 72 <span>宗地基本信息</span>
61 </div> 73 </div>
62 <ul class="zdjbxx"> 74 <ul class="zdjbxx">
63 <li> 75
64 <span class="label">行政区:</span> 76 <li >
65 <span class="value"> 77 <span class="label">行政区划:</span>
66 <el-select v-model="zdhbhData.xzqbsm" @change="changeXzq(zdhbhData.xzqbsm)">
67 <el-option
68 v-for="i in xzq"
69 :key="i.bsm"
70 :label="i.mc"
71 :value="i.bsm"
72 ></el-option>
73 </el-select>
74 </span>
75 </li>
76 <li>
77 <span class="label">地籍区:</span>
78 <span class="value">
79 <el-select v-model="zdhbhData.djqbsm" @change="changeDjq(zdhbhData.djqbsm)">
80 <el-option
81 v-for="i in djq"
82 :key="i.bsm"
83 :label="i.mc"
84 :value="i.bsm"
85 ></el-option>
86 </el-select>
87 </span>
88 </li>
89 <li>
90 <span class="label">地籍子区:</span>
91 <span class="value"> 78 <span class="value">
92 <el-select v-model="zdhbhData.djzqbsm" @change="$forceUpdate()"> 79 <el-row>
93 <el-option 80 <el-col :span="7" style="display: inline-block;">
94 v-for="i in djzq" 81 <el-select v-model="zdhbhData.xzqbsm" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(zdhbhData.xzqbsm)">
95 :key="i.bsm" 82 <el-option
96 :label="i.mc" 83 v-for="item in xzq"
97 :value="i.bsm" 84 :key="item.bsm"
98 ></el-option> 85 :label="item.mc"
99 </el-select> 86 :value="item.bsm">
87 </el-option>
88 </el-select>
89 </el-col>
90 <el-col :span="1">&nbsp;</el-col>
91 <el-col :span="7">
92 <el-select v-model="zdhbhData.djqbsm" placeholder="地籍区" @change="changeDjq(zdhbhData.djqbsm)">
93 <el-option
94 v-for="item in djq"
95 :key="item.bsm"
96 :label="item.mc"
97 :value="item.bsm">
98 </el-option>
99 </el-select>
100 </el-col>
101 <el-col :span="1">&nbsp;</el-col>
102 <el-col :span="8">
103 <el-select v-model="zdhbhData.djzqbsm" placeholder="地籍子区" @change="$forceUpdate()">
104 <el-option
105 v-for="item in djzq"
106 :key="item.bsm"
107 :label="item.mc"
108 :value="item.bsm">
109 </el-option>
110 </el-select>
111 </el-col>
112 </el-row>
100 </span> 113 </span>
101 </li> 114 </li>
115
116
117
118
119
102 <li> 120 <li>
103 <span class="label">所有权类型:</span> 121 <span class="label">所有权类型:</span>
104 <span class="value"> 122 <span class="value">
...@@ -237,6 +255,7 @@ ...@@ -237,6 +255,7 @@
237 }) 255 })
238 }, 256 },
239 methods: { 257 methods: {
258
240 handleClick(tab, event) { 259 handleClick(tab, event) {
241 if (tab.name === 'h') { 260 if (tab.name === 'h') {
242 this.hhbtabs = true 261 this.hhbtabs = true
...@@ -663,6 +682,7 @@ ...@@ -663,6 +682,7 @@
663 } 682 }
664 .hbq { 683 .hbq {
665 margin: 14px 20px 20px 20px; 684 margin: 14px 20px 20px 20px;
685 height: 200px;
666 } 686 }
667 .dzhbh { 687 .dzhbh {
668 box-sizing: border-box !important; 688 box-sizing: border-box !important;
......
...@@ -68,5 +68,8 @@ export default { ...@@ -68,5 +68,8 @@ export default {
68 } 68 }
69 background: #eaedf5; 69 background: #eaedf5;
70 } 70 }
71 /deep/ .el-tabs__item {
72 height: 48px;
73 }
71 } 74 }
72 </style> 75 </style>
......
...@@ -139,27 +139,33 @@ ...@@ -139,27 +139,33 @@
139 let path = ""; 139 let path = "";
140 switch (row.dylx) { 140 switch (row.dylx) {
141 case "zd": 141 case "zd":
142 type = "0"; 142 type = "zd";
143 name = '宗地'; 143 name = '宗地';
144 path = "/zd"; 144 path = "/zd";
145 break; 145 break;
146 case "zrz": 146 case "zrz":
147 type = "1"; 147 type = "zrz";
148 name = '自然幢'; 148 name = '自然幢';
149 path = "/zrz"; 149 path = "/zrz";
150 break; 150 break;
151 case "h": 151 case "h":
152 case "h0": 152 case "h0":
153 case "h1": 153 case "h1":
154 type = "2"; 154 type = "h";
155 name = "户" 155 name = "户"
156 path = "/h"; 156 path = "/h";
157 break; 157 break;
158 case "dz": 158 case "dz":
159 type = "3"; 159 type = "dz";
160 name = "多幢"; 160 name = "多幢";
161 path = "/dz"; 161 path = "/dz";
162 break; 162 break;
163 case "gzw":
164 type = "gzw";
165 name = "构筑物";
166 path = "/gzw";
167 break;
168
163 default: 169 default:
164 break; 170 break;
165 } 171 }
...@@ -192,6 +198,11 @@ ...@@ -192,6 +198,11 @@
192 this.$store.state.dzbsm = row.glbsm; 198 this.$store.state.dzbsm = row.glbsm;
193 this.getTreeByBsm(row.glbsm,row.dylx,'1'); 199 this.getTreeByBsm(row.glbsm,row.dylx,'1');
194 break; 200 break;
201 case "gzw":
202 this.$store.state.dzbsm = row.glbsm;
203 this.getTreeByBsm(row.glbsm,row.dylx,'1');
204 break;
205
195 default: 206 default:
196 break; 207 break;
197 } 208 }
...@@ -240,6 +251,9 @@ ...@@ -240,6 +251,9 @@
240 } 251 }
241 background: #eaedf5; 252 background: #eaedf5;
242 } 253 }
254 /deep/ .el-tabs__item {
255 height: 48px;
256 }
243 .main { 257 .main {
244 width: 100%; 258 width: 100%;
245 height: 100%; 259 height: 100%;
......
...@@ -197,6 +197,9 @@ ...@@ -197,6 +197,9 @@
197 } 197 }
198 background: #eaedf5; 198 background: #eaedf5;
199 } 199 }
200 /deep/ .el-tabs__item {
201 height: 48px;
202 }
200 .main { 203 .main {
201 width: 100%; 204 width: 100%;
202 height: 100%; 205 height: 100%;
......