Merge remote-tracking branch 'origin/master'

@@ -29,5 +29,9 @@ let bdcLxArray = [
 		label: "自然幢",
 		value: "zrz",
 	},
+	{
+		label: "户",
+		value: "h",
+	},
 ];
 createFilter("bdcLxFilter", bdcLxArray);
\ No newline at end of file

@@ -21,7 +21,7 @@
                     <td  colspan="2" align="center"  >不动产单元号</td>
                     <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号-->
                     <td  colspan="4"  >
-                        <el-input v-model="form.dyhbsm" style="width: 70%"></el-input>
+                        <el-input v-model="form.bdcdyh" style="width: 70%"></el-input>
                         <el-button @click.prevent="" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button>
                     </td>
                     <td  colspan="2" align="center"  >原不动产单元</td>
@@ -33,11 +33,11 @@
                 <tr height="30">
                     <td  colspan="2" align="center"  >逻辑幢号</td>
                     <td  colspan="4"  >
-                        <el-input v-model="form.ljzbsm"></el-input>
+                        <el-input v-model="form.ljzh"></el-input>
                     </td>
                     <td  colspan="2" align="center"  >层号</td>
                     <td  colspan="4"  >
-                        <el-input v-model="form.cbsm"></el-input>
+                        <el-input v-model="form.ch"></el-input>
                     </td>
                 </tr>
 
@@ -387,10 +387,12 @@
                 form:{
                     zrzbsm:'',  //自然幢标识码
                     ljzbsm:'',  //逻辑幢标识码
+                    ljzh:'',  //逻辑幢号
                     zdybsm:'',  //幢单元标识码
                     cbsm:'',  //层标识码
+                    ch:'',  //层号
                     zdbsm:'',  //宗地标识码
-                    dyhbsm:'',  //不动产单元号标识码
+                    bdcdyh:'',  //不动产单元号标识码
                     ydybsm:'',  //原单元标识码
                     zrzh:'',  //自然幢号
                     mjdwbsm:'',  //面积单位编号
@@ -423,7 +425,6 @@
                     ftxs:'',  //分摊系数
                     scyclx:'',  //实预测类型(0:预测，1:实测;),区别户是实测还是预测数据
                     scycglbsm:'', //实测预测关联标识码
-                    ch:'', //层号
                     bz:'',  //备注
                     name:'',
                     date:'',

@@ -86,7 +86,7 @@
                         <span @click="deleteYtInfo(index)">删除</span>
                     </td>
                     <td   colspan="9"  >
-                        <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
+                        <el-select v-model="item1.fwytzdbsm" placeholder="请选择" >
                             <el-option
                                     v-for="item in $store.state.tdytList"
                                     :key="item.bsm"
@@ -165,6 +165,7 @@
 
 <script>
     import {insertLjzInfo} from "../../../api/zrz";
+    import {formdate} from "../../../libs/function";
     export default {
         name:'ljz',
         components:{},
@@ -246,7 +247,11 @@
             onSave(){
                 console.log(this.form)
                 //自然幢标识码
-                this.form.zrzbsm=this.$router.query.bsm;
+                if(this.form.zrzbsm===""||this.form.zrzbsm==null){
+                    this.form.zrzbsm=this.$store.state.zrzbsm;
+                }
+                //todo 竣工日期
+                this.form.jgrq="2020-10-21";
                 insertLjzInfo(this.form).then((res)=>{
                     if(res.code===200){
                         this.$message.success("保存成功")