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

@@ -30,8 +30,12 @@ let bdcLxArray = [
 		value: "zrz",
 	},
 	{
-		label: "户",
-		value: "h",
+		label: "户(预测)",
+		value: "h0",
+	},
+	{
+		label: "户(实测)",
+		value: "h1",
 	},
 	{
 		label: "多幢",

@@ -47,7 +47,7 @@
             </div>
 
             <el-dialog title="户编辑" :visible.sync="hbjVisible" width="50%" center>
-                <hbj ref="hbj" :bsm="hbsm"></hbj>
+                <hbj ref="hbj" :bsm="hbsm" :key="hbsm"></hbj>
                 <div class="btnGroup">
                     <el-button type="primary" @click="hbjSaveInfo">保存</el-button>
                     <el-button type="primary" @click="hbjResetInfo">重置</el-button>
@@ -77,6 +77,7 @@
                 queryData: {},
                 hbjVisible: false,
                 hbsm:'',
+                tabPosition: "1", //1是实测  0是预测
             };
         },
         created() {
@@ -99,7 +100,9 @@
             },
             //户保存
             hbjSaveInfo() {
-                this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition);
+                this.$refs.hbj.onSave(this.hbsm, this.tabPosition);
+                this.hbjVisible = false;
+                this.getData({pageSize:15});
             },
             //户编辑表单重置
             hbjResetInfo() {
@@ -142,15 +145,19 @@
                         this.$store.state.dzbsm = row.glbsm;
                         path = "/dz";
                         break;
-                    case "h":
+                    case "h0":
+                    case "h1":
                         this.hbsm = row.glbsm;
                         this.hbjVisible = true;
-                        console.log(this.hbsm);
-                        console.log(this.$refs);
-                        console.log(this.$refs.hbj);
-                        setTimeout(function () {
+                        if(row.dylx === "h0"){
+                            this.tabPosition = 0;
+                        }else {
+                            this.tabPosition = 1;
+                        }
+                        this.$nextTick(()=>{
+                            console.log(this.$refs.hbj);
                             this.$refs.hbj.getHInfo(this.hbsm);
-                        },10)
+                        });
                         break;
                     default:
                         break;

@@ -67,7 +67,7 @@ export default {
                 zdymc:"",
 				zdybsm: "",
 				zrzbsm: "",
-				syclx: "0",
+				scyclx: "0",
 				qsc: "",
 				jsc: "",
 				hs: "",
@@ -130,7 +130,7 @@ export default {
 					ljzbsm: "",
 					zdybsm: "",
 					zrzbsm: "",
-					syclx: "0",
+					scyclx: "0",
 					qsc: "",
 					jsc: "",
 					hs: "",

@@ -764,7 +764,7 @@
             },
 
             generatorCode(){
-                if((this.form.zrzh!=null&&this.form.zrzh!=='')||(this.form.bdcdyh!=null&&this.form.bdcdyh!=='')){
+                if(this.form.bdcdyh!=null&&this.form.bdcdyh!==''){
                     this.open();
                     return;
                 }