Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

@@ -523,6 +523,40 @@ export default {
 				this.outNum--;
 			}
 		},
+		reset(){
+        	this.countList=[
+				{
+					id: Math.random(),
+					isInside: false,
+					hasNotBorder: false,
+					bsm: "", //权利性质标识码
+					glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
+					qlxzdm: "",
+					zhqlxzlx: "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
+					list: [
+						{
+							pzdjbsm: "",
+							pzdjmc: "",
+							pzytdm: "",
+							pzytmc: "",
+							pzytmj: 0,
+							qlxzbsm: "",
+							sjdjbsm: "",
+							sjdjmc: "",
+							sjytdm: "",
+							sjytmc: "",
+							sjytmj: 0,
+							syqx: "",
+							tdsyjssj: "",
+							pickerStart:{},
+							pickerEnd:{},
+							tdsyqssj: "",
+							tdzh: "",
+						},
+					],
+				},
+			];
+		},
 		//内层操作
 		handleInClick(index, childIndex, type) {
 			let insideObj = {

@@ -405,18 +405,38 @@
                         addQjTdytRequestList:[{
                         }],   //土地用途新增实体列表
                     }]
-                }
+                };
+                this.$refs.qlxzModule.reset();
+                this.ytTitleRowspan=1; //用途的单元格垂直合并数量
+                this.fwjgTitleRowspan=1; //房屋结构的单元格垂直合并数量
             },
             save: function () {
                 this.form['hbsms'] = this.bsms
                 this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
+                for(let i=0;i< this.form.fwjgList.length;i++){
+                    if(this.form.fwjgList[i].fwjgzdbsm===''){
+                        this.form.fwjgList.splice(i,1);
+                    }
+                }
+                for(let i=0;i< this.form.fwytList.length;i++){
+                    if(this.form.fwytList[i].fwsjytbsm===''){
+                        this.form.fwytList.splice(i,1);
+                    }
+                }
+                for(let i=0;i< this.form.qlxzList.length;i++){
+                    if(this.form.qlxzList[i].qlxzdm===''){
+                        this.form.qlxzList.splice(i,1);
+                    }
+                }
                 console.log("批量户信息")
                 console.log(this.form)
                 batchUpdateQjH(this.form).then((res)=>{
                     if(res.code===200){
                         this.lodding()
                         this.$message.success("保存成功！")
-                        this.reset();
+                        this.$nextTick(()=>{
+                            this.reset();
+                        })
                         this.close();
                     }
                 })

@@ -635,7 +635,7 @@ export default {
 					if (res.code === 200) {
 						this.$message.success("生成完成！");
 					} else {
-						this.$message.warning("生成失败！");
+						this.$message.warning(res.message);
 					}
 				}
 			);