Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
9449e558 by 杨威
Options

Merge remote-tracking branch 'origin/master' into master

2 parents f8ad8093 60b00c34
Expand all
Inline Side-by-side
Showing 3 changed files with 32 additions and 23 deletions
...@@ -603,26 +603,35 @@ ...@@ -603,26 +603,35 @@
603 }, 603 },
604 saveZd() { 604 saveZd() {
605 if(this.zdFghData.oldZdbsm === ''){ 605 if(this.zdFghData.oldZdbsm === ''){
606 Message.info("请选择需要分割的宗地") 606 Message.warning("请选择需要分割的宗地")
607 return 607 return
608 } 608 }
609 if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){ 609 if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){
610 zdfg(this.zdFghData).then(res => { 610 if (this.zdFghData.newZdlist.every(i => i.xmmc != '')) {
611 if (res.success) { 611 vm.loadingShow('正在保存中');
612 this.$store.state.zdbsms = res.result; 612 zdfg(this.zdFghData).then(res => {
613 //更新目录树 613 vm.loadingHide()
614 this.getTreeByS(res.result); 614 if (res.success) {
615 this.$router.push({ 615 this.$store.state.zdbsms = res.result;
616 path: '/zd', 616 //更新目录树
617 query: { 617 this.getTreeByS(res.result);
618 bsm: res.result[0], 618 this.$router.push({
619 source: 3, //分割标识 619 path: '/zd',
620 } 620 query: {
621 }); 621 bsm: res.result[0],
622 } else { 622 source: 3, //分割标识
623 Message.error("保存失败") 623 }
624 } 624 });
625 }) 625 } else {
626 Message.error("保存失败")
627 }
628 }).catch((err)=>{
629 vm.loadingHide()
630 Message.error(err)
631 })
632 }else{
633 Message.warning("请完善分割后的宗地项目名称后重试")
634 }
626 }else{ 635 }else{
627 this.$message.warning("幢信息未选择完成，无法保存") 636 this.$message.warning("幢信息未选择完成，无法保存")
628 } 637 }
...@@ -1093,7 +1102,7 @@ ...@@ -1093,7 +1102,7 @@
1093 width: calc(100% - 40px); 1102 width: calc(100% - 40px);
1094 /deep/.el-input__inner { 1103 /deep/.el-input__inner {
1095 margin: 0; 1104 margin: 0;
1096 height: 44px; 1105 height: 43px;
1097 outline: none; 1106 outline: none;
1098 border: none; 1107 border: none;
1099 color: #606764; 1108 color: #606764;
......
...@@ -183,25 +183,25 @@ ...@@ -183,25 +183,25 @@
183 switch (row.dylx) { 183 switch (row.dylx) {
184 case "zd": 184 case "zd":
185 this.$store.state.zdbsm = row.glbsm; 185 this.$store.state.zdbsm = row.glbsm;
186 this.getRightTree(row.glbsm,'1'); 186 this.getRightTree(row.glbsm,'0,1,2');
187 break; 187 break;
188 case "zrz": 188 case "zrz":
189 this.$store.state.zrzbsm = row.glbsm; 189 this.$store.state.zrzbsm = row.glbsm;
190 this.getTreeByBsm(row.glbsm,row.dylx,'1'); 190 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
191 break; 191 break;
192 case "h": 192 case "h":
193 case "h0": 193 case "h0":
194 case "h1": 194 case "h1":
195 this.$store.state.hbsm = row.glbsm; 195 this.$store.state.hbsm = row.glbsm;
196 this.getTreeByBsm(row.glbsm,'h','1'); 196 this.getTreeByBsm(row.glbsm,'h','0,1,2');
197 break; 197 break;
198 case "dz": 198 case "dz":
199 this.$store.state.dzbsm = row.glbsm; 199 this.$store.state.dzbsm = row.glbsm;
200 this.getTreeByBsm(row.glbsm,row.dylx,'1'); 200 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
201 break; 201 break;
202 case "gzw": 202 case "gzw":
203 this.$store.state.dzbsm = row.glbsm; 203 this.$store.state.dzbsm = row.glbsm;
204 this.getTreeByBsm(row.glbsm,row.dylx,'1'); 204 this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
205 break; 205 break;
206 206
207 default: 207 default:
......