Merge branch 'dev' of http://yun.pashanhoo.com:9090/bdc/bdcdj-web into dev

@@ -193,11 +193,7 @@
     },
     },
     methods: {
     methods: {
       loadData () {
       loadData () {
-       if(this.propsParam.bsmSldy){
-          console.log("宗地基本信息");
-       }else{
-         console.log("登记簿里宗地基本信息");
-          getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
+       getZdjjxxBybdcdyid({ bdcdyid: this.propsParam.bdcdyid }).then((res) => {
           if (res.code === 200) {
           if (res.code === 200) {
             this.zdjbxx = res.result.zdjbxx;
             this.zdjbxx = res.result.zdjbxx;
             this.zdbhqks = res.result.zdbhqkList;
             this.zdbhqks = res.result.zdbhqkList;
@@ -205,9 +201,7 @@
               this.showGroup = true;
               this.showGroup = true;
             }
             }
           }
           }
-        })
-       }
-
+        })     
       }
       }
     }
     }
   }
   }

@@ -253,7 +253,7 @@
           return false;
           return false;
         }
         }
 
 
-        if (this.ruleForm.slywxx.gyfs == "0") {
+        if (this.ruleForm.sldy.gyfs == "0") {
           if (this.ruleForm.qlrList.length > 1) {
           if (this.ruleForm.qlrList.length > 1) {
             this.$message({
             this.$message({
               showClose: true,
               showClose: true,
@@ -264,9 +264,9 @@
           }
           }
           this.ruleForm.qlrList[0].sfczr = "1";
           this.ruleForm.qlrList[0].sfczr = "1";
         }
         }
-        if (this.ruleForm.slywxx.gyfs == "1") {
+        if (this.ruleForm.sldy.gyfs == "1") {
           //是否分别持证
           //是否分别持证
-          if (this.ruleForm.slywxx.sqfbcz == '1') { //是
+          if (this.ruleForm.sldy.sqfbcz == '1') { //是
             this.ruleForm.qlrList.forEach((item, index) => {
             this.ruleForm.qlrList.forEach((item, index) => {
               item.sfczr = "1"
               item.sfczr = "1"
             });
             });
@@ -280,7 +280,6 @@
             })
             })
           }
           }
         }
         }
-
         saveData(this.ruleForm).then((res) => {
         saveData(this.ruleForm).then((res) => {
           if (res.code === 200) {
           if (res.code === 200) {
             this.$message({
             this.$message({