Merge remote-tracking branch 'origin/master'

zhaoqian
Showing 5 changed files with 75 additions and 60 deletions
src/components/formMenu/qlxz.vue
src/components/lineTree/lineTree.vue
src/views/panel/create/index.vue
src/views/zd/zddcb/index.vue
src/views/zrz/zrzxx/index.vue
--- a/src/components/formMenu/qlxz.vue
View file @729e522
+++ b/src/components/formMenu/qlxz.vue
View file @729e522
@@ -429,7 +429,6 @@ export default {
 	},
 	created() {},
 	mounted(){
-		console.log(this.formData,'formData');
 	},
 	methods: {
        startTime(index,childIndex){
@@ -452,7 +451,6 @@ export default {
            }
 		},
 		sumTime(index,childIndex,syqx,e){
-			console.log(e,'eeee');
 			this.$refs.syqx.forEach((item,index)=>{
 				if(item.value == syqx){
 					this.$refs.tdsyjssj[index].$el.style.border=""
@@ -567,13 +565,10 @@ export default {
 			});
 		},
 		getQlxzDataList() {
-			console.log(this.countList,'this.countList');
 			return this.countList;
 		},
 		getRules(){
 			let rules = [];
-			console.log(this.$refs.tdsyqssj,'this.$refs.qlxzdm');
-			console.log(this.countList,'this.countList');
 			let temp = 0;
 			this.countList.forEach((item,index)=>{
 				rules.push({
@@ -599,9 +594,6 @@ export default {
 							rule: /^\s*$/g, //非空
 						},
 					)
-					if (ind == item.list.length-1) {
-						temp += item.list.length;
-					}
 					if(this.hasSyqx){
 						rules.push(
 							{
@@ -613,6 +605,9 @@ export default {
 							}
 						)
 					}
+					if (ind == item.list.length-1) {
+						temp += item.list.length;
+					}
 				})
 			})
 			this.rulesResult = true;
@@ -664,6 +659,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">
--- a/src/components/lineTree/lineTree.vue
View file @729e522
+++ b/src/components/lineTree/lineTree.vue
View file @729e522
@@ -254,6 +254,8 @@ export default {
 			this.$store.state.zdbsm = this.zdData.zdbsm;
 			if(this.zdData.type == 'dz'){
 				this.$store.state.dzbsm = this.zdData.bsm;
+			}else{
+				this.$store.state.dzbsm = '';
 			}
 		},
 		//关闭添加定着物弹框
--- a/src/views/panel/create/index.vue
View file @729e522
+++ b/src/views/panel/create/index.vue
View file @729e522
@@ -290,8 +290,9 @@ export default {
 			//todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
 			this.$refs['ruleForm1'].validate((valid) => {
 				if (valid) {
-					this.ruleForm1.zdbsm = this.$store.state.zdbsm != '' ? this.$store.state.zdbsm : '';
-					this.ruleForm1.dzbsm = this.$store.state.dzbsm != '' ? this.$store.state.dzbsm : '';
+					this.ruleForm1.zdbsm = this.auth ? this.$store.state.zdbsm : '';
+					this.ruleForm1.dzbsm = this.auth ? this.$store.state.dzbsm : '';
 					insertZrzjbxx(this.ruleForm1)
 						.then((res) => {
 							if (res.code == "200") {
--- a/src/views/zd/zddcb/index.vue
View file @729e522
+++ b/src/views/zd/zddcb/index.vue
View file @729e522
@@ -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,47 +710,55 @@ 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,'')
-						updateQjZdjbxx(this.formData)
+						//判断宗地代码和不动产单元号是否手动修改过（宗地代码和不动产单元号的前14位是否和底盘代码一致）
-							.then((res) => {
+						if(this.formData.zddm.substring(0,14) != this.dpdm || this.formData.bdcdyh.substring(0,14) != this.dpdm){
-								if (res.code == 200) {
+							this.$message({
-									console.log(res);
+								message: '宗地代码或不动产单元号有误，请核对后再试一次',
-									this.$message({
+								type: "warning",
-										message: '保存成功',
+							});
-										type: "success",
+						}else{
-									});
+							updateQjZdjbxx(this.formData)
-									// 保存成功再次查询
+								.then((res) => {
-									this.getZdjbxxData(this.$store.state.zdbsm);
+									if (res.code == 200) {
-								} else {
+										console.log(res);
-									this.$message({
+										this.$message({
-										message: res.message,
+											message: '保存成功',
-										type: "warning",
+											type: "success",
-									});
+										});
-								}
+										// 保存成功再次查询
-							})
+										this.getZdjbxxData(this.$store.state.zdbsm);
-							.catch((error) => {});
+									} else {
-						//保存到空间库里面
+										this.$message({
-						var self = this;
+											message: res.message,
-						for(var key in this.geoAttributes){
+											type: "warning",
-							if(key == "BSM"){
+										});
-								self.geoAttributes[key] = this.$store.state.zdbsm
+									}
-							}else if(key == 'QLSDFS'){
-								var qlsdfsList = self.$store.state.qlsdfsList,value = self.formData.qlsdfs;
-								var qlsdfs = qlsdfsList.filter(item => {
-									return item.bsm == value;
 								})
-								self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc:"";
+								.catch((error) => {});
-							}else {
+							//保存到空间库里面
-								var formKay = key.toLowerCase();
+							var self = this;
-								self.geoAttributes[key] = self.formData[formKay];
+							for(var key in this.geoAttributes){
+								if(key == "BSM"){
+									self.geoAttributes[key] = this.$store.state.zdbsm
+								}else if(key == 'QLSDFS'){
+									var qlsdfsList = self.$store.state.qlsdfsList,value = self.formData.qlsdfs;
+									var qlsdfs = qlsdfsList.filter(item => {
+										return item.bsm == value;
+									})
+									self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc:"";
+								}else {
+									var formKay = key.toLowerCase();
+									self.geoAttributes[key] = self.formData[formKay];
+								}
 							}
+							self.updAttributes(this.$store.state.zdbsm,'zd',this.geoAttributes,function (res) {
+								console.log("属性保存完成!!");
+							});
 						}
-						self.updAttributes(this.$store.state.zdbsm,'zd',this.geoAttributes,function (res) {
-							console.log("属性保存完成!!");
-						});
 					}else{
 						this.$message({
 							// message: item.name+'不能为空',
@@ -766,11 +767,6 @@ export default {
 						});
 					}
 				})
-			}
 		},
 		inputBlur(e){
@@ -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 = '';
+			}
 		}
 	},
 };
--- a/src/views/zrz/zrzxx/index.vue
View file @729e522
+++ b/src/views/zrz/zrzxx/index.vue
View file @729e522
@@ -519,7 +519,6 @@
                this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
 			    this.$refs.qlxzModule.getRules();
                let flag = true;
-                console.log(this.rules,'this.rules');
                this.rules.forEach(item=>{
                    if(item.rule.test(item.data) || item.data == null){
                        if(item.dom.$el){
@@ -534,7 +533,7 @@
                    }
                })
                this.$nextTick(()=>{
-                    if (flag) {
+                    if (flag && this.$refs.qlxzModule.getRulesResult()) {
                        if(this.form.zrzh.substring(0,19) != this.form.zddm || this.form.bdcdyh.substring(0,19) != this.form.zddm){
                            this.$message({
                                message: '自然幢号或不动产单元号有误，请核对后再试一次',