Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
784f53aa by weimo934
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/panel/change/fwsxbg/index.vue
2 parents 35f7856f ebc923f4
Inline Side-by-side
Showing 6 changed files with 265 additions and 106 deletions
...@@ -75,11 +75,11 @@ ...@@ -75,11 +75,11 @@
75 <tr> 75 <tr>
76 <td colspan="4" class="tdright"><i class="requisite">*</i>权利人名称</td> 76 <td colspan="4" class="tdright"><i class="requisite">*</i>权利人名称</td>
77 <td colspan="6"> 77 <td colspan="6">
78 <input type="text" class="formInput" v-model="formData.qlrmc" /> 78 <input type="text" class="formInput" v-model="formData.qlrmc" ref="qlrmc" @blur="inputBlur($event)"/>
79 </td> 79 </td>
80 <td colspan="4" class="tdright"><i class="requisite">*</i>权利人类型</td> 80 <td colspan="4" class="tdright"><i class="requisite">*</i>权利人类型</td>
81 <td colspan="6"> 81 <td colspan="6">
82 <el-select class="formSelect" v-model="formData.qlrlxbsm"> 82 <el-select class="formSelect" v-model="formData.qlrlxbsm" ref="qlrlxbsm" @blur="inputBlur($event)">
83 <el-option 83 <el-option
84 v-for="item in $store.state.qlrlxList" 84 v-for="item in $store.state.qlrlxList"
85 :key="item.bsm" 85 :key="item.bsm"
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
93 <tr> 93 <tr>
94 <td colspan="4" class="tdright"><i class="requisite">*</i>证件类型</td> 94 <td colspan="4" class="tdright"><i class="requisite">*</i>证件类型</td>
95 <td colspan="6"> 95 <td colspan="6">
96 <el-select class="formSelect" v-model="formData.zjzlbsm"> 96 <el-select class="formSelect" v-model="formData.zjzlbsm" ref="zjzlbsm" @blur="inputBlur($event)">
97 <el-option 97 <el-option
98 v-for="item in $store.state.zjzlList" 98 v-for="item in $store.state.zjzlList"
99 :key="item.bsm" 99 :key="item.bsm"
...@@ -105,18 +105,18 @@ ...@@ -105,18 +105,18 @@
105 </td> 105 </td>
106 <td colspan="4" class="tdright"><i class="requisite">*</i>证件号</td> 106 <td colspan="4" class="tdright"><i class="requisite">*</i>证件号</td>
107 <td colspan="6"> 107 <td colspan="6">
108 <input type="text" class="formInput" maxlength="18" v-model="formData.zjh" /> 108 <input type="text" class="formInput" maxlength="18" v-model="formData.zjh" ref="zjh" @blur="inputBlur($event)"/>
109 </td> 109 </td>
110 </tr> 110 </tr>
111 <tr> 111 <tr>
112 <td colspan="4" class="tdright"><i class="requisite">*</i>电话</td> 112 <td colspan="4" class="tdright"><i class="requisite">*</i>电话</td>
113 <td colspan="6"> 113 <td colspan="6">
114 <!-- @blur="inputBlur($event)"--> 114 <!-- @blur="inputBlur($event)"-->
115 <input type="text" class="formInput" v-model="formData.dh" /> 115 <input type="text" class="formInput" v-model="formData.dh" ref="dh" @blur="inputBlur($event)"/>
116 </td> 116 </td>
117 <td colspan="4" class="tdright"><i class="requisite">*</i>地址</td> 117 <td colspan="4" class="tdright"><i class="requisite">*</i>地址</td>
118 <td colspan="6"> 118 <td colspan="6">
119 <input type="text" class="formInput" v-model="formData.dz" /> 119 <input type="text" class="formInput" v-model="formData.dz" ref="dz" @blur="inputBlur($event)"/>
120 </td> 120 </td>
121 </tr> 121 </tr>
122 <tr> 122 <tr>
...@@ -384,9 +384,21 @@ ...@@ -384,9 +384,21 @@
384 zjzlbsm: "", 384 zjzlbsm: "",
385 }, 385 },
386 glbsm:'', 386 glbsm:'',
387
388 rules:[],
387 }; 389 };
388 }, 390 },
389 methods: { 391 methods: {
392
393 inputBlur(e){
394 if(e.target.value!=''){
395 e.target.style.border=""
396 }else{
397 e.target.style.border="1px solid red";
398 e.target.style.boxSizing = 'border-box';
399 }
400 },
401
390 //新增行数据 402 //新增行数据
391 addRow() { 403 addRow() {
392 this.update=false; 404 this.update=false;
...@@ -414,39 +426,97 @@ ...@@ -414,39 +426,97 @@
414 }, 426 },
415 //确认权利人信息按钮；可以进行新增；可以进行更新； 427 //确认权利人信息按钮；可以进行新增；可以进行更新；
416 addNewQlrInfo(){ 428 addNewQlrInfo(){
417 //todo 权利人页面调整 429
418 this.formData.addQjDlrFrRequest=[]; 430 this.rules=[
419 this.formData.glbsm=this.bsm; 431 {
420 //将代理人，法人数据合在一起，名称为addQjDlrFrRequest； 432 data:this.formData.qlrmc,
421 //法人的type字段类型为0, 433 name:'权利人名称',
422 this.formData.fr.type=0; 434 dom:this.$refs.qlrmc,
423 this.formData.addQjDlrFrRequest.push(this.formData.fr); 435 rule: /^\s*$/g, //非空
424 for(let k=0;k<this.formData.dlrList.length;k++){ 436 },
425 //代理人的type字段类型为1, 437 {
426 this.formData.dlrList[k].type=1; 438 data:this.formData.qlrlxbsm,
427 this.formData.addQjDlrFrRequest.push(this.formData.dlrList[k]); 439 name:'权利人类型',
428 } 440 dom:this.$refs.qlrlxbsm,
429 //如果是从更新按钮点击确定的则进行更新操作，如果不是，则进行添加操作 441 rule: /^\s*$/g, //非空
430 if(this.update){ 442 },
431 console.log(this.formData) 443 {
432 updateQlrDlrFr(this.formData).then((res)=>{ 444 data:this.formData.zjzlbsm,
433 if(res.code===200){ 445 name:'证件类型',
434 this.$message.success("修改完成！"); 446 dom:this.$refs.zjzlbsm,
435 this.getQlrInfo(); 447 rule: /^\s*$/g, //非空
436 this.update=false; 448 },
437 this.dialogVisible = false; 449 {
450 data:this.formData.zjh,
451 name:'证件号',
452 dom:this.$refs.zjh,
453 rule: /^\s*$/g, //非空
454 },
455 {
456 data:this.formData.dh,
457 name:'电话',
458 dom:this.$refs.dh,
459 rule: /^\s*$/g, //非空
460 },
461 {
462 data:this.formData.dz,
463 name:'地址',
464 dom:this.$refs.dz,
465 rule: /^\s*$/g, //非空
466 },
467 ]
468 let flag = true;
469 this.rules.forEach(item=>{
470 if(item.rule.test(item.data) || item.data == null){
471 if(item.dom.$el){
472 item.dom.$el.style.border = '1px solid red';
473 item.dom.$el.style.boxSizing = 'border-box';
474 }else{
475 item.dom.style.border = '1px solid red';
476 item.dom.style.boxSizing = 'border-box';
438 } 477 }
439 }) 478 flag = false;
440 }else { 479 return false
441 insertQlrDlrFr(this.formData).then((res)=>{ 480 }
442 if(res.code===200){ 481 })
443 this.tableData.push(this.formData); 482 this.$nextTick(()=>{
444 Object.assign(this.$data, this.$options.data()) 483 if (flag) {
445 this.dialogVisible = false; 484 //todo 权利人页面调整
446 this.getQlrInfo(); 485 this.formData.addQjDlrFrRequest=[];
486 this.formData.glbsm=this.bsm;
487 //将代理人，法人数据合在一起，名称为addQjDlrFrRequest；
488 //法人的type字段类型为0,
489 this.formData.fr.type=0;
490 this.formData.addQjDlrFrRequest.push(this.formData.fr);
491 for(let k=0;k<this.formData.dlrList.length;k++){
492 //代理人的type字段类型为1,
493 this.formData.dlrList[k].type=1;
494 this.formData.addQjDlrFrRequest.push(this.formData.dlrList[k]);
447 } 495 }
448 }) 496 //如果是从更新按钮点击确定的则进行更新操作，如果不是，则进行添加操作
449 } 497 if(this.update){
498 console.log(this.formData)
499 updateQlrDlrFr(this.formData).then((res)=>{
500 if(res.code===200){
501 this.$message.success("修改完成！");
502 this.getQlrInfo();
503 this.update=false;
504 this.dialogVisible = false;
505 }
506 })
507 }else {
508 insertQlrDlrFr(this.formData).then((res)=>{
509 if(res.code===200){
510 this.tableData.push(this.formData);
511 Object.assign(this.$data, this.$options.data())
512 this.dialogVisible = false;
513 this.getQlrInfo();
514 }
515 })
516 }
517 }
518 })
519
450 520
451 }, 521 },
452 //修改行数据 522 //修改行数据
...@@ -623,12 +693,45 @@ ...@@ -623,12 +693,45 @@
623 this.gyfsList[i].disabled = item.mc === "单独所有"; 693 this.gyfsList[i].disabled = item.mc === "单独所有";
624 } 694 }
625 } 695 }
626 console.log(this.tableData.length+":this.tableData[0].length");
627 if(this.tableData.length>1){ 696 if(this.tableData.length>1){
628 console.log(JSON.stringify(this.tableData[0])+":this.tableData[0].length");
629 this.gyfs = this.tableData[0].gyfsbsm 697 this.gyfs = this.tableData[0].gyfsbsm
630 } 698 }
631 }, 699 },
700
701 "formData.qlrlxbsm":function (val) {
702 console.log(this.$refs.qlrlxbsm.$el.style.border+":console.log(this.$refs.qlrlxbsm.$el.style.border)")
703 if (val != '') {
704 console.log(this.$refs.qlrlxbsm.$el.style.border+":console.log(this.$refs.qlrlxbsm.$el.style.border)")
705 this.$refs.qlrlxbsm.$el.style.border = '';
706 }
707 },
708
709 "formData.zjzlbsm":function (val) {
710 if (val != '') {
711 this.$refs.zjzlbsm.$el.style.border = '';
712 }
713 },
714
715 // "formData.gyfsbsm":function (val) {
716 // let ddsy = '';
717 // for(let i = 0;i<this.gyfsList.length;i++){
718 // if(this.gyfsList[i].mc === "单独所有"){
719 // ddsy = this.gyfsList[i].bsm
720 // }
721 // }
722 // if(ddsy === val){
723 // if(this.update){
724 // if(this.tableData.length > 1){
725 // this.$message.warning("权利人人数大于1，不能选择单独所有")
726 // }
727 // }else{
728 // if(this.tableData.length > 0){
729 // this.$message.warning("权利人人数大于1，不能选择单独所有")
730 // }
731 // }
732 //
733 // }
734 // }
632 } 735 }
633 }; 736 };
634 </script> 737 </script>
......
1 <template> 1 <template>
2 <div> 2 <div>
3 <el-dialog v-dialogDrag :close-on-click-modal="false" 3 <el-dialog v-dialogDrag :close-on-click-modal="false"
4 title="新增" 4 title="批量户"
5 :visible.sync="isVisible" 5 :visible.sync="isVisible"
6 width="70%" 6 width="72%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 :modal-append-to-body="false"
9 > 9 >
...@@ -187,13 +187,10 @@ ...@@ -187,13 +187,10 @@
187 </tr> 187 </tr>
188 188
189 <tr> 189 <tr>
190 <td colspan="12" rowspan="4" align="center"> 190 <td colspan="12" align="center">
191 <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz> 191 <Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
192 </td> 192 </td>
193 </tr> 193 </tr>
194 <tr></tr>
195 <tr></tr>
196 <tr></tr>
197 194
198 <tr> 195 <tr>
199 <td colspan="2">东墙体归属</td> 196 <td colspan="2">东墙体归属</td>
...@@ -370,7 +367,7 @@ ...@@ -370,7 +367,7 @@
370 close: function () { 367 close: function () {
371 this.$emit('close') 368 this.$emit('close')
372 this.isVisible = false 369 this.isVisible = false
373 this.result() 370 this.reset()
374 }, 371 },
375 reset: function () { 372 reset: function () {
376 this.form={ 373 this.form={
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <el-row class="box"> 2 <el-row class="box">
3 <el-col :span="24"> 3 <el-col :span="24">
4 <el-row> 4 <el-row>
5 <el-col :span="24"> 5 <el-col :span="18">
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
...@@ -18,14 +18,17 @@ ...@@ -18,14 +18,17 @@
18 @change="query" 18 @change="query"
19 ></el-input> 19 ></el-input>
20 </el-form-item> 20 </el-form-item>
21 <el-form-item label="不动产单元号"> 21 <el-form-item label="不动产单元号" >
22 <el-input 22 <el-input style="width: 280px;"
23 maxlength="28" 23 maxlength="28"
24 v-model="queryData.bdcdyh" 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>
29 </el-form>
30 </el-col>
31 <el-col :span="6" aria-rowspan="3">
29 <el-button type="primary" @click="query" icon="el-icon-search">查询</el-button> 32 <el-button type="primary" @click="query" icon="el-icon-search">查询</el-button>
30 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button> 33 <el-button type="warning" @click="reset" icon="el-icon-refresh">重置</el-button>
31 <el-button 34 <el-button
...@@ -34,11 +37,10 @@ ...@@ -34,11 +37,10 @@
34 >更多查询 37 >更多查询
35 </el-button> 38 </el-button>
36 <!-- @click="ismore = !ismore" --> 39 <!-- @click="ismore = !ismore" -->
37 </el-form>
38 </el-col> 40 </el-col>
39 </el-row> 41 </el-row>
40 <el-row class="row3" v-if="ismore"> 42 <el-row class="row3" v-if="ismore">
41 <el-col :span="22"> 43 <el-col :span="18">
42 <el-form :inline="true" class="demo-form-inline" label-width="106px"> 44 <el-form :inline="true" class="demo-form-inline" label-width="106px">
43 <el-form-item label="权利人名称"> 45 <el-form-item label="权利人名称">
44 <el-input 46 <el-input
...@@ -55,7 +57,7 @@ ...@@ -55,7 +57,7 @@
55 ></el-input> 57 ></el-input>
56 </el-form-item> 58 </el-form-item>
57 <el-form-item label="不动产权证号"> 59 <el-form-item label="不动产权证号">
58 <el-input 60 <el-input style="width: 280px;"
59 placeholder="输入不动产权证号" 61 placeholder="输入不动产权证号"
60 v-model="queryData.bdcqzh" 62 v-model="queryData.bdcqzh"
61 @change="query" 63 @change="query"
...@@ -63,11 +65,11 @@ ...@@ -63,11 +65,11 @@
63 </el-form-item> 65 </el-form-item>
64 </el-form> 66 </el-form>
65 </el-col> 67 </el-col>
66 <el-col :span="2" :offset="offset"> 68 <!-- <el-col :span="2" :offset="offset">
67 </el-col> 69 </el-col> -->
68 </el-row> 70 </el-row>
69 <el-row> 71 <el-row>
70 <el-col :span="24"> 72 <el-col :span="18">
71 <el-form :inline="true" :model="queryData" class="demo-form-inline" label-width="106px"> 73 <el-form :inline="true" :model="queryData" class="demo-form-inline" label-width="106px">
72 <el-form-item class="demo-form-inline" label="单元范围"> 74 <el-form-item class="demo-form-inline" label="单元范围">
73 <el-checkbox-group v-model="queryData.dylxs" @change="query"> 75 <el-checkbox-group v-model="queryData.dylxs" @change="query">
...@@ -83,8 +85,6 @@ ...@@ -83,8 +85,6 @@
83 </el-form-item> 85 </el-form-item>
84 </el-form> 86 </el-form>
85 </el-col> 87 </el-col>
86 <el-col :span="2">
87 </el-col>
88 </el-row> 88 </el-row>
89 </el-col> 89 </el-col>
90 </el-row> 90 </el-row>
......
1 <template> 1 <template>
2 <div class="main"> 2 <div class="main" style="padding: 18px!important;">
3 <div class="panel content_box"> 3 <div class="panel content_box">
4 <el-card class="panel_left"> 4 <el-card class="panel_left">
5 <div slot="header" class="clearfix"> 5 <div slot="header" class="clearfix">
...@@ -224,6 +224,7 @@ export default { ...@@ -224,6 +224,7 @@ export default {
224 flex-direction: column; 224 flex-direction: column;
225 overflow: hidden; 225 overflow: hidden;
226 height: 100%; 226 height: 100%;
227
227 .clearfix { 228 .clearfix {
228 span { 229 span {
229 color: #6d7278; 230 color: #6d7278;
...@@ -244,6 +245,7 @@ export default { ...@@ -244,6 +245,7 @@ export default {
244 .panel { 245 .panel {
245 @flex(); 246 @flex();
246 width: 100%; 247 width: 100%;
248 padding: 0 0 18px!important;
247 .panel_left { 249 .panel_left {
248 width: 35%; 250 width: 35%;
249 margin-right: 20px; 251 margin-right: 20px;
...@@ -309,7 +311,7 @@ export default { ...@@ -309,7 +311,7 @@ export default {
309 } 311 }
310 .notice { 312 .notice {
311 padding: 0; 313 padding: 0;
312 height: calc(100% - 285px); 314 height: calc(100% - 266px);
313 @flex(); 315 @flex();
314 .news { 316 .news {
315 float: left; 317 float: left;
......
...@@ -378,6 +378,7 @@ export default { ...@@ -378,6 +378,7 @@ export default {
378 bjztFlag:true, 378 bjztFlag:true,
379 taskTitle:'添加', 379 taskTitle:'添加',
380 curBsm:'', 380 curBsm:'',
381 qsztList:[],
381 }; 382 };
382 }, 383 },
383 created() { 384 created() {
...@@ -401,13 +402,18 @@ export default { ...@@ -401,13 +402,18 @@ export default {
401 if (this.bsms.length <= 0) { 402 if (this.bsms.length <= 0) {
402 Message.warning("请选择操作户") 403 Message.warning("请选择操作户")
403 return 404 return
404 } 405 }else{
405 batchCommit(this.bsms).then(res=>{ 406 if (this.qsztList.indexOf('1') > -1) {
406 if (res.success) { 407 Message.warning("已提交的户无法继续操作")
407 Message.success("提交成功"); 408 }else{
408 this.getlpbData(); 409 batchCommit(this.bsms).then(res=>{
409 } 410 if (res.success) {
410 }) 411 Message.success("提交成功");
412 this.getlpbData();
413 }
414 })
415 }
416 }
411 }, 417 },
412 loading(){ 418 loading(){
413 this.getLpbMenuTree(this.$store.state.zrzbsm); 419 this.getLpbMenuTree(this.$store.state.zrzbsm);
...@@ -423,23 +429,28 @@ export default { ...@@ -423,23 +429,28 @@ export default {
423 if (this.bsms.length <= 0) { 429 if (this.bsms.length <= 0) {
424 Message.warning("请选择操作户") 430 Message.warning("请选择操作户")
425 return 431 return
426 } 432 }else{
427 switch (val) { 433 if (this.qsztList.indexOf('1') > -1) {
428 case 'h': 434 Message.warning("已提交的户无法继续操作")
429 this.plhVisible=true; 435 }else{
430 break; 436 switch (val) {
431 case 'zl': 437 case 'h':
432 this.plzlVisible=true; 438 this.plhVisible=true;
433 break; 439 break;
434 case 'sh': 440 case 'zl':
435 this.plShVisible=true; 441 this.plzlVisible=true;
436 break; 442 break;
437 default: 443 case 'sh':
438 break; 444 this.plShVisible=true;
439 } 445 break;
446 default:
447 break;
448 }
449 }
450 }
440 }, 451 },
441 lodding(){ 452 lodding(){
442 this.getlpbData(); 453 this.getlpbData();
443 }, 454 },
444 plZlClose() { 455 plZlClose() {
445 this.plzlVisible = false; 456 this.plzlVisible = false;
...@@ -462,6 +473,7 @@ export default { ...@@ -462,6 +473,7 @@ export default {
462 //清空已选中层户 473 //清空已选中层户
463 this.cbsmList = []; 474 this.cbsmList = [];
464 this.bsms = []; 475 this.bsms = [];
476 this.qsztList = [];
465 this.$refs.lpbContent.hbsmList = []; 477 this.$refs.lpbContent.hbsmList = [];
466 this.$nextTick(()=>{ 478 this.$nextTick(()=>{
467 //户 479 //户
...@@ -565,6 +577,16 @@ export default { ...@@ -565,6 +577,16 @@ export default {
565 this.bsms = data; 577 this.bsms = data;
566 } 578 }
567 }, 579 },
580 //获取选中户信息
581 getQsztList(data, type) {
582 if (type) {
583 // 双击
584
585 } else {
586 //单击 TO DO
587 this.qsztList = data;
588 }
589 },
568 //获取选中层bsmlist 590 //获取选中层bsmlist
569 getCbsm(data){ 591 getCbsm(data){
570 this.cbsmList = data; 592 this.cbsmList = data;
...@@ -588,9 +610,11 @@ export default { ...@@ -588,9 +610,11 @@ export default {
588 }); 610 });
589 } 611 }
590 }, 612 },
591 //调用楼盘表信息查询接口 613 //调用楼盘表信息查询和图例统计接口
592 getlpbData() { 614 getlpbData() {
593 this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,this.scyclx); 615 this.$refs.lpbContent.loadingData(this.$store.state.zrzbsm,this.scyclx);
616 this.getDyztBsmList();
617 this.getLpbFwytAndQlxz();
594 //改变楼盘表子组件的key值，重新渲染 618 //改变楼盘表子组件的key值，重新渲染
595 this.time = new Date().getTime(); 619 this.time = new Date().getTime();
596 }, 620 },
...@@ -631,18 +655,21 @@ export default { ...@@ -631,18 +655,21 @@ export default {
631 }, 655 },
632 //批量添加不动产单元号 656 //批量添加不动产单元号
633 addBdcdyh() { 657 addBdcdyh() {
634 // this.pd[0].bsm //自然幢标识码 658 if (this.qsztList.indexOf('1') > -1) {
635 batchGeneratorBdcdyh(this.$store.state.zrzh, this.pd[0].bsm,0).then( 659 Message.warning("已提交的户无法继续操作")
636 (res) => { 660 }else{
637 if (res.code === 200) { 661 batchGeneratorBdcdyh(this.$store.state.zrzh, this.pd[0].bsm,0).then(
638 this.$message.success("生成完成！"); 662 (res) => {
639 } else if(res.code === 206){ 663 if (res.code === 200) {
640 let hasGenerateCount = res.result.hasGenerateCount; 664 this.$message.success("生成完成！");
641 let unGenerateCount = res.result.unGenerateCount; 665 } else if(res.code === 206){
642 this.open(hasGenerateCount,unGenerateCount); 666 let hasGenerateCount = res.result.hasGenerateCount;
667 let unGenerateCount = res.result.unGenerateCount;
668 this.open(hasGenerateCount,unGenerateCount);
669 }
643 } 670 }
644 } 671 );
645 ); 672 }
646 }, 673 },
647 674
648 open(hasGenerateCount,unGenerateCount) { 675 open(hasGenerateCount,unGenerateCount) {
......
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
65 :rowspan="hs.sjcs" 65 :rowspan="hs.sjcs"
66 :colspan="hs.sjhs" 66 :colspan="hs.sjhs"
67 :data-bsm="hs.bsm" 67 :data-bsm="hs.bsm"
68 :data-qszt="hs.qszt"
68 ref="hBsm" 69 ref="hBsm"
69 :key="hsIndex" 70 :key="hsIndex"
70 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 71 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
...@@ -126,6 +127,7 @@ ...@@ -126,6 +127,7 @@
126 :rowspan="hs.sjcs" 127 :rowspan="hs.sjcs"
127 :colspan="hs.sjhs" 128 :colspan="hs.sjhs"
128 :data-bsm="hs.bsm" 129 :data-bsm="hs.bsm"
130 :data-qszt="hs.qszt"
129 ref="hBsm" 131 ref="hBsm"
130 :key="hsIndex" 132 :key="hsIndex"
131 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 133 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
...@@ -199,6 +201,7 @@ ...@@ -199,6 +201,7 @@
199 :rowspan="hs.sjcs" 201 :rowspan="hs.sjcs"
200 :colspan="hs.sjhs" 202 :colspan="hs.sjhs"
201 :data-bsm="hs.bsm" 203 :data-bsm="hs.bsm"
204 :data-qszt="hs.qszt"
202 ref="hBsm" 205 ref="hBsm"
203 :key="hsIndex" 206 :key="hsIndex"
204 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 207 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
...@@ -253,6 +256,7 @@ ...@@ -253,6 +256,7 @@
253 :rowspan="hs.sjcs" 256 :rowspan="hs.sjcs"
254 :colspan="hs.sjhs" 257 :colspan="hs.sjhs"
255 :data-bsm="hs.bsm" 258 :data-bsm="hs.bsm"
259 :data-qszt="hs.qszt"
256 ref="hBsm" 260 ref="hBsm"
257 :key="hsIndex" 261 :key="hsIndex"
258 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''" 262 :class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
...@@ -425,6 +429,7 @@ export default { ...@@ -425,6 +429,7 @@ export default {
425 loading: true, 429 loading: true,
426 hbsm:'', 430 hbsm:'',
427 hbsmList: [], 431 hbsmList: [],
432 hqsztList:[],
428 cbsmList: [], 433 cbsmList: [],
429 time: null, //区分单双击事件的定时器 434 time: null, //区分单双击事件的定时器
430 searchNum: Math.random(), 435 searchNum: Math.random(),
...@@ -495,6 +500,9 @@ export default { ...@@ -495,6 +500,9 @@ export default {
495 if(actual){ 500 if(actual){
496 this.lpbData = res.result == null ? this.yclpbData : res.result; 501 this.lpbData = res.result == null ? this.yclpbData : res.result;
497 } 502 }
503 if (this.lpbParent == 'isFwsxbg') {
504 this.lpbData = this.$parent.scyclx == '0' ? this.yclpbData:this.sclpbData;
505 }
498 this.$nextTick(() => { 506 this.$nextTick(() => {
499 //渲染楼盘表 507 //渲染楼盘表
500 this.dataChange(); 508 this.dataChange();
...@@ -516,11 +524,17 @@ export default { ...@@ -516,11 +524,17 @@ export default {
516 }, 524 },
517 //按照bdcdyh或shbw筛选户 525 //按照bdcdyh或shbw筛选户
518 lpbDataMap(sh) { 526 lpbDataMap(sh) {
519 //清除之前选中户
520 this.clearChoosedH();
521 this.searchNum = sh; 527 this.searchNum = sh;
528 if (this.hbsmList.length>0) {
529 //清除之前选中户
530 this.clearChoosedH();
531 }
522 // console.log("查询searchNum" + searchNum); 532 // console.log("查询searchNum" + searchNum);
523 }, 533 },
534 //接收范围属性变更传入的hbsm
535 getFwsxbgHbsm(bsm){
536 this.hbsmList.push(bsm);
537 },
524 //自然幢下元素高度宽度计算 538 //自然幢下元素高度宽度计算
525 dataChange() { 539 dataChange() {
526 //计算逻辑幢宽度 20为marginRight值 540 //计算逻辑幢宽度 20为marginRight值
...@@ -619,6 +633,7 @@ export default { ...@@ -619,6 +633,7 @@ export default {
619 //未选中→选中 633 //未选中→选中
620 e.className = "tdSelect"; //加边框 634 e.className = "tdSelect"; //加边框
621 this.hbsmList.push(bsm); // 将户bsm放进hbsmList 635 this.hbsmList.push(bsm); // 将户bsm放进hbsmList
636 this.hqsztList.push(hs.qszt); // 将户qszt放进hqsztList
622 switch (this.lpbParent) { 637 switch (this.lpbParent) {
623 case 'isHbfg': 638 case 'isHbfg':
624 this.fghbChoosedList.push(hs); 639 this.fghbChoosedList.push(hs);
...@@ -631,6 +646,7 @@ export default { ...@@ -631,6 +646,7 @@ export default {
631 break; 646 break;
632 case 'isLpb': 647 case 'isLpb':
633 this.$parent.getHbsm(this.hbsmList, false); 648 this.$parent.getHbsm(this.hbsmList, false);
649 this.$parent.getQsztList(this.hqsztList, false);
634 break; 650 break;
635 651
636 default: 652 default:
...@@ -651,7 +667,9 @@ export default { ...@@ -651,7 +667,9 @@ export default {
651 break; 667 break;
652 case 'isLpb': 668 case 'isLpb':
653 this.hbsmList = this.hbsmList.filter(i=>i!=bsm); 669 this.hbsmList = this.hbsmList.filter(i=>i!=bsm);
670 this.hqsztList = this.hqsztList.filter(i=>i!=hs.qszt);
654 this.$parent.getHbsm(this.hbsmList, false); 671 this.$parent.getHbsm(this.hbsmList, false);
672 this.$parent.getQsztList(this.hqsztList, false);
655 break; 673 break;
656 674
657 default: 675 default:
...@@ -695,6 +713,7 @@ export default { ...@@ -695,6 +713,7 @@ export default {
695 }); 713 });
696 // 清空hbsmList 714 // 清空hbsmList
697 this.hbsmList = []; 715 this.hbsmList = [];
716 this.hqsztList = [];
698 // }); 717 // });
699 }, 718 },
700 //户右键点击事件 719 //户右键点击事件
...@@ -743,9 +762,12 @@ export default { ...@@ -743,9 +762,12 @@ export default {
743 } 762 }
744 break; 763 break;
745 case 'isFwsxbg': 764 case 'isFwsxbg':
746 console.log(item,'item'); 765 if (this.hbsmList[0] == item.bsm) {
747 this.rightClickFlag = 'fwsxbg'; 766 this.rightClickFlag = 'fwsxbg';
748 this.lpbChVisible = true; 767 this.lpbChVisible = true;
768 }else{
769 this.lpbChVisible = false;
770 }
749 break; 771 break;
750 case 'isCxlz': 772 case 'isCxlz':
751 this.rightClickFlag = 'cxlz'; 773 this.rightClickFlag = 'cxlz';
...@@ -774,7 +796,7 @@ export default { ...@@ -774,7 +796,7 @@ export default {
774 if (e.target.className.indexOf("tdSelect") == -1) { 796 if (e.target.className.indexOf("tdSelect") == -1) {
775 //未选中→选中 797 //未选中→选中
776 e.target.className += " tdSelect"; //加边框 798 e.target.className += " tdSelect"; //加边框
777 this.cbsmList.push(item.bsm); // 将户bsm放进hbsmList 799 this.cbsmList.push(item.bsm);
778 } else { 800 } else {
779 //选中→未选中 801 //选中→未选中
780 e.target.className = "floor"; 802 e.target.className = "floor";
...@@ -965,35 +987,39 @@ export default { ...@@ -965,35 +987,39 @@ export default {
965 this.$refs.hBsm.forEach((item) => { 987 this.$refs.hBsm.forEach((item) => {
966 item.className = "tdSelect"; 988 item.className = "tdSelect";
967 this.hbsmList.push(item.dataset.bsm); // 将户bsm放进hbsmList 989 this.hbsmList.push(item.dataset.bsm); // 将户bsm放进hbsmList
990 this.hqsztList.push(item.dataset.qszt)
968 }); 991 });
969 }else{ 992 }else{
970 this.$refs.hBsm.forEach((item) => { 993 this.$refs.hBsm.forEach((item) => {
971 item.className = ""; 994 item.className = "";
972 this.hbsmList = []; 995 this.hbsmList = [];
996 this.hqsztList = [];
973 }); 997 });
974 } 998 }
975 this.$nextTick(()=>{ 999 this.$nextTick(()=>{
976 this.$parent.getHbsm(this.hbsmList, false); 1000 this.$parent.getHbsm(this.hbsmList, false);
1001 this.$parent.getQsztList(this.hqsztList, false);
977 }) 1002 })
978 }, 1003 },
979 //幢单元全选 1004 //幢单元全选
980 zdySelectAll(val,cs){ 1005 zdySelectAll(val,cs){
981 let zdyHbsmList = []; 1006 let zdyHbsmList = [];
1007 let zdyHqsztList = [];
982 cs.forEach(i=>{ 1008 cs.forEach(i=>{
983 i.hs.forEach(j=>{ 1009 i.hs.forEach(j=>{
984 zdyHbsmList.push(j.bsm) 1010 zdyHbsmList.push(j.bsm)
1011 zdyHqsztList.push(j.qszt)
985 }) 1012 })
986 }); 1013 });
987 if (val) { 1014 if (val) {
988 this.$nextTick(()=>{ 1015 this.$nextTick(()=>{
989 console.log(zdyHbsmList);
990 this.$refs.hBsm.forEach((item) => { 1016 this.$refs.hBsm.forEach((item) => {
991 console.log(item.dataset.bsm);
992 if (zdyHbsmList.indexOf(item.dataset.bsm)>-1) { 1017 if (zdyHbsmList.indexOf(item.dataset.bsm)>-1) {
993 item.className = "tdSelect"; 1018 item.className = "tdSelect";
994 this.hbsmList = zdyHbsmList; // 将户bsm放进hbsmList
995 } 1019 }
996 }); 1020 });
1021 this.hbsmList = this.hbsmList.concat(zdyHbsmList);
1022 this.hqsztList = this.hqsztList.concat(zdyHqsztList);
997 }) 1023 })
998 }else{ 1024 }else{
999 this.$refs.hBsm.forEach((item) => { 1025 this.$refs.hBsm.forEach((item) => {
...@@ -1006,10 +1032,16 @@ export default { ...@@ -1006,10 +1032,16 @@ export default {
1006 this.hbsmList = this.hbsmList.filter(i=>i!=j) 1032 this.hbsmList = this.hbsmList.filter(i=>i!=j)
1007 } 1033 }
1008 }) 1034 })
1035 zdyHqsztList.forEach(j=>{
1036 if (item.dataset.qszt == j) {
1037 this.hqsztList = this.hqsztList.filter(i=>i!=j)
1038 }
1039 })
1009 }); 1040 });
1010 } 1041 }
1011 this.$nextTick(()=>{ 1042 this.$nextTick(()=>{
1012 this.$parent.getHbsm(this.hbsmList, false); 1043 this.$parent.getHbsm(this.hbsmList, false);
1044 this.$parent.getQsztList(this.hqsztList, false);
1013 }) 1045 })
1014 }, 1046 },
1015 //逻辑幢、幢单元、层双击 1047 //逻辑幢、幢单元、层双击
...@@ -1056,7 +1088,8 @@ export default { ...@@ -1056,7 +1088,8 @@ export default {
1056 console.log(item.dataset.bsm, "item.dataset.bsm"); 1088 console.log(item.dataset.bsm, "item.dataset.bsm");
1057 // 判断hbsmList中是否已经存在 1089 // 判断hbsmList中是否已经存在
1058 if (this.hbsmList.indexOf(item.dataset.bsm) == -1) { 1090 if (this.hbsmList.indexOf(item.dataset.bsm) == -1) {
1059 this.hbsmList.push(item.dataset.bsm); // 将户bsm放进hbsmList 1091 this.hbsmList.push(item.dataset.bsm);
1092 this.hqsztList.push(item.dataset.qszt);
1060 } 1093 }
1061 } 1094 }
1062 }); 1095 });
...@@ -1167,9 +1200,6 @@ export default { ...@@ -1167,9 +1200,6 @@ export default {
1167 margin-right: 0; 1200 margin-right: 0;
1168 } 1201 }
1169 } 1202 }
1170 .bottom40 {
1171 // margin-bottom: -30px;
1172 }
1173 .zdy-wrap { 1203 .zdy-wrap {
1174 height: auto; 1204 height: auto;
1175 overflow: hidden; 1205 overflow: hidden;
......