e43c21ed by weimo934

merge(bjlp,plzl):合并代码

1 parent 250d1225
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
113 type: Array 113 type: Array
114 }, 114 },
115 measureType: { 115 measureType: {
116 type: Number 116 type: String
117 } 117 }
118 }, 118 },
119 data() { 119 data() {
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 <el-button class="radioBtn" label="3" border @click="plhVisible=true">批量户</el-button> 33 <el-button class="radioBtn" label="3" border @click="plhVisible=true">批量户</el-button>
34 <el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button> 34 <el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button>
35 <el-button class="radioBtn" label="5" border @click="plShVisible=true">批量室号</el-button> 35 <el-button class="radioBtn" label="5" border @click="plShVisible=true">批量室号</el-button>
36 <el-button class="radioBtn" label="6" border>批量坐落</el-button> 36 <el-button class="radioBtn" label="6" border @click="plzlVisible=true">批量坐落</el-button>
37 <el-button class="radioBtn" label="7" border>批量单元号</el-button> 37 <el-button class="radioBtn" label="7" border>批量单元号</el-button>
38 </div> 38 </div>
39 </el-col> 39 </el-col>
...@@ -161,6 +161,7 @@ export default { ...@@ -161,6 +161,7 @@ export default {
161 plcVisible:false, 161 plcVisible:false,
162 plhVisible:false, 162 plhVisible:false,
163 plShVisible:false, 163 plShVisible:false,
164 plzlVisible:false,
164 hbjVisible:false, 165 hbjVisible:false,
165 tabPosition:1, 166 tabPosition:1,
166 radio1: "", 167 radio1: "",
...@@ -334,7 +335,7 @@ export default { ...@@ -334,7 +335,7 @@ export default {
334 // 双击 335 // 双击
335 console.log('双击了'); 336 console.log('双击了');
336 this.hbjVisible = true; 337 this.hbjVisible = true;
337 self.$refs.hbj.getHInfo(this.bsms[this.bsms.length-1]); 338 self.$refs.hbj.getHInfo(this.bsms[this.bsms.length-1]);
338 }else{ 339 }else{
339 //单击 340 //单击
340 console.log('单击了'); 341 console.log('单击了');
...@@ -355,11 +356,11 @@ export default { ...@@ -355,11 +356,11 @@ export default {
355 //户保存 356 //户保存
356 hbjSaveInfo(){ 357 hbjSaveInfo(){
357 let bsm = this.bsms[this.bsms.length-1] 358 let bsm = this.bsms[this.bsms.length-1]
358 this.$refs.hbj.onSave(bsm,this.tabPosition); 359 this.$refs.hbj.onSave(bsm,this.tabPosition);
359 }, 360 },
360 //户编辑表单重置 361 //户编辑表单重置
361 hbjResetInfo(){ 362 hbjResetInfo(){
362 this.$refs.hbj.onReset(); 363 this.$refs.hbj.onReset();
363 } 364 }
364 }, 365 },
365 computed: { 366 computed: {
......