Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
c34224b9 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents c8810a1b daa7fe4f
Inline Side-by-side
Showing 5 changed files with 102 additions and 46 deletions
...@@ -16,12 +16,12 @@ ...@@ -16,12 +16,12 @@
16 <td class="qlr">权利人</td> 16 <td class="qlr">权利人</td>
17 <td class="zl">坐落</td> 17 <td class="zl">坐落</td>
18 </tr> 18 </tr>
19 <tr v-if="bgqData.length==0"> 19 <tr v-if="zdhbqData.length==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 v-for="(item,index) in bgqData" :key="index"> 24 <tr v-else v-for="(item,index) in zdhbqData" :key="index">
25 <td class="xh">{{index+1}}</td> 25 <td class="xh">{{index+1}}</td>
26 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm" 26 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
27 readonly="readonly"/></td> 27 readonly="readonly"/></td>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
52 </tr> 52 </tr>
53 <tr> 53 <tr>
54 <td class="xzq"> 54 <td class="xzq">
55 <el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)"> 55 <el-select v-model="zdhbhData.xzqbsm" @change="changeXzq(zdhbhData.xzqbsm)">
56 <el-option 56 <el-option
57 v-for="i in xzq" 57 v-for="i in xzq"
58 :key="i.bsm" 58 :key="i.bsm"
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
62 </el-select> 62 </el-select>
63 </td> 63 </td>
64 <td class="djq"> 64 <td class="djq">
65 <el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)"> 65 <el-select v-model="zdhbhData.djqbsm" @change="changeDjq(zdhbhData.djqbsm)">
66 <el-option 66 <el-option
67 v-for="i in djq" 67 v-for="i in djq"
68 :key="i.bsm" 68 :key="i.bsm"
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
72 </el-select> 72 </el-select>
73 </td> 73 </td>
74 <td class="syqlx"> 74 <td class="syqlx">
75 <el-select v-model="hbhData.djzqbsm"> 75 <el-select v-model="zdhbhData.djzqbsm">
76 <el-option 76 <el-option
77 v-for="i in djzq" 77 v-for="i in djzq"
78 :key="i.bsm" 78 :key="i.bsm"
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
82 </el-select> 82 </el-select>
83 </td> 83 </td>
84 <td class="tdtzm"> 84 <td class="tdtzm">
85 <el-select v-model="hbhData.syqlxbsm"> 85 <el-select v-model="zdhbhData.syqlxbsm">
86 <el-option 86 <el-option
87 v-for="i in syq" 87 v-for="i in syq"
88 :key="i.value" 88 :key="i.value"
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
92 </el-select> 92 </el-select>
93 </td> 93 </td>
94 <td class="syqlx"> 94 <td class="syqlx">
95 <el-select v-model="hbhData.zdtzmbsm"> 95 <el-select v-model="zdhbhData.zdtzmbsm">
96 <el-option 96 <el-option
97 v-for="i in tdtzm" 97 v-for="i in tdtzm"
98 :key="i.bsm" 98 :key="i.bsm"
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
102 </el-select> 102 </el-select>
103 </td> 103 </td>
104 <td class="xmmc"> 104 <td class="xmmc">
105 <input type="text" v-model="hbhData.xmmc" class="formInput"/> 105 <input type="text" v-model="zdhbhData.xmmc" class="formInput"/>
106 </td> 106 </td>
107 <td class="zxx"> 107 <td class="zxx">
108 <span class="xz">选择</span> 108 <span class="xz">选择</span>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
122 <div class="hb-tabs"> 122 <div class="hb-tabs">
123 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> 123 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
124 <div class="hbq"> 124 <div class="hbq">
125 <span class="tips">合并前宗地信息</span> 125 <span class="tips">合并前多幢信息</span>
126 <table border="1"> 126 <table border="1">
127 <tr> 127 <tr>
128 <td class="xh">序号</td> 128 <td class="xh">序号</td>
...@@ -133,12 +133,12 @@ ...@@ -133,12 +133,12 @@
133 <td class="qlr">权利人</td> 133 <td class="qlr">权利人</td>
134 <td class="zl">坐落</td> 134 <td class="zl">坐落</td>
135 </tr> 135 </tr>
136 <tr v-if="bgqData.length==0"> 136 <tr v-if="dzhbqData.length==0">
137 <td colspan="7"> 137 <td colspan="7">
138 <span class="noData">暂无数据</span> 138 <span class="noData">暂无数据</span>
139 </td> 139 </td>
140 </tr> 140 </tr>
141 <tr v-else v-for="(item,index) in bgqData" :key="index"> 141 <tr v-else v-for="(item,index) in dzhbqData" :key="index">
142 <td class="xh">{{index+1}}</td> 142 <td class="xh">{{index+1}}</td>
143 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm" 143 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
144 readonly="readonly"/></td> 144 readonly="readonly"/></td>
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
156 </table> 156 </table>
157 </div> 157 </div>
158 <div class="hbh"> 158 <div class="hbh">
159 <span class="tips">合并后宗地信息</span> 159 <span class="tips">合并后多幢信息</span>
160 <table border="1"> 160 <table border="1">
161 <tr> 161 <tr>
162 <th class="xzq">行政区</th> 162 <th class="xzq">行政区</th>
...@@ -169,7 +169,7 @@ ...@@ -169,7 +169,7 @@
169 </tr> 169 </tr>
170 <tr> 170 <tr>
171 <td class="xzq"> 171 <td class="xzq">
172 <el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)"> 172 <el-select v-model="dzhbhData.xzqbsm" @change="changeXzq(dzhbhData.xzqbsm)">
173 <el-option 173 <el-option
174 v-for="i in xzq" 174 v-for="i in xzq"
175 :key="i.bsm" 175 :key="i.bsm"
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
179 </el-select> 179 </el-select>
180 </td> 180 </td>
181 <td class="djq"> 181 <td class="djq">
182 <el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)"> 182 <el-select v-model="dzhbhData.djqbsm" @change="changeDjq(dzhbhData.djqbsm)">
183 <el-option 183 <el-option
184 v-for="i in djq" 184 v-for="i in djq"
185 :key="i.bsm" 185 :key="i.bsm"
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
189 </el-select> 189 </el-select>
190 </td> 190 </td>
191 <td class="syqlx"> 191 <td class="syqlx">
192 <el-select v-model="hbhData.djzqbsm"> 192 <el-select v-model="dzhbhData.djzqbsm">
193 <el-option 193 <el-option
194 v-for="i in djzq" 194 v-for="i in djzq"
195 :key="i.bsm" 195 :key="i.bsm"
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
199 </el-select> 199 </el-select>
200 </td> 200 </td>
201 <td class="tdtzm"> 201 <td class="tdtzm">
202 <el-select v-model="hbhData.syqlxbsm"> 202 <el-select v-model="dzhbhData.syqlxbsm">
203 <el-option 203 <el-option
204 v-for="i in syq" 204 v-for="i in syq"
205 :key="i.value" 205 :key="i.value"
...@@ -209,7 +209,7 @@ ...@@ -209,7 +209,7 @@
209 </el-select> 209 </el-select>
210 </td> 210 </td>
211 <td class="syqlx"> 211 <td class="syqlx">
212 <el-select v-model="hbhData.zdtzmbsm"> 212 <el-select v-model="dzhbhData.zdtzmbsm">
213 <el-option 213 <el-option
214 v-for="i in tdtzm" 214 v-for="i in tdtzm"
215 :key="i.bsm" 215 :key="i.bsm"
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
219 </el-select> 219 </el-select>
220 </td> 220 </td>
221 <td class="xmmc"> 221 <td class="xmmc">
222 <input type="text" v-model="hbhData.xmmc" class="formInput"/> 222 <input type="text" v-model="dzhbhData.xmmc" class="formInput"/>
223 </td> 223 </td>
224 <td class="zxx"> 224 <td class="zxx">
225 <span class="xz">选择</span> 225 <span class="xz">选择</span>
...@@ -238,7 +238,7 @@ ...@@ -238,7 +238,7 @@
238 <div class="hb-tabs"> 238 <div class="hb-tabs">
239 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button> 239 <el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
240 <div class="hbq"> 240 <div class="hbq">
241 <span class="tips">合并前宗地信息</span> 241 <span class="tips">合并前户信息</span>
242 <table border="1"> 242 <table border="1">
243 <tr> 243 <tr>
244 <td class="xh">序号</td> 244 <td class="xh">序号</td>
...@@ -249,12 +249,12 @@ ...@@ -249,12 +249,12 @@
249 <td class="qlr">权利人</td> 249 <td class="qlr">权利人</td>
250 <td class="zl">坐落</td> 250 <td class="zl">坐落</td>
251 </tr> 251 </tr>
252 <tr v-if="bgqData.length==0"> 252 <tr v-if="hhbqData.length==0">
253 <td colspan="7"> 253 <td colspan="7">
254 <span class="noData">暂无数据</span> 254 <span class="noData">暂无数据</span>
255 </td> 255 </td>
256 </tr> 256 </tr>
257 <tr v-else v-for="(item,index) in bgqData" :key="index"> 257 <tr v-else v-for="(item,index) in hhbqData" :key="index">
258 <td class="xh">{{index+1}}</td> 258 <td class="xh">{{index+1}}</td>
259 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm" 259 <td class="zddm"><input type="text" class="formInput" v-model="item.zddm"
260 readonly="readonly"/></td> 260 readonly="readonly"/></td>
...@@ -272,7 +272,7 @@ ...@@ -272,7 +272,7 @@
272 </table> 272 </table>
273 </div> 273 </div>
274 <div class="hbh"> 274 <div class="hbh">
275 <span class="tips">合并后宗地信息</span> 275 <span class="tips">合并后户信息</span>
276 <table border="1"> 276 <table border="1">
277 <tr> 277 <tr>
278 <th class="xzq">行政区</th> 278 <th class="xzq">行政区</th>
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
285 </tr> 285 </tr>
286 <tr> 286 <tr>
287 <td class="xzq"> 287 <td class="xzq">
288 <el-select v-model="hbhData.xzqbsm" @change="changeXzq(hbhData.xzqbsm)"> 288 <el-select v-model="hhbhData.xzqbsm" @change="changeXzq(hhbhData.xzqbsm)">
289 <el-option 289 <el-option
290 v-for="i in xzq" 290 v-for="i in xzq"
291 :key="i.bsm" 291 :key="i.bsm"
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
295 </el-select> 295 </el-select>
296 </td> 296 </td>
297 <td class="djq"> 297 <td class="djq">
298 <el-select v-model="hbhData.djqbsm" @change="changeDjq(hbhData.djqbsm)"> 298 <el-select v-model="hhbhData.djqbsm" @change="changeDjq(hhbhData.djqbsm)">
299 <el-option 299 <el-option
300 v-for="i in djq" 300 v-for="i in djq"
301 :key="i.bsm" 301 :key="i.bsm"
...@@ -305,7 +305,7 @@ ...@@ -305,7 +305,7 @@
305 </el-select> 305 </el-select>
306 </td> 306 </td>
307 <td class="syqlx"> 307 <td class="syqlx">
308 <el-select v-model="hbhData.djzqbsm"> 308 <el-select v-model="hhbhData.djzqbsm">
309 <el-option 309 <el-option
310 v-for="i in djzq" 310 v-for="i in djzq"
311 :key="i.bsm" 311 :key="i.bsm"
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
315 </el-select> 315 </el-select>
316 </td> 316 </td>
317 <td class="tdtzm"> 317 <td class="tdtzm">
318 <el-select v-model="hbhData.syqlxbsm"> 318 <el-select v-model="hhbhData.syqlxbsm">
319 <el-option 319 <el-option
320 v-for="i in syq" 320 v-for="i in syq"
321 :key="i.value" 321 :key="i.value"
...@@ -325,7 +325,7 @@ ...@@ -325,7 +325,7 @@
325 </el-select> 325 </el-select>
326 </td> 326 </td>
327 <td class="syqlx"> 327 <td class="syqlx">
328 <el-select v-model="hbhData.zdtzmbsm"> 328 <el-select v-model="hhbhData.zdtzmbsm">
329 <el-option 329 <el-option
330 v-for="i in tdtzm" 330 v-for="i in tdtzm"
331 :key="i.bsm" 331 :key="i.bsm"
...@@ -335,7 +335,7 @@ ...@@ -335,7 +335,7 @@
335 </el-select> 335 </el-select>
336 </td> 336 </td>
337 <td class="xmmc"> 337 <td class="xmmc">
338 <input type="text" v-model="hbhData.xmmc" class="formInput"/> 338 <input type="text" v-model="hhbhData.xmmc" class="formInput"/>
339 </td> 339 </td>
340 <td class="zxx"> 340 <td class="zxx">
341 <span class="xz">选择</span> 341 <span class="xz">选择</span>
...@@ -372,8 +372,12 @@ ...@@ -372,8 +372,12 @@
372 return { 372 return {
373 tabName: 'zd', 373 tabName: 'zd',
374 centerDialogVisible: false, 374 centerDialogVisible: false,
375 zdFgqData: [], 375 zdhbqData: [], // 宗地合并前数据
376 hbhData: {}, 376 dzhbqData: [], // 多幢合并前数据
377 hhbqData: [], // 户合并前数据
378 zdhbhData: {}, // 宗地合并后数据
379 dzhbhData: {}, // 多幢合并后数据
380 hhbhData: {}, // 户合并后数据
377 fgBoxWidth: 0, 381 fgBoxWidth: 0,
378 xzq: [], 382 xzq: [],
379 djq: [], 383 djq: [],
...@@ -421,8 +425,22 @@ ...@@ -421,8 +425,22 @@
421 changeXzq(id) { 425 changeXzq(id) {
422 this.djq = []; 426 this.djq = [];
423 this.djzq = []; 427 this.djzq = [];
424 this.hbhData.djqbsm = '' 428 switch (this.tabName) {
425 this.hbhData.djzqbsm = '' 429 case "zd":
430 this.zdhbqData.djqbsm = '';
431 this.zdhbqData.djzqbsm = '';
432 break
433 case "dz":
434 this.dzhbqData.djqbsm = '';
435 this.dzhbqData.djzqbsm = '';
436 break
437 case "h":
438 this.hhbqData.djqbsm = '';
439 this.hhbqData.djzqbsm = '';
440 break
441 default:
442 break
443 }
426 getListByXzqbsm(id) 444 getListByXzqbsm(id)
427 .then((res) => { 445 .then((res) => {
428 if (res.result == null) { 446 if (res.result == null) {
...@@ -436,7 +454,19 @@ ...@@ -436,7 +454,19 @@
436 }, 454 },
437 changeDjq(item) { 455 changeDjq(item) {
438 this.djzq = []; 456 this.djzq = [];
439 this.hbhData.djzqbsm = '' 457 switch (this.tabName) {
458 case "zd":
459 this.zdhbqData.djzqbsm = '';
460 break
461 case "dz":
462 this.dzhbqData.djzqbsm = '';
463 break
464 case "h":
465 this.hhbqData.djzqbsm = '';
466 break
467 default:
468 break
469 }
440 if (item == null) { 470 if (item == null) {
441 } else { 471 } else {
442 getListByPbsm(item) 472 getListByPbsm(item)
...@@ -460,12 +490,20 @@ ...@@ -460,12 +490,20 @@
460 newAdd: function () { 490 newAdd: function () {
461 this.centerDialogVisible = true; 491 this.centerDialogVisible = true;
462 }, 492 },
463 addData: function (val) {
464 this.centerDialogVisible = false;
465 this.zdFgqData.push(val)
466 },
467 getData: function (data) { 493 getData: function (data) {
468 this.zdFgqData.push(data) 494 switch (this.tabName) {
495 case "zd":
496 this.zdhbqData.push(data)
497 break
498 case "dz":
499 this.dzhbqData.push(data)
500 break
501 case "h":
502 this.hhbqData.push(data)
503 break
504 default:
505 break;
506 }
469 }, 507 },
470 }, 508 },
471 computed: {}, 509 computed: {},
......
...@@ -134,7 +134,7 @@ export default { ...@@ -134,7 +134,7 @@ export default {
134 ljzbsm: "", 134 ljzbsm: "",
135 zdybsm: "", 135 zdybsm: "",
136 zrzbsm: "", 136 zrzbsm: "",
137 scyclx: "0", 137 scyclx: this.scyclx,
138 qsc: "", 138 qsc: "",
139 jsc: "", 139 jsc: "",
140 hs: "", 140 hs: "",
...@@ -169,7 +169,7 @@ export default { ...@@ -169,7 +169,7 @@ export default {
169 immediate: true, 169 immediate: true,
170 deep: true, 170 deep: true,
171 }, 171 },
172 dialogVisible:{ 172 scyclx:{
173 handler(n){ 173 handler(n){
174 this.$nextTick(()=>{ 174 this.$nextTick(()=>{
175 this.formData.scyclx = this.scyclx; 175 this.formData.scyclx = this.scyclx;
......
...@@ -411,7 +411,11 @@ ...@@ -411,7 +411,11 @@
411 Qlxz, 411 Qlxz,
412 }, 412 },
413 props:{ 413 props:{
414 bsm:String //户标识码 414 bsm:String, //户标识码
415 scyclx:{
416 type: String,
417 default: "1",
418 },
415 }, 419 },
416 data () { 420 data () {
417 return { 421 return {
...@@ -792,6 +796,15 @@ ...@@ -792,6 +796,15 @@
792 this.form.bdcdyh=res.result; 796 this.form.bdcdyh=res.result;
793 }) 797 })
794 }, 798 },
799 },
800 watch: {
801 scyclx:{
802 handler(n){
803 this.$nextTick(()=>{
804 this.form.scyclx = this.scyclx;
805 })
806 }
807 }
795 } 808 }
796 } 809 }
797 </script> 810 </script>
......
...@@ -249,7 +249,7 @@ ...@@ -249,7 +249,7 @@
249 ></h-cxlz> 249 ></h-cxlz>
250 <!-- 双击户的弹出框 --> 250 <!-- 双击户的弹出框 -->
251 <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center> 251 <el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
252 <hbj ref="hbj" :bsm="hbsm"></hbj> 252 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
253 <div class="btnGroup"> 253 <div class="btnGroup">
254 <el-button type="primary" @click="hbjSaveInfo">保存</el-button> 254 <el-button type="primary" @click="hbjSaveInfo">保存</el-button>
255 <el-button type="primary" @click="hbjResetInfo">重置</el-button> 255 <el-button type="primary" @click="hbjResetInfo">重置</el-button>
...@@ -573,7 +573,7 @@ export default { ...@@ -573,7 +573,7 @@ export default {
573 plScYcChange() { 573 plScYcChange() {
574 let data = { 574 let data = {
575 zrzbsm: this.$store.state.zrzbsm, 575 zrzbsm: this.$store.state.zrzbsm,
576 scyclx: "0", 576 scyclx: this.scyclx,
577 }; 577 };
578 batchScYcChange(data).then((res) => { 578 batchScYcChange(data).then((res) => {
579 if (res.code === 200) { 579 if (res.code === 200) {
...@@ -607,7 +607,7 @@ export default { ...@@ -607,7 +607,7 @@ export default {
607 getDyztBsmList() { 607 getDyztBsmList() {
608 let data = { 608 let data = {
609 zrzbsm: this.$store.state.zrzbsm, 609 zrzbsm: this.$store.state.zrzbsm,
610 scyclx: "0", 610 scyclx: this.scyclx,
611 }; 611 };
612 getLpbTj(data).then((res) => { 612 getLpbTj(data).then((res) => {
613 if (res.code === 200) { 613 if (res.code === 200) {
...@@ -664,7 +664,7 @@ export default { ...@@ -664,7 +664,7 @@ export default {
664 getLpbFwytAndQlxz(){ 664 getLpbFwytAndQlxz(){
665 let data = { 665 let data = {
666 zrzbsm: this.$store.state.zrzbsm, 666 zrzbsm: this.$store.state.zrzbsm,
667 scyclx: "0", 667 scyclx: this.scyclx,
668 }; 668 };
669 getLpbFwytAndQlxz(data).then((res) => { 669 getLpbFwytAndQlxz(data).then((res) => {
670 if (res.code === 200) { 670 if (res.code === 200) {
......
...@@ -241,7 +241,12 @@ export default { ...@@ -241,7 +241,12 @@ export default {
241 highest = 0; 241 highest = 0;
242 } 242 }
243 } else { 243 } else {
244 // this.zdyWidth = 124; 244 //有且仅有独立层户
245 if(this.$refs.hBsm != undefined){
246 this.$refs.hBsm.forEach((item) => {
247 this.zdyWidth += item.offsetWidth + 21;
248 });
249 }
245 } 250 }
246 251
247 //计算逻辑幢下的幢单元和层户的高度 252 //计算逻辑幢下的幢单元和层户的高度
......