e25615ec by weimo934

Merge remote-tracking branch 'origin/master'

2 parents 5f74171b 03f28a9f
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 <el-row> 8 <el-row>
9 <el-col :span="16" class="fl"> 9 <el-col :span="16" class="fl">
10 <el-radio-group v-model="gyfs"> 10 <el-radio-group v-model="gyfs">
11 <el-radio :label="item.bsm" :disabled="qszt!='0'" :key="item.bsm" v-for="item in $store.state.gyfsList">{{item.mc}}</el-radio> 11 <el-radio :label="item.bsm" :disabled="qszt!='0' || item.disabled" :key="item.bsm" v-for="item in gyfsList">{{item.mc}}</el-radio>
12 </el-radio-group> 12 </el-radio-group>
13 </el-col> 13 </el-col>
14 <el-col :span="4" class="fr" v-show="qszt=='0'"> 14 <el-col :span="4" class="fr" v-show="qszt=='0'">
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
245 </td> 245 </td>
246 <td colspan="2" class="tdright">电话</td> 246 <td colspan="2" class="tdright">电话</td>
247 <td colspan="3"> 247 <td colspan="3">
248 <input type="text" class="formInput" v-model="item.dh" /> 248 <input type="text" class="formInput" v-model="item.dh" />
249 </td> 249 </td>
250 </tr> 250 </tr>
251 </template> 251 </template>
...@@ -325,6 +325,7 @@ ...@@ -325,6 +325,7 @@
325 // bsm:'', 325 // bsm:'',
326 gyfs: '', 326 gyfs: '',
327 tableData: [], 327 tableData: [],
328 gyfsList:[],
328 //表格选中项 329 //表格选中项
329 multipleSelection: [], 330 multipleSelection: [],
330 dialogVisible: false, 331 dialogVisible: false,
...@@ -463,6 +464,16 @@ ...@@ -463,6 +464,16 @@
463 this.formData.fr=row.frList[0]; 464 this.formData.fr=row.frList[0];
464 } 465 }
465 }, 466 },
467
468 inputBlur(e){
469 if(e.target.value!=''){
470 e.target.style.border=""
471 }else{
472 e.target.style.border="1px solid red";
473 e.target.style.boxSizing = 'border-box';
474 }
475 },
476
466 //删除行数据 477 //删除行数据
467 delRow() { 478 delRow() {
468 if (this.multipleSelection.length > 0) { 479 if (this.multipleSelection.length > 0) {
...@@ -531,12 +542,21 @@ ...@@ -531,12 +542,21 @@
531 }) 542 })
532 } 543 }
533 }, 544 },
534 created(){}, 545 created(){
546 if(this.tableData.length>1){
547 this.gyfsList = this.$store.state.gyfsList.length;
548 for(let i = 0;i<this.gyfsList.length;i++){
549 let item = this.gyfsList[i];
550 this.gyfsList.disabled = item.mc === "单独所有" && item.bsm === this.gyfs;
551 }
552 }
553 },
535 mounted() { 554 mounted() {
536 this.getQlrInfo(); 555 this.getQlrInfo();
537 if(this.$store.state.gyfsList.length>0){ 556 if(this.$store.state.gyfsList.length>0){
538 this.gyfs=this.$store.state.gyfsList[0].bsm; 557 this.gyfs=this.$store.state.gyfsList[0].bsm;
539 } 558 }
559
540 }, 560 },
541 watch:{ 561 watch:{
542 dialogVisible(n){ 562 dialogVisible(n){
...@@ -584,7 +604,16 @@ ...@@ -584,7 +604,16 @@
584 zjzlbsm: "", 604 zjzlbsm: "",
585 } 605 }
586 } 606 }
587 } 607 },
608 tableData(){
609 if(this.tableData.length>1){
610 this.gyfsList = this.$store.state.gyfsList;
611 for(let i = 0;i<this.gyfsList.length;i++){
612 let item = this.gyfsList[i];
613 this.gyfsList[i].disabled = item.mc === "单独所有";
614 }
615 }
616 },
588 } 617 }
589 }; 618 };
590 </script> 619 </script>
......
1 <template> 1 <template>
2 <el-row> 2 <el-row>
3 <el-col :span="24"> 3 <el-col :span="24" style="margin-left: -10px;">
4 <el-row> 4 <el-row>
5 <el-col :span="24"> 5 <el-col :span="24">
6 <el-form :inline="true" class="demo-form-inline" label-width="106px"> 6 <el-form :inline="true" class="demo-form-inline" label-width="106px">
7 <el-form-item label="宗地编码"> 7 <el-form-item label="不动产单元号">
8 <el-input 8 <el-input
9 v-model="queryData.zddm" 9 maxlength="28"
10 placeholder="输入宗地编码" 10 v-model="queryData.bdcdyh"
11 placeholder="输入不动产单元号"
11 @change="query" 12 @change="query"
12 ></el-input> 13 ></el-input>
13 </el-form-item> 14 </el-form-item>
...@@ -18,11 +19,10 @@ ...@@ -18,11 +19,10 @@
18 @change="query" 19 @change="query"
19 ></el-input> 20 ></el-input>
20 </el-form-item> 21 </el-form-item>
21 <el-form-item label="不动产单元号:"> 22 <el-form-item label="宗地编码">
22 <el-input 23 <el-input
23 maxlength="28" 24 v-model="queryData.zddm"
24 v-model="queryData.bdcdyh" 25 placeholder="输入宗地编码"
25 placeholder="输入不动产单元号"
26 @change="query" 26 @change="query"
27 ></el-input> 27 ></el-input>
28 </el-form-item> 28 </el-form-item>
...@@ -41,6 +41,13 @@ ...@@ -41,6 +41,13 @@
41 <el-row class="row3" v-if="ismore"> 41 <el-row class="row3" v-if="ismore">
42 <el-col :span="22"> 42 <el-col :span="22">
43 <el-form :inline="true" class="demo-form-inline" label-width="106px"> 43 <el-form :inline="true" class="demo-form-inline" label-width="106px">
44 <el-form-item label="不动产权证号">
45 <el-input
46 placeholder="输入不动产权证号"
47 v-model="queryData.bdcqzh"
48 @change="query"
49 ></el-input>
50 </el-form-item>
44 <el-form-item label="权利人名称"> 51 <el-form-item label="权利人名称">
45 <el-input 52 <el-input
46 placeholder="输入权利人名称" 53 placeholder="输入权利人名称"
...@@ -48,20 +55,13 @@ ...@@ -48,20 +55,13 @@
48 @change="query" 55 @change="query"
49 ></el-input> 56 ></el-input>
50 </el-form-item> 57 </el-form-item>
51 <el-form-item label="坐落:"> 58 <el-form-item label="坐落">
52 <el-input 59 <el-input
53 v-model="queryData.zl" 60 v-model="queryData.zl"
54 placeholder="输入坐落地址" 61 placeholder="输入坐落地址"
55 @change="query" 62 @change="query"
56 ></el-input> 63 ></el-input>
57 </el-form-item> 64 </el-form-item>
58 <el-form-item label="不动产权证号">
59 <el-input
60 placeholder="输入不动产权证号"
61 v-model="queryData.bdcqzh"
62 @change="query"
63 ></el-input>
64 </el-form-item>
65 </el-form> 65 </el-form>
66 </el-col> 66 </el-col>
67 <el-col :span="2" :offset="offset"> 67 <el-col :span="2" :offset="offset">
......
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
88 <tr> 88 <tr>
89 <td colspan="2" class="tdright">建筑物高度(m)</td> 89 <td colspan="2" class="tdright">建筑物高度(m)</td>
90 <td colspan="4" > 90 <td colspan="4" >
91 <input class="formInput" :disabled="form.qszt!='0'" v-model="form.jzwgd"> 91 <input class="formInput" type="number" :disabled="form.qszt!='0'" v-model="form.jzwgd">
92 </td> 92 </td>
93 <td colspan="2" class="tdright">地下深度(m)</td> 93 <td colspan="2" class="tdright">地下深度(m)</td>
94 <td colspan="4" > 94 <td colspan="4" >
......