Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
4313cbea by weimo934
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/zrz/lpb/bjlp/ljz/index.vue
2 parents aa4b2372 f0bcb4de
Inline Side-by-side
Showing 9 changed files with 104 additions and 56 deletions
1 import request from '@/plugin/axios'
2
3 /**
4 * 查询幢单元基本信息
5 */
6 export function getQjZdyDetailById(data) {
7 return request({
8 url: '/system/qjZdy/getQjZdyDetailById',
9 method: 'get',
10 params: {
11 id: data,
12 }
13 })
14 }
15
16 /**
17 * 更新保存幢单元基本信息
18 */
19 export function updateQjZdy(data) {
20 return request({
21 url: '/system/qjZdy/updateQjZdy',
22 method: 'put',
23 data: data,
24 })
25 }
26
...@@ -329,12 +329,14 @@ ...@@ -329,12 +329,14 @@
329 type: String, 329 type: String,
330 default: "15vh", 330 default: "15vh",
331 }, 331 },
332 'bsm':String 332 bsm: {
333 type: String,
334 default: "",
335 },
333 }, 336 },
334 data() { 337 data() {
335 return { 338 return {
336 update:false, 339 update:false,
337 // bsm:'',
338 gyfs: '', 340 gyfs: '',
339 tableData: [], 341 tableData: [],
340 gyfsList:[], 342 gyfsList:[],
...@@ -499,7 +501,7 @@ ...@@ -499,7 +501,7 @@
499 updateQlrDlrFr(this.formData).then((res)=>{ 501 updateQlrDlrFr(this.formData).then((res)=>{
500 if(res.code===200){ 502 if(res.code===200){
501 this.$message.success("修改完成！"); 503 this.$message.success("修改完成！");
502 this.getQlrInfo(); 504 this.getQlrInfo(this.bsm);
503 this.update=false; 505 this.update=false;
504 this.dialogVisible = false; 506 this.dialogVisible = false;
505 } 507 }
...@@ -510,7 +512,7 @@ ...@@ -510,7 +512,7 @@
510 this.tableData.push(this.formData); 512 this.tableData.push(this.formData);
511 Object.assign(this.$data, this.$options.data()) 513 Object.assign(this.$data, this.$options.data())
512 this.dialogVisible = false; 514 this.dialogVisible = false;
513 this.getQlrInfo(); 515 this.getQlrInfo(this.bsm);
514 } 516 }
515 }) 517 })
516 } 518 }
...@@ -572,7 +574,7 @@ ...@@ -572,7 +574,7 @@
572 deleteQlrDlrFrByQlrbsm(qlrbsms).then((res)=>{ 574 deleteQlrDlrFrByQlrbsm(qlrbsms).then((res)=>{
573 if(res.code===200){ 575 if(res.code===200){
574 this.$message.success("删除完成！") 576 this.$message.success("删除完成！")
575 this.getQlrInfo(); 577 this.getQlrInfo(this.bsm);
576 } 578 }
577 }) 579 })
578 } else { 580 } else {
...@@ -614,8 +616,8 @@ ...@@ -614,8 +616,8 @@
614 }); 616 });
615 } 617 }
616 }, 618 },
617 getQlrInfo(){ 619 getQlrInfo(bsm){
618 getQlrInfoByGlbsm(this.bsm).then((res)=>{ 620 getQlrInfoByGlbsm(bsm).then((res)=>{
619 if(res.code){ 621 if(res.code){
620 if(res.result!=null){ 622 if(res.result!=null){
621 this.tableData=res.result; 623 this.tableData=res.result;
...@@ -633,7 +635,7 @@ ...@@ -633,7 +635,7 @@
633 this.gyfsList = this.$store.state.gyfsList; 635 this.gyfsList = this.$store.state.gyfsList;
634 }, 636 },
635 mounted() { 637 mounted() {
636 this.getQlrInfo(); 638 this.getQlrInfo(this.bsm);
637 if(this.$store.state.gyfsList.length>0){ 639 if(this.$store.state.gyfsList.length>0){
638 this.gyfs=this.$store.state.gyfsList[0].bsm; 640 this.gyfs=this.$store.state.gyfsList[0].bsm;
639 } 641 }
...@@ -711,7 +713,6 @@ ...@@ -711,7 +713,6 @@
711 this.$refs.zjzlbsm.$el.style.border = ''; 713 this.$refs.zjzlbsm.$el.style.border = '';
712 } 714 }
713 }, 715 },
714
715 // "formData.gyfsbsm":function (val) { 716 // "formData.gyfsbsm":function (val) {
716 // let ddsy = ''; 717 // let ddsy = '';
717 // for(let i = 0;i<this.gyfsList.length;i++){ 718 // for(let i = 0;i<this.gyfsList.length;i++){
......
...@@ -263,7 +263,7 @@ export default { ...@@ -263,7 +263,7 @@ export default {
263 zddm: "", 263 zddm: "",
264 zl: "", 264 zl: "",
265 pageNo: 1, 265 pageNo: 1,
266 pageSize: 12, 266 pageSize: 15,
267 type:'add', 267 type:'add',
268 }, 268 },
269 Data: [], 269 Data: [],
...@@ -369,7 +369,7 @@ export default { ...@@ -369,7 +369,7 @@ export default {
369 zddm: "", 369 zddm: "",
370 zl: "", 370 zl: "",
371 pageNo: 1, 371 pageNo: 1,
372 pageSize: 12 372 pageSize: 15
373 }; 373 };
374 this.getData(this.queryData); 374 this.getData(this.queryData);
375 }, 375 },
......
...@@ -380,6 +380,7 @@ ...@@ -380,6 +380,7 @@
380 getQjZdjbxxDetailById, 380 getQjZdjbxxDetailById,
381 updateQjZdjbxx, 381 updateQjZdjbxx,
382 } from "@api/zd"; 382 } from "@api/zd";
383 import { Message } from 'element-ui';
383 384
384 export default { 385 export default {
385 inject: ['getRightTree'], 386 inject: ['getRightTree'],
...@@ -753,48 +754,52 @@ ...@@ -753,48 +754,52 @@
753 type: "warning", 754 type: "warning",
754 }); 755 });
755 } else { 756 } else {
756 updateQjZdjbxx(this.formData) 757 if (this.$refs.qlrxxModule.getQlgyfsData() == 'PSHGSBDCQJDC000000000000DC340020' && this.$refs.qlrxxModule.getQlrxxData().length < 2 ) {
757 .then((res) => { 758 Message.error('当前权利人共有方式至少需要添加两名权利人')
758 if (res.code == 200) { 759 }else{
759 console.log(res); 760 updateQjZdjbxx(this.formData)
761 .then((res) => {
762 if (res.code == 200) {
763 console.log(res);
764 this.$message({
765 message: '保存成功',
766 type: "success",
767 });
768 // 保存成功再次查询
769 this.getZdjbxxData(this.$store.state.zdbsm);
770 } else {
771 this.$message({
772 message: res.message,
773 type: "warning",
774 });
775 }
776 })
777 .catch((error) => {
760 this.$message({ 778 this.$message({
761 message: '保存成功', 779 message: error.message+"，查看日志，联系管理员",
762 type: "success", 780 type: "error",
763 }); 781 });
764 // 保存成功再次查询 782 });
765 this.getZdjbxxData(this.$store.state.zdbsm); 783 //保存到空间库里面
784 var self = this;
785 for (var key in this.geoAttributes) {
786 if (key == "BSM") {
787 self.geoAttributes[key] = this.$store.state.zdbsm
788 } else if (key == 'QLSDFS') {
789 var qlsdfsList = self.$store.state.qlsdfsList, value = self.formData.qlsdfs;
790 var qlsdfs = qlsdfsList.filter(item => {
791 return item.bsm == value;
792 })
793 self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc : "";
766 } else { 794 } else {
767 this.$message({ 795 var formKay = key.toLowerCase();
768 message: res.message, 796 self.geoAttributes[key] = self.formData[formKay];
769 type: "warning",
770 });
771 } 797 }
772 })
773 .catch((error) => {
774 this.$message({
775 message: error.message+"，查看日志，联系管理员",
776 type: "error",
777 });
778 });
779 //保存到空间库里面
780 var self = this;
781 for (var key in this.geoAttributes) {
782 if (key == "BSM") {
783 self.geoAttributes[key] = this.$store.state.zdbsm
784 } else if (key == 'QLSDFS') {
785 var qlsdfsList = self.$store.state.qlsdfsList, value = self.formData.qlsdfs;
786 var qlsdfs = qlsdfsList.filter(item => {
787 return item.bsm == value;
788 })
789 self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc : "";
790 } else {
791 var formKay = key.toLowerCase();
792 self.geoAttributes[key] = self.formData[formKay];
793 } 798 }
799 self.updAttributes(this.$store.state.zdbsm, 'zd', this.geoAttributes, function (res) {
800 console.log("属性保存完成!!");
801 });
794 } 802 }
795 self.updAttributes(this.$store.state.zdbsm, 'zd', this.geoAttributes, function (res) {
796 console.log("属性保存完成!!");
797 });
798 } 803 }
799 } else { 804 } else {
800 this.$message({ 805 this.$message({
...@@ -922,7 +927,8 @@ ...@@ -922,7 +927,8 @@
922 this.$store.state.zddm = val; 927 this.$store.state.zddm = val;
923 }, 928 },
924 zdbsm: function (val) { 929 zdbsm: function (val) {
925 this.getZdjbxxData(val) 930 this.getZdjbxxData(val);
931 this.$refs.qlrxxModule.getQlrInfo(val);
926 this.curZdbsm = val; 932 this.curZdbsm = val;
927 }, 933 },
928 "formData.bdcdyh": function (val) { 934 "formData.bdcdyh": function (val) {
......
...@@ -157,8 +157,10 @@ ...@@ -157,8 +157,10 @@
157 watch:{ 157 watch:{
158 cbsm: { 158 cbsm: {
159 handler: function (item) { 159 handler: function (item) {
160 if(item!='' && this.$parent.menuType == 'c'){ 160 console.log(item,"item")
161 this.getLjzInfo(this.item) 161 console.log(this.$parent.$parent.menuType,"this.$parent.$parent.menuType")
162 if(item!='' && this.$parent.$parent.menuType == 'c'){
163 this.getCinfo(item)
162 } 164 }
163 }, 165 },
164 immediate: true 166 immediate: true
......
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'></Qlr> 4 <Qlr ref="qlrxxModule" :bsm='bsm' :qszt="form.qszt"></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">
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td> 21 <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td>
22 <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号--> 22 <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
23 <td colspan="4" class="psr"> 23 <td colspan="4" class="psr">
24 <el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag" ref="bdcdyh" @blur="inputBlur($event)"></el-input> 24 <el-input v-model="form.bdcdyh" class="percent80" :disabled="disableFlag" ref="bdcdyh"></el-input>
25 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button> 25 <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button>
26 </td> 26 </td>
27 <td colspan="2" align="center" >原不动产单元</td> 27 <td colspan="2" align="center" >原不动产单元</td>
...@@ -1014,7 +1014,7 @@ ...@@ -1014,7 +1014,7 @@
1014 1014
1015 "form.bdcdyh":function (val) { 1015 "form.bdcdyh":function (val) {
1016 if (val != '') { 1016 if (val != '') {
1017 this.$refs.bdcdyh.style.border = ''; 1017 this.$refs.bdcdyh.$el.style.border = '';
1018 } 1018 }
1019 }, 1019 },
1020 1020
......
...@@ -412,9 +412,11 @@ export default { ...@@ -412,9 +412,11 @@ export default {
412 Message.warning("已提交的户无法继续操作") 412 Message.warning("已提交的户无法继续操作")
413 }else{ 413 }else{
414 batchCommit(this.bsms).then(res=>{ 414 batchCommit(this.bsms).then(res=>{
415 if (res.success) { 415 if(res.code === 200){
416 Message.success("提交成功"); 416 Message.success("提交成功");
417 this.getlpbData(); 417 this.getlpbData();
418 }else {
419 this.$message.error(res.message);
418 } 420 }
419 }) 421 })
420 } 422 }
......
...@@ -680,7 +680,7 @@ export default { ...@@ -680,7 +680,7 @@ export default {
680 break; 680 break;
681 } 681 }
682 } 682 }
683 }, 100); 683 }, 200);
684 }, 684 },
685 //户双击事件 685 //户双击事件
686 dbclick(bsm) { 686 dbclick(bsm) {
......
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
46 <script> 46 <script>
47 47
48 import {insertZdyInfo} from "@api/lpb" 48 import {insertZdyInfo} from "@api/lpb"
49 import {getQjZdyDetailById,updateQjZdy} from "@api/zdy"
49 export default { 50 export default {
50 name: "index", 51 name: "index",
51 components: {}, 52 components: {},
...@@ -113,10 +114,20 @@ ...@@ -113,10 +114,20 @@
113 }); 114 });
114 }else{ 115 }else{
115 //编辑幢单元接口 116 //编辑幢单元接口
117 updateQjZdy(this.form).then((res)=>{
118 if(res.code === 200){
119 this.$message.success("保存成功")
120 }
121 })
116 } 122 }
117 }, 123 },
118 getZdyInfo(bsm){ 124 getZdyInfo(bsm){
119 //查询幢单元信息接口 125 //查询幢单元信息接口
126 getQjZdyDetailById(bsm).then((res)=>{
127 if(res.code === 200){
128 this.form = res.result;
129 }
130 })
120 131
121 }, 132 },
122 reset(){ 133 reset(){
...@@ -133,7 +144,7 @@ ...@@ -133,7 +144,7 @@
133 watch:{ 144 watch:{
134 zdybsm: { 145 zdybsm: {
135 handler: function (item) { 146 handler: function (item) {
136 if(item!='' && this.$parent.menuType == 'zdy'){ 147 if(item!='' && this.$parent.$parent.menuType == 'zdy'){
137 this.getZdyInfo(item) 148 this.getZdyInfo(item)
138 } 149 }
139 }, 150 },
......