9449e558 by 杨威

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

2 parents f8ad8093 60b00c34
......@@ -603,11 +603,14 @@
},
saveZd() {
if(this.zdFghData.oldZdbsm === ''){
Message.info("请选择需要分割的宗地")
Message.warning("请选择需要分割的宗地")
return
}
if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){
if (this.zdFghData.newZdlist.every(i => i.xmmc != '')) {
vm.loadingShow('正在保存中');
zdfg(this.zdFghData).then(res => {
vm.loadingHide()
if (res.success) {
this.$store.state.zdbsms = res.result;
//更新目录树
......@@ -622,8 +625,14 @@
} else {
Message.error("保存失败")
}
}).catch((err)=>{
vm.loadingHide()
Message.error(err)
})
}else{
Message.warning("请完善分割后的宗地项目名称后重试")
}
}else{
this.$message.warning("幢信息未选择完成,无法保存")
}
},
......@@ -1093,7 +1102,7 @@
width: calc(100% - 40px);
/deep/.el-input__inner {
margin: 0;
height: 44px;
height: 43px;
outline: none;
border: none;
color: #606764;
......
......@@ -183,25 +183,25 @@
switch (row.dylx) {
case "zd":
this.$store.state.zdbsm = row.glbsm;
this.getRightTree(row.glbsm,'1');
this.getRightTree(row.glbsm,'0,1,2');
break;
case "zrz":
this.$store.state.zrzbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,row.dylx,'1');
this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
break;
case "h":
case "h0":
case "h1":
this.$store.state.hbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,'h','1');
this.getTreeByBsm(row.glbsm,'h','0,1,2');
break;
case "dz":
this.$store.state.dzbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,row.dylx,'1');
this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
break;
case "gzw":
this.$store.state.dzbsm = row.glbsm;
this.getTreeByBsm(row.glbsm,row.dylx,'1');
this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2');
break;
default:
......