宗地表单校验完善

@@ -599,9 +599,6 @@ export default {
 							rule: /^\s*$/g, //非空
 						},
 					)
-					if (ind == item.list.length-1) {
-						temp += item.list.length;
-					}
 					if(this.hasSyqx){
 						rules.push(
 							{
@@ -613,6 +610,9 @@ export default {
 							}
 						)
 					}
+					if (ind == item.list.length-1) {
+						temp += item.list.length;
+					}
 				})
 			})
 			this.rulesResult = true;
@@ -664,6 +664,18 @@ export default {
 
 		// },
 	},
+	watch:{
+		countList: {
+			handler : function (newVal, oldVal) {
+				newVal.forEach((item,ind)=>{
+					if(item.qlxzdm != ''){
+						this.$refs.qlxzdm[ind].$el.style.border=""
+					}
+				})
+			},
+			deep:true
+		} , 
+	}
 };
 </script>
 <style lang="less">

@@ -627,7 +627,6 @@ export default {
 		updateZDxx(formData) {
 			//获取权利性质数据
 			this.formData.list = this.$refs.qlxzModule.getQlxzDataList();
-			this.$refs.qlxzModule.getRules();
 			console.log(this.$refs.qlxzModule.getRulesResult(),'this.$refs.qlxzModule.getRules()');
 			//判断容密高是否为区间值，如果是区间值，则将输入框的值赋予
 			this.formData.jyrjl = this.isInterval(this.formData.jyrjl) ? this.rjl : this.formData.jyrjl;
@@ -689,14 +688,8 @@ export default {
 					rule: /^\s*$/g, //非空
 				},
 			]
-			//判断宗地代码和不动产单元号是否手动修改过（宗地代码和不动产单元号的前14位是否和底盘代码一致）
-			if(this.formData.zddm.substring(0,14) != this.dpdm || this.formData.bdcdyh.substring(0,14) != this.dpdm){
-				this.$message({
-					message: '宗地代码或不动产单元号有误，请核对后再试一次',
-					type: "warning",
-				});
-			}else{
 				// console.log(this.rules,'rules');
+				this.$refs.qlxzModule.getRules();
 				let flag = true;
 				this.rules.forEach(item=>{
 					if(item.rule.test(item.data) || item.data == null){
@@ -717,10 +710,17 @@ export default {
 					}
 				})
 				this.$nextTick(()=>{
-					if(flag){
+					if(flag && this.$refs.qlxzModule.getRulesResult()){
 						//宗地面积处理
 						// console.log(this.formData.zdmj,'this.formData.zdmj');
 						// this.formData.zdmj = this.formData.zdmj.replace(/[^\d\.]/g,'')
+						//判断宗地代码和不动产单元号是否手动修改过（宗地代码和不动产单元号的前14位是否和底盘代码一致）
+						if(this.formData.zddm.substring(0,14) != this.dpdm || this.formData.bdcdyh.substring(0,14) != this.dpdm){
+							this.$message({
+								message: '宗地代码或不动产单元号有误，请核对后再试一次',
+								type: "warning",
+							});
+						}else{
 							updateQjZdjbxx(this.formData)
 								.then((res) => {
 									if (res.code == 200) {
@@ -758,6 +758,7 @@ export default {
 							self.updAttributes(this.$store.state.zdbsm,'zd',this.geoAttributes,function (res) {
 								console.log("属性保存完成!!");
 							});
+						}
 					}else{
 						this.$message({
 							// message: item.name+'不能为空',
@@ -767,11 +768,6 @@ export default {
 					}
 				})
 
-
-			}
-
-
-
 		},
 		inputBlur(e){
 			if(e.target.value!=''){
@@ -885,6 +881,16 @@ export default {
 		zdbsm:function (val) {
 			this.getZdjbxxData(val)
 			this.curZdbsm = val;
+		},
+		"formData.bdcdyh":function (val) {
+			if (val != '') {
+				this.$refs.bdcdyh.style.border = '';
+			}
+		},
+		"formData.zddm":function (val) {
+			if (val != '') {
+				this.$refs.zddm.style.border = '';
+			}
 		}
 	},
 };