8a4ef353 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 627c224a b5bda4cf
...@@ -29,5 +29,9 @@ let bdcLxArray = [ ...@@ -29,5 +29,9 @@ let bdcLxArray = [
29 label: "自然幢", 29 label: "自然幢",
30 value: "zrz", 30 value: "zrz",
31 }, 31 },
32 {
33 label: "户",
34 value: "h",
35 },
32 ]; 36 ];
33 createFilter("bdcLxFilter", bdcLxArray); 37 createFilter("bdcLxFilter", bdcLxArray);
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
21 <td colspan="2" align="center" >不动产单元号</td> 21 <td colspan="2" align="center" >不动产单元号</td>
22 <!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号--> 22 <!-- todo 此处暂时存放的是不动产单元号标识码,而不是不动产单元号-->
23 <td colspan="4" > 23 <td colspan="4" >
24 <el-input v-model="form.dyhbsm" style="width: 70%"></el-input> 24 <el-input v-model="form.bdcdyh" style="width: 70%"></el-input>
25 <el-button @click.prevent="" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button> 25 <el-button @click.prevent="" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button>
26 </td> 26 </td>
27 <td colspan="2" align="center" >原不动产单元</td> 27 <td colspan="2" align="center" >原不动产单元</td>
...@@ -33,11 +33,11 @@ ...@@ -33,11 +33,11 @@
33 <tr height="30"> 33 <tr height="30">
34 <td colspan="2" align="center" >逻辑幢号</td> 34 <td colspan="2" align="center" >逻辑幢号</td>
35 <td colspan="4" > 35 <td colspan="4" >
36 <el-input v-model="form.ljzbsm"></el-input> 36 <el-input v-model="form.ljzh"></el-input>
37 </td> 37 </td>
38 <td colspan="2" align="center" >层号</td> 38 <td colspan="2" align="center" >层号</td>
39 <td colspan="4" > 39 <td colspan="4" >
40 <el-input v-model="form.cbsm"></el-input> 40 <el-input v-model="form.ch"></el-input>
41 </td> 41 </td>
42 </tr> 42 </tr>
43 43
...@@ -387,10 +387,12 @@ ...@@ -387,10 +387,12 @@
387 form:{ 387 form:{
388 zrzbsm:'', //自然幢标识码 388 zrzbsm:'', //自然幢标识码
389 ljzbsm:'', //逻辑幢标识码 389 ljzbsm:'', //逻辑幢标识码
390 ljzh:'', //逻辑幢号
390 zdybsm:'', //幢单元标识码 391 zdybsm:'', //幢单元标识码
391 cbsm:'', //层标识码 392 cbsm:'', //层标识码
393 ch:'', //层号
392 zdbsm:'', //宗地标识码 394 zdbsm:'', //宗地标识码
393 dyhbsm:'', //不动产单元号标识码 395 bdcdyh:'', //不动产单元号标识码
394 ydybsm:'', //原单元标识码 396 ydybsm:'', //原单元标识码
395 zrzh:'', //自然幢号 397 zrzh:'', //自然幢号
396 mjdwbsm:'', //面积单位编号 398 mjdwbsm:'', //面积单位编号
...@@ -423,7 +425,6 @@ ...@@ -423,7 +425,6 @@
423 ftxs:'', //分摊系数 425 ftxs:'', //分摊系数
424 scyclx:'', //实预测类型(0:预测,1:实测;),区别户是实测还是预测数据 426 scyclx:'', //实预测类型(0:预测,1:实测;),区别户是实测还是预测数据
425 scycglbsm:'', //实测预测关联标识码 427 scycglbsm:'', //实测预测关联标识码
426 ch:'', //层号
427 bz:'', //备注 428 bz:'', //备注
428 name:'', 429 name:'',
429 date:'', 430 date:'',
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
86 <span @click="deleteYtInfo(index)">删除</span> 86 <span @click="deleteYtInfo(index)">删除</span>
87 </td> 87 </td>
88 <td colspan="9" > 88 <td colspan="9" >
89 <el-select v-model="item1.fwjgzdbsm" placeholder="请选择" > 89 <el-select v-model="item1.fwytzdbsm" placeholder="请选择" >
90 <el-option 90 <el-option
91 v-for="item in $store.state.tdytList" 91 v-for="item in $store.state.tdytList"
92 :key="item.bsm" 92 :key="item.bsm"
...@@ -165,6 +165,7 @@ ...@@ -165,6 +165,7 @@
165 165
166 <script> 166 <script>
167 import {insertLjzInfo} from "../../../api/zrz"; 167 import {insertLjzInfo} from "../../../api/zrz";
168 import {formdate} from "../../../libs/function";
168 export default { 169 export default {
169 name:'ljz', 170 name:'ljz',
170 components:{}, 171 components:{},
...@@ -246,7 +247,11 @@ ...@@ -246,7 +247,11 @@
246 onSave(){ 247 onSave(){
247 console.log(this.form) 248 console.log(this.form)
248 //自然幢标识码 249 //自然幢标识码
249 this.form.zrzbsm=this.$router.query.bsm; 250 if(this.form.zrzbsm===""||this.form.zrzbsm==null){
251 this.form.zrzbsm=this.$store.state.zrzbsm;
252 }
253 //todo 竣工日期
254 this.form.jgrq="2020-10-21";
250 insertLjzInfo(this.form).then((res)=>{ 255 insertLjzInfo(this.form).then((res)=>{
251 if(res.code===200){ 256 if(res.code===200){
252 this.$message.success("保存成功") 257 this.$message.success("保存成功")
......