Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem
Showing
8 changed files
with
57 additions
and
14 deletions
... | @@ -44,3 +44,18 @@ export function getQlrInfoByGlbsm(data) { | ... | @@ -44,3 +44,18 @@ export function getQlrInfoByGlbsm(data) { |
44 | }, | 44 | }, |
45 | }) | 45 | }) |
46 | } | 46 | } |
47 | |||
48 | /** | ||
49 | * 更新权利人共有公用情况 | ||
50 | */ | ||
51 | export function updateGyGyQlrQk(glbsm,type,gyqkbsm) { | ||
52 | return request({ | ||
53 | url: '/system/Qlr/updateGyGyQlrQk', | ||
54 | method: 'get', | ||
55 | params: { | ||
56 | glbsm:glbsm, | ||
57 | type:type, | ||
58 | gyqkbsm:gyqkbsm, | ||
59 | }, | ||
60 | }) | ||
61 | } | ||
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -7,8 +7,8 @@ | ... | @@ -7,8 +7,8 @@ |
7 | <td colspan="8"> | 7 | <td colspan="8"> |
8 | <el-row> | 8 | <el-row> |
9 | <el-col :span="14" class="fl" style="line-height:32px"> | 9 | <el-col :span="14" class="fl" style="line-height:32px"> |
10 | <el-radio-group v-model="gyfs"> | 10 | <el-radio-group v-model="gyfs" @change="updateGyfs"> |
11 | <el-radio :label="item.bsm" :disabled="+qszt!==0 || item.disabled" :key="item.bsm" v-for="item in gyfsList">{{item.mc}}</el-radio> | 11 | <el-radio :label="item.bsm" :disabled="+qszt!==0" :key="item.bsm" v-for="item in gyfsList">{{item.mc}}</el-radio> |
12 | </el-radio-group> | 12 | </el-radio-group> |
13 | </el-col> | 13 | </el-col> |
14 | <el-col :span="10" class="fr"> | 14 | <el-col :span="10" class="fr"> |
... | @@ -268,7 +268,7 @@ | ... | @@ -268,7 +268,7 @@ |
268 | <tr> | 268 | <tr> |
269 | <td colspan="4" class="tdright">共有方式</td> | 269 | <td colspan="4" class="tdright">共有方式</td> |
270 | <td colspan="6"> | 270 | <td colspan="6"> |
271 | <el-select class="formSelect" v-model="formData.gyfsbsm"> | 271 | <el-select class="formSelect" v-model="formData.gyfsbsm" disabled> |
272 | <el-option | 272 | <el-option |
273 | v-for="item in $store.state.gyfsList" | 273 | v-for="item in $store.state.gyfsList" |
274 | :key="item.bsm" | 274 | :key="item.bsm" |
... | @@ -313,7 +313,7 @@ | ... | @@ -313,7 +313,7 @@ |
313 | 313 | ||
314 | <script> | 314 | <script> |
315 | import {getDdicByMC} from "@api/common"; | 315 | import {getDdicByMC} from "@api/common"; |
316 | import {insertQlrDlrFr,getQlrInfoByGlbsm,updateQlrDlrFr,deleteQlrDlrFrByQlrbsm} from "@api/qlr"; | 316 | import {insertQlrDlrFr,getQlrInfoByGlbsm,updateQlrDlrFr,deleteQlrDlrFrByQlrbsm,updateGyGyQlrQk} from "@api/qlr"; |
317 | 317 | ||
318 | export default { | 318 | export default { |
319 | props: { | 319 | props: { |
... | @@ -333,6 +333,10 @@ | ... | @@ -333,6 +333,10 @@ |
333 | type: String, | 333 | type: String, |
334 | default: "", | 334 | default: "", |
335 | }, | 335 | }, |
336 | type: { | ||
337 | type: String, | ||
338 | default: "", | ||
339 | }, | ||
336 | }, | 340 | }, |
337 | data() { | 341 | data() { |
338 | return { | 342 | return { |
... | @@ -540,6 +544,21 @@ | ... | @@ -540,6 +544,21 @@ |
540 | }); | 544 | }); |
541 | } | 545 | } |
542 | }, | 546 | }, |
547 | |||
548 | updateGyfs(val){ | ||
549 | console.log(val,this.type) | ||
550 | updateGyGyQlrQk(this.bsm,this.type,val).then((res)=>{ | ||
551 | if(res.code === 200){ | ||
552 | console.log("修改完成!") | ||
553 | } | ||
554 | }) | ||
555 | }, | ||
556 | |||
557 | //父组件改变子组件的共有方式 | ||
558 | changeGyfs(val){ | ||
559 | this.gyfs = val; | ||
560 | }, | ||
561 | |||
543 | //行双击事件 | 562 | //行双击事件 |
544 | rowDbclick(row){ | 563 | rowDbclick(row){ |
545 | this.dialogVisible = true; | 564 | this.dialogVisible = true; |
... | @@ -625,9 +644,9 @@ | ... | @@ -625,9 +644,9 @@ |
625 | if(res.result!=null){ | 644 | if(res.result!=null){ |
626 | this.tableData=res.result; | 645 | this.tableData=res.result; |
627 | if(this.tableData.length===0){ | 646 | if(this.tableData.length===0){ |
628 | this.gyfs=this.$store.state.gyfsList[0].bsm; | 647 | // this.gyfs=this.$store.state.gyfsList[0].bsm; |
629 | }else { | 648 | }else { |
630 | this.gyfs=res.result[0].gyfsbsm; | 649 | // this.gyfs=res.result[0].gyfsbsm; |
631 | } | 650 | } |
632 | } | 651 | } |
633 | } | 652 | } | ... | ... |
... | @@ -506,17 +506,17 @@ | ... | @@ -506,17 +506,17 @@ |
506 | switch (this.queryType) { | 506 | switch (this.queryType) { |
507 | case "zrz": | 507 | case "zrz": |
508 | this.$store.state.zrzbsm = res.result; | 508 | this.$store.state.zrzbsm = res.result; |
509 | this.getTreeByBsm(res.result,this.queryType,'2'); | 509 | this.getTreeByBsm(res.result,this.queryType,'0,1,2'); |
510 | path = "/zrz"; | 510 | path = "/zrz"; |
511 | break; | 511 | break; |
512 | case "zd": | 512 | case "zd": |
513 | this.$store.state.zdbsm = res.result; | 513 | this.$store.state.zdbsm = res.result; |
514 | this.getRightTree(res.result,'2'); | 514 | this.getRightTree(res.result,'0,1,2'); |
515 | path = "/zd"; | 515 | path = "/zd"; |
516 | break; | 516 | break; |
517 | case "dz": | 517 | case "dz": |
518 | this.$store.state.dzbsm = res.result; | 518 | this.$store.state.dzbsm = res.result; |
519 | this.getTreeByBsm(res.result,this.queryType,'2'); | 519 | this.getTreeByBsm(res.result,this.queryType,'0,1,2'); |
520 | path = "/dz"; | 520 | path = "/dz"; |
521 | break; | 521 | break; |
522 | default: | 522 | default: | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="dz content-form" ref="mainBox"> | 2 | <div class="dz content-form" ref="mainBox"> |
3 | <el-form ref="form" :model="form" label-width="160px"> | 3 | <el-form ref="form" :model="form" label-width="160px"> |
4 | <Qlr ref="qlrxxModule" :bsm="bsm"></Qlr> | 4 | <Qlr ref="qlrxxModule" :bsm="bsm" :type="lx"></Qlr> |
5 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="dzTable"> | 5 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="dzTable"> |
6 | <tbody> | 6 | <tbody> |
7 | <tr height="30"> | 7 | <tr height="30"> |
... | @@ -230,6 +230,7 @@ | ... | @@ -230,6 +230,7 @@ |
230 | label: 'mc' | 230 | label: 'mc' |
231 | }, | 231 | }, |
232 | 232 | ||
233 | lx:'dz', | ||
233 | bsm:'', //此页面的多幢标识码 | 234 | bsm:'', //此页面的多幢标识码 |
234 | form:{ | 235 | form:{ |
235 | dzbsm:'', //多幢标识码 | 236 | dzbsm:'', //多幢标识码 |
... | @@ -400,6 +401,7 @@ | ... | @@ -400,6 +401,7 @@ |
400 | getDzDetailByBsm(data).then((res)=>{ | 401 | getDzDetailByBsm(data).then((res)=>{ |
401 | if(res.code===200) { | 402 | if(res.code===200) { |
402 | this.form = res.result; | 403 | this.form = res.result; |
404 | this.$refs.qlrxxModule.changeGyfs(res.result.gygyqlrqk); | ||
403 | if(this.form.bblx === 0 && this.form.qszt === '0' && this.form.bhqkbsm == null){ | 405 | if(this.form.bblx === 0 && this.form.qszt === '0' && this.form.bhqkbsm == null){ |
404 | this.disabled = false | 406 | this.disabled = false |
405 | }else { | 407 | }else { | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="gzw content-form"> | 2 | <div class="gzw content-form"> |
3 | <el-form ref="form" :model="form" label-width="160px"> | 3 | <el-form ref="form" :model="form" label-width="160px"> |
4 | <Qlr ref="qlrxxModule" :bsm="bsm"></Qlr> | 4 | <Qlr ref="qlrxxModule" :bsm="bsm" :type="lx"></Qlr> |
5 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="gzwTable"> | 5 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="gzwTable"> |
6 | <tr height="30"> | 6 | <tr height="30"> |
7 | <th colspan="12"><font size="4"></font>构筑物基本信息</th> | 7 | <th colspan="12"><font size="4"></font>构筑物基本信息</th> |
... | @@ -114,6 +114,7 @@ | ... | @@ -114,6 +114,7 @@ |
114 | label: 'mc' | 114 | label: 'mc' |
115 | }, | 115 | }, |
116 | 116 | ||
117 | lx:'gzw', | ||
117 | bsm:'', | 118 | bsm:'', |
118 | form:{ | 119 | form:{ |
119 | zdzhdm:'', | 120 | zdzhdm:'', |
... | @@ -260,6 +261,7 @@ | ... | @@ -260,6 +261,7 @@ |
260 | this.form.qszt = res.result.qszt; | 261 | this.form.qszt = res.result.qszt; |
261 | this.zdbsm = res.result.zdzhbsm; | 262 | this.zdbsm = res.result.zdzhbsm; |
262 | this.getZddm(this.zdbsm); | 263 | this.getZddm(this.zdbsm); |
264 | this.$refs.qlrxxModule.changeGyfs(res.result.gygyqlrqk); | ||
263 | } | 265 | } |
264 | }) | 266 | }) |
265 | }, | 267 | }, | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="main" ref="mainBox"> | 2 | <div class="main" ref="mainBox"> |
3 | <div class="formMenu"> | 3 | <div class="formMenu"> |
4 | <Qlr ref="qlrxxModule" :bsm="curZdbsm" :qszt="formData.qszt"></Qlr> | 4 | <Qlr ref="qlrxxModule" :bsm="curZdbsm" :qszt="formData.qszt" :type="lx"></Qlr> |
5 | <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1"> | 5 | <table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1"> |
6 | <tr> | 6 | <tr> |
7 | <th colspan="12">宗地基本信息</th> | 7 | <th colspan="12">宗地基本信息</th> |
... | @@ -422,6 +422,7 @@ | ... | @@ -422,6 +422,7 @@ |
422 | formData: {}, | 422 | formData: {}, |
423 | dpdm: '', //宗地底盘代码 | 423 | dpdm: '', //宗地底盘代码 |
424 | curZdbsm: '', | 424 | curZdbsm: '', |
425 | lx:'zd', | ||
425 | mainBoxWidth: 0, | 426 | mainBoxWidth: 0, |
426 | geoAttributes: { | 427 | geoAttributes: { |
427 | OBJECTID: "", | 428 | OBJECTID: "", |
... | @@ -499,6 +500,7 @@ | ... | @@ -499,6 +500,7 @@ |
499 | .then((res) => { | 500 | .then((res) => { |
500 | if (res.result) { | 501 | if (res.result) { |
501 | this.formData = res.result; | 502 | this.formData = res.result; |
503 | this.$refs.qlrxxModule.changeGyfs(res.result.gygyqlrqk); | ||
502 | if(this.formData.bblx === 0 && this.formData.qszt === '0' && this.formData.bhqkbsm == null){ | 504 | if(this.formData.bblx === 0 && this.formData.qszt === '0' && this.formData.bhqkbsm == null){ |
503 | console.log("12345") | 505 | console.log("12345") |
504 | this.disabled = false | 506 | this.disabled = false | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="h content-form" ref="mainBox" :class="$route.path == '/h' ? 'hpage':''" :style="{'height': $route.path == '/h' ? '100%' : formHeight+'px'}"> | 2 | <div class="h content-form" ref="mainBox" :class="$route.path == '/h' ? 'hpage':''" :style="{'height': $route.path == '/h' ? '100%' : formHeight+'px'}"> |
3 | <el-form ref="form" :model="form" label-width="160px" class="form"> | 3 | <el-form ref="form" :model="form" label-width="160px" class="form"> |
4 | <Qlr ref="qlrxxModule" :bsm='bsm' :qszt="form.qszt"></Qlr> | 4 | <Qlr ref="qlrxxModule" :bsm='bsm' :qszt="form.qszt" :type="lx"></Qlr> |
5 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable"> | 5 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="hTable"> |
6 | <tbody> | 6 | <tbody> |
7 | <tr height="30"> | 7 | <tr height="30"> |
... | @@ -441,6 +441,7 @@ | ... | @@ -441,6 +441,7 @@ |
441 | label: 'mc' | 441 | label: 'mc' |
442 | }, | 442 | }, |
443 | 443 | ||
444 | lx:'h', | ||
444 | hbsm:'', | 445 | hbsm:'', |
445 | form:{ | 446 | form:{ |
446 | bsm:'',//户标识码 | 447 | bsm:'',//户标识码 |
... | @@ -624,6 +625,7 @@ | ... | @@ -624,6 +625,7 @@ |
624 | if(res.code===200){ | 625 | if(res.code===200){ |
625 | this.form = res.result; | 626 | this.form = res.result; |
626 | this.hbsm = res.result.bsm; | 627 | this.hbsm = res.result.bsm; |
628 | this.$refs.qlrxxModule.changeGyfs(res.result.gygyqlrqk); | ||
627 | if(this.form.bblx === 0 && this.form.qszt === '0' && this.form.bhqkbsm == null){ | 629 | if(this.form.bblx === 0 && this.form.qszt === '0' && this.form.bhqkbsm == null){ |
628 | this.disableFlag = false | 630 | this.disableFlag = false |
629 | }else { | 631 | }else { | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="main" ref="mainBox"> | 2 | <div class="main" ref="mainBox"> |
3 | <div class="formMenu"> | 3 | <div class="formMenu"> |
4 | <Qlr ref="qlrxxModule" :bsm="bsm" :qszt="form.qszt"></Qlr> | 4 | <Qlr ref="qlrxxModule" :bsm="bsm" :qszt="form.qszt" :type="lx"></Qlr> |
5 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="zrzTable"> | 5 | <table border="1" width="100%" cellspacing="0" cellpadding="0" class="zrzTable"> |
6 | <tr> | 6 | <tr> |
7 | <th colspan="12">自然幢基本信息</th> | 7 | <th colspan="12">自然幢基本信息</th> |
... | @@ -660,6 +660,7 @@ | ... | @@ -660,6 +660,7 @@ |
660 | getZrzDetailByBsm(data).then((res)=>{ | 660 | getZrzDetailByBsm(data).then((res)=>{ |
661 | if(res.code===200){ | 661 | if(res.code===200){ |
662 | this.form=res.result; | 662 | this.form=res.result; |
663 | this.$refs.qlrxxModule.changeGyfs(res.result.gygyqlrqk); | ||
663 | // //如果没有宗地代码,自动生成 | 664 | // //如果没有宗地代码,自动生成 |
664 | // if(res.result.zddm == null){ | 665 | // if(res.result.zddm == null){ |
665 | // this.generatorCode() | 666 | // this.generatorCode() | ... | ... |
-
Please register or sign in to post a comment