Merge remote-tracking branch 'origin/master'

@@ -603,11 +603,14 @@
             },
             },
             saveZd() {
             saveZd() {
                 if(this.zdFghData.oldZdbsm === ''){
                 if(this.zdFghData.oldZdbsm === ''){
-                    Message.info("请选择需要分割的宗地")
+                    Message.warning("请选择需要分割的宗地")
                     return
                     return
                 }
                 }
                 if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){
                 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 => {
                         zdfg(this.zdFghData).then(res => {
+                            vm.loadingHide()
                             if (res.success) {
                             if (res.success) {
                                 this.$store.state.zdbsms = res.result;
                                 this.$store.state.zdbsms = res.result;
                                 //更新目录树
                                 //更新目录树
@@ -622,8 +625,14 @@
                             } else {
                             } else {
                                 Message.error("保存失败")
                                 Message.error("保存失败")
                             }
                             }
+                        }).catch((err)=>{
+                            vm.loadingHide()
+                            Message.error(err)
                         })
                         })
                     }else{
                     }else{
+                        Message.warning("请完善分割后的宗地项目名称后重试")
+                    }
+                }else{
 					this.$message.warning("幢信息未选择完成，无法保存")
 					this.$message.warning("幢信息未选择完成，无法保存")
                 }
                 }
             },
             },
@@ -1093,7 +1102,7 @@
             width: calc(100% - 40px);
             width: calc(100% - 40px);
             /deep/.el-input__inner {
             /deep/.el-input__inner {
                 margin: 0;
                 margin: 0;
-                height: 44px;
+                height: 43px;
                 outline: none;
                 outline: none;
                 border: none;
                 border: none;
                 color: #606764;
                 color: #606764;