Skip to content

任超 / js.CadastralSystem

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

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

2 parents 6fa087fa ca9b8f12
Inline Side-by-side
Showing 6 changed files with 53 additions and 33 deletions
...@@ -255,7 +255,7 @@ export default { ...@@ -255,7 +255,7 @@ export default {
255 }else if(this.$route.path == '/zd'){ 255 }else if(this.$route.path == '/zd'){
256 this.getRightTree(this.$store.state.zdbsm) 256 this.getRightTree(this.$store.state.zdbsm)
257 }else if(this.$route.path == '/dz'){ 257 }else if(this.$route.path == '/dz'){
258 this.getRightTree(this.$store.state.dzbsm) 258 this.getRightTreeByDzbsm(this.$store.state.dzbsm)
259 }else{ 259 }else{
260 this.getTreeList(); 260 this.getTreeList();
261 } 261 }
......
...@@ -37,16 +37,9 @@ ...@@ -37,16 +37,9 @@
37 </tr> 37 </tr>
38 38
39 <tr height="30"> 39 <tr height="30">
40 <td colspan="2" align="center" >房屋类型</td> 40 <td colspan="2" align="center" >共有土地面积（㎡）</td>
41 <td colspan="4" > 41 <td colspan="4" >
42 <el-select class="formSelect" v-model="form.fwlxbsm" placeholder="请选择" > 42 <input class="formInput" v-model="form.zdmj">
43 <el-option
44 v-for="item in $store.state.fwlxList"
45 :key="item.bsm"
46 :label="item.mc"
47 :value="item.bsm">
48 </el-option>
49 </el-select>
50 </td> 43 </td>
51 <td colspan="2" align="center" >竣工日期</td> 44 <td colspan="2" align="center" >竣工日期</td>
52 <td colspan="4" > 45 <td colspan="4" >
...@@ -59,6 +52,10 @@ ...@@ -59,6 +52,10 @@
59 </tr> 52 </tr>
60 53
61 <tr height="30"> 54 <tr height="30">
55 <td colspan="2" align="center" >分摊土地面积（㎡）</td>
56 <td colspan="4" >
57 <input class="formInput" v-model="form.fttdsymj">
58 </td>
62 <td colspan="2" align="center" >产别</td> 59 <td colspan="2" align="center" >产别</td>
63 <td colspan="4" > 60 <td colspan="4" >
64 <el-select class="formSelect" v-model="form.fwcbbsm" placeholder="请选择" > 61 <el-select class="formSelect" v-model="form.fwcbbsm" placeholder="请选择" >
...@@ -70,6 +67,13 @@ ...@@ -70,6 +67,13 @@
70 </el-option> 67 </el-option>
71 </el-select> 68 </el-select>
72 </td> 69 </td>
70 </tr>
71
72 <tr height="30">
73 <td colspan="2" align="center" >多幢独用土地面积（㎡）</td>
74 <td colspan="4" >
75 <input class="formInput" v-model="form.dlsytdmj">
76 </td>
73 <td colspan="2" align="center" >产权来源</td> 77 <td colspan="2" align="center" >产权来源</td>
74 <td colspan="4" > 78 <td colspan="4" >
75 <el-select class="formSelect" v-model="form.fwcqlybsm" placeholder="请选择" > 79 <el-select class="formSelect" v-model="form.fwcqlybsm" placeholder="请选择" >
...@@ -96,6 +100,7 @@ ...@@ -96,6 +100,7 @@
96 <td colspan="3" align="center" > 100 <td colspan="3" align="center" >
97 <el-select-tree style="width:100%" 101 <el-select-tree style="width:100%"
98 v-if="show" 102 v-if="show"
103 @change="updateSjfyyt(item1)"
99 :default-expand-all="defaultExpandAll" 104 :default-expand-all="defaultExpandAll"
100 :multiple="multiple" 105 :multiple="multiple"
101 :placeholder="placeholder" 106 :placeholder="placeholder"
...@@ -124,21 +129,6 @@ ...@@ -124,21 +129,6 @@
124 </td> 129 </td>
125 </tr> 130 </tr>
126 131
127 <tr height="30">
128 <td colspan="2" align="center" >共有土地面积（㎡）</td>
129 <td colspan="2" >
130 <input class="formInput" v-model="form.zdmj">
131 </td>
132 <td colspan="2" align="center" >分摊土地面积（㎡）</td>
133 <td colspan="2" >
134 <input class="formInput" v-model="form.fttdsymj">
135 </td>
136 <td colspan="2" align="center" >多幢独用土地面积（㎡）</td>
137 <td colspan="2" >
138 <input class="formInput" v-model="form.dlsytdmj">
139 </td>
140 </tr>
141
142 <tr> 132 <tr>
143 <td colspan="12" align="center"> 133 <td colspan="12" align="center">
144 <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz> 134 <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
...@@ -450,6 +440,11 @@ ...@@ -450,6 +440,11 @@
450 } 440 }
451 }) 441 })
452 }, 442 },
443
444 updateSjfyyt(data){
445 data.fwsjytbsm = data.fwytzdbsm;
446 },
447
453 open() { 448 open() {
454 this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', { 449 this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', {
455 confirmButtonText: '确定', 450 confirmButtonText: '确定',
...@@ -497,7 +492,17 @@ ...@@ -497,7 +492,17 @@
497 this.getDzDetailByBsm(this.$route.query.bsm) 492 this.getDzDetailByBsm(this.$route.query.bsm)
498 } 493 }
499 }, 494 },
495 computed: {
496 dzbsm() {
497 return this.$route.query.bsm;
498 },
499 },
500 watch:{ 500 watch:{
501
502 dzbsm:function (val) {
503 this.getDzDetailByBsm(val)
504 },
505
501 "$store.state.sxdrType": { 506 "$store.state.sxdrType": {
502 handler(n) { 507 handler(n) {
503 this.$nextTick(()=>{ 508 this.$nextTick(()=>{
......
...@@ -283,13 +283,14 @@ ...@@ -283,13 +283,14 @@
283 let data={ 283 let data={
284 newzddjqbsm: this.zdhbhData.djqbsm, 284 newzddjqbsm: this.zdhbhData.djqbsm,
285 newzddjzqbsm: this.zdhbhData.djzqbsm, 285 newzddjzqbsm: this.zdhbhData.djzqbsm,
286 newzdsyqlxbsm: this.zdhbqData.syqlxbsm, 286 newzdsyqlxbsm: this.zdhbhData.syqlxbsm,
287 newzduserbsm: "", 287 newzduserbsm: "",
288 newzdxmmc: this.zdhbqData.xmmc, 288 newzdxmmc: this.zdhbhData.xmmc,
289 newzdxzqbsm: this.zdhbqData.xzqbsm, 289 newzdxzqbsm: this.zdhbhData.xzqbsm,
290 newzdzdtzmbsm: this.zdhbqData.zdtzmbsm, 290 newzdzdtzmbsm: this.zdhbhData.zdtzmbsm,
291 oldzdbsms: oldBsm 291 oldzdbsms: oldBsm
292 } 292 }
293 console.log(data,'宗地合并数据')
293 ZdHb(data).then(res=>{ 294 ZdHb(data).then(res=>{
294 if (res.success) { 295 if (res.success) {
295 this.$message.success("合并成功") 296 this.$message.success("合并成功")
...@@ -456,10 +457,10 @@ ...@@ -456,10 +457,10 @@
456 console.log(params); 457 console.log(params);
457 //TODO 调用保存接口 458 //TODO 调用保存接口
458 // saveDzHb(params).then((res) => { 459 // saveDzHb(params).then((res) => {
459 460
460 // }) 461 // })
461 // .catch((error) => { 462 // .catch((error) => {
462 463
463 // }); 464 // });
464 }) 465 })
465 } 466 }
...@@ -629,5 +630,5 @@ ...@@ -629,5 +630,5 @@
629 } 630 }
630 /deep/ .el-select { 631 /deep/ .el-select {
631 width: 100%; 632 width: 100%;
632 } 633 }
633 </style> 634 </style>
......
...@@ -21,6 +21,8 @@ ...@@ -21,6 +21,8 @@
21 {{scope.row.dylx | bdcLxFilter}} 21 {{scope.row.dylx | bdcLxFilter}}
22 </template> 22 </template>
23 </el-table-column> 23 </el-table-column>
24 <el-table-column prop="qsztValue" align="left" label="权属状态">
25 </el-table-column>
24 <el-table-column prop="qlrmc" align="left" width="120" label="权利人"> 26 <el-table-column prop="qlrmc" align="left" width="120" label="权利人">
25 </el-table-column> 27 </el-table-column>
26 <el-table-column prop="zl" align="left" label="坐落"></el-table-column> 28 <el-table-column prop="zl" align="left" label="坐落"></el-table-column>
......
...@@ -238,6 +238,7 @@ ...@@ -238,6 +238,7 @@
238 <el-select-tree 238 <el-select-tree
239 v-if="show" 239 v-if="show"
240 :default-expand-all="defaultExpandAll" 240 :default-expand-all="defaultExpandAll"
241 @change="updateSjfyyt(item1)"
241 :multiple="multiple" 242 :multiple="multiple"
242 :placeholder="placeholder" 243 :placeholder="placeholder"
243 :disabled="disableFlag" 244 :disabled="disableFlag"
...@@ -546,6 +547,11 @@ ...@@ -546,6 +547,11 @@
546 } 547 }
547 }) 548 })
548 }, 549 },
550
551 updateSjfyyt(data){
552 data.fwsjytbsm = data.fwytzdbsm;
553 },
554
549 addYtInfo(){ 555 addYtInfo(){
550 this.form.fwytList.push({ 556 this.form.fwytList.push({
551 glbsm:'', 557 glbsm:'',
......
...@@ -158,6 +158,7 @@ ...@@ -158,6 +158,7 @@
158 <el-select-tree style="width:100%" 158 <el-select-tree style="width:100%"
159 ref="ghyt" 159 ref="ghyt"
160 v-if="show" 160 v-if="show"
161 @change="updateSjfyyt(item1)"
161 :default-expand-all="defaultExpandAll" 162 :default-expand-all="defaultExpandAll"
162 :multiple="multiple" 163 :multiple="multiple"
163 :placeholder="placeholder" 164 :placeholder="placeholder"
...@@ -182,7 +183,7 @@ ...@@ -182,7 +183,7 @@
182 :props="treeProps" 183 :props="treeProps"
183 :check-strictly="checkStrictly" 184 :check-strictly="checkStrictly"
184 :clearable="clearable" 185 :clearable="clearable"
185 v-model="item1.fwytzdbsm" 186 v-model="item1.fwsjytbsm"
186 ></el-select-tree> 187 ></el-select-tree>
187 </td> 188 </td>
188 </tr> 189 </tr>
...@@ -403,6 +404,11 @@ ...@@ -403,6 +404,11 @@
403 }, 404 },
404 mixins:[geoUtils], 405 mixins:[geoUtils],
405 methods: { 406 methods: {
407
408 updateSjfyyt(data){
409 data.fwsjytbsm = data.fwytzdbsm;
410 },
411
406 registerCall(){ 412 registerCall(){
407 let data={ 413 let data={
408 type:'zrz', 414 type:'zrz',
......