Merge remote-tracking branch 'origin/master'
Showing
14 changed files
with
229 additions
and
64 deletions
... | @@ -302,4 +302,19 @@ ol, ul { list-style:none; } | ... | @@ -302,4 +302,19 @@ ol, ul { list-style:none; } |
302 | //表格操作按钮字体大小 | 302 | //表格操作按钮字体大小 |
303 | .iconbanli,.icondingwei{ | 303 | .iconbanli,.icondingwei{ |
304 | font-size: 18px; | 304 | font-size: 18px; |
305 | } | ||
306 | //实预测转换按钮样式 | ||
307 | /deep/.el-radio-button__inner { | ||
308 | border: 1px solid #3fa2e1!important; | ||
309 | color: #3fa2e1; | ||
310 | } | ||
311 | /deep/.el-radio-button__inner:hover { | ||
312 | color: #3fa2e1; | ||
313 | } | ||
314 | /deep/.is-active .el-radio-button__inner { | ||
315 | color: #fff; | ||
316 | } | ||
317 | /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner { | ||
318 | background-color: #3fa2e1; | ||
319 | border-color: #3fa2e1; | ||
305 | } | 320 | } |
... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
... | @@ -716,7 +716,7 @@ | ... | @@ -716,7 +716,7 @@ |
716 | this.getDyztBsmList(); | 716 | this.getDyztBsmList(); |
717 | this.getLpbFwytAndQlxz(); | 717 | this.getLpbFwytAndQlxz(); |
718 | this.$nextTick(()=>{ | 718 | this.$nextTick(()=>{ |
719 | this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6; | 719 | this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 54; |
720 | this.$refs.lpbContent.lpbDataMap(this.bdcdyh); | 720 | this.$refs.lpbContent.lpbDataMap(this.bdcdyh); |
721 | this.$refs.lpbContent.hbsmList.push(this.hbsm) | 721 | this.$refs.lpbContent.hbsmList.push(this.hbsm) |
722 | }) | 722 | }) |
... | @@ -745,7 +745,6 @@ | ... | @@ -745,7 +745,6 @@ |
745 | padding:20px; | 745 | padding:20px; |
746 | //background-color: #eaedf5; | 746 | //background-color: #eaedf5; |
747 | background-color: rgb(245, 250, 254); | 747 | background-color: rgb(245, 250, 254); |
748 | |||
749 | .box{ | 748 | .box{ |
750 | background-color: white; | 749 | background-color: white; |
751 | padding: 10px 0; | 750 | padding: 10px 0; |
... | @@ -787,7 +786,7 @@ | ... | @@ -787,7 +786,7 @@ |
787 | margin-top: 20px; | 786 | margin-top: 20px; |
788 | background-color: #ffffff; | 787 | background-color: #ffffff; |
789 | display: flex; | 788 | display: flex; |
790 | overflow-y: scroll; | 789 | border: 1px solid #E6E6E6; |
791 | .lp-overview { | 790 | .lp-overview { |
792 | transition: 0.5s; | 791 | transition: 0.5s; |
793 | flex: 1; | 792 | flex: 1; |
... | @@ -824,6 +823,7 @@ | ... | @@ -824,6 +823,7 @@ |
824 | .fwyt { | 823 | .fwyt { |
825 | cursor: pointer; | 824 | cursor: pointer; |
826 | border-bottom: 1px solid #e6e6e6; | 825 | border-bottom: 1px solid #e6e6e6; |
826 | border-left: 1px solid #e6e6e6; | ||
827 | span { | 827 | span { |
828 | text-align: center; | 828 | text-align: center; |
829 | height: 100%; | 829 | height: 100%; | ... | ... |
... | @@ -39,10 +39,10 @@ | ... | @@ -39,10 +39,10 @@ |
39 | <span class="qsztFont" style="color: red; ">临</span> | 39 | <span class="qsztFont" style="color: red; ">临</span> |
40 | </span> | 40 | </span> |
41 | <span class="qsztImg" v-if="item.qszt=='1'" > | 41 | <span class="qsztImg" v-if="item.qszt=='1'" > |
42 | <span class="qsztFont" style="color: #00FF00; ">正</span> | 42 | <span class="qsztFont" style="color: #1AD6E1; ">正</span> |
43 | </span> | 43 | </span> |
44 | <span class="qsztImg" v-if="item.qszt=='2'" > | 44 | <span class="qsztImg" v-if="item.qszt=='2'" > |
45 | <span class="qsztFont" style="color: blue; ">现</span> | 45 | <span class="qsztFont" style="color: #45AEFD; ">现</span> |
46 | </span> | 46 | </span> |
47 | </template> | 47 | </template> |
48 | 48 | ... | ... |
... | @@ -19,7 +19,16 @@ | ... | @@ -19,7 +19,16 @@ |
19 | export default { | 19 | export default { |
20 | name:"", | 20 | name:"", |
21 | components:{}, | 21 | components:{}, |
22 | props:{}, | 22 | props:{ |
23 | bsm: { | ||
24 | type: String, | ||
25 | default: "", | ||
26 | }, | ||
27 | type: { | ||
28 | type: String, | ||
29 | default: "", | ||
30 | }, | ||
31 | }, | ||
23 | data(){ | 32 | data(){ |
24 | insertCss(` | 33 | insertCss(` |
25 | .g6-tooltip { | 34 | .g6-tooltip { |
... | @@ -189,8 +198,8 @@ export default { | ... | @@ -189,8 +198,8 @@ export default { |
189 | getLshsData(){ | 198 | getLshsData(){ |
190 | let _this = this; | 199 | let _this = this; |
191 | const data = { | 200 | const data = { |
192 | "bsm": this.$store.state.zdbsm, | 201 | "bsm": this.bsm, |
193 | "type": "zd" | 202 | "type": this.type |
194 | }; | 203 | }; |
195 | getLshs(data).then((res)=>{ | 204 | getLshs(data).then((res)=>{ |
196 | if(res.code===200){ | 205 | if(res.code===200){ | ... | ... |
... | @@ -3,7 +3,7 @@ | ... | @@ -3,7 +3,7 @@ |
3 | <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" > | 3 | <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" > |
4 | <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane> | 4 | <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane> |
5 | <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl"></fjcl></el-tab-pane> | 5 | <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl"></fjcl></el-tab-pane> |
6 | <el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane> | 6 | <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane> |
7 | <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> | 7 | <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> |
8 | 8 | ||
9 | </el-tabs> | 9 | </el-tabs> |
... | @@ -27,6 +27,8 @@ | ... | @@ -27,6 +27,8 @@ |
27 | isDisabled:false, | 27 | isDisabled:false, |
28 | activeName: "dzxx", | 28 | activeName: "dzxx", |
29 | dzJbxxVisble:true, | 29 | dzJbxxVisble:true, |
30 | lshsVisible:false, | ||
31 | type:'dz', | ||
30 | fjclVisible:false | 32 | fjclVisible:false |
31 | }; | 33 | }; |
32 | }, | 34 | }, | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="lshs-content"> | 2 | <div class="lshs-content"> |
3 | <Lshs></Lshs> | 3 | <Lshs :type="type" :bsm="bsm"></Lshs> |
4 | </div> | 4 | </div> |
5 | </template> | 5 | </template> |
6 | 6 | ||
... | @@ -11,7 +11,16 @@ | ... | @@ -11,7 +11,16 @@ |
11 | export default { | 11 | export default { |
12 | name:"", | 12 | name:"", |
13 | components:{Lshs}, | 13 | components:{Lshs}, |
14 | props:{}, | 14 | props:{ |
15 | bsm: { | ||
16 | type: String, | ||
17 | default: "", | ||
18 | }, | ||
19 | type: { | ||
20 | type: String, | ||
21 | default: "", | ||
22 | }, | ||
23 | }, | ||
15 | data(){ | 24 | data(){ |
16 | return { | 25 | return { |
17 | data : {} | 26 | data : {} | ... | ... |
... | @@ -345,7 +345,9 @@ export default { | ... | @@ -345,7 +345,9 @@ export default { |
345 | this.tableHeight = | 345 | this.tableHeight = |
346 | (document.documentElement.clientHeight || | 346 | (document.documentElement.clientHeight || |
347 | document.body.clientHeight) - 332; | 347 | document.body.clientHeight) - 332; |
348 | this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 220; | 348 | this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 220; |
349 | console.log((document.documentElement.clientWidth || document.body.clientWidth) ,'(document.documentElement.clientWidth || document.body.clientWidth) '); | ||
350 | this.lpbContentwidth = (document.documentElement.clientWidth || document.body.clientWidth) - 380; | ||
349 | }); | 351 | }); |
350 | }, | 352 | }, |
351 | methods: { | 353 | methods: { |
... | @@ -540,7 +542,7 @@ export default { | ... | @@ -540,7 +542,7 @@ export default { |
540 | this.getDyztBsmList(); | 542 | this.getDyztBsmList(); |
541 | this.getLpbFwytAndQlxz(); | 543 | this.getLpbFwytAndQlxz(); |
542 | this.$nextTick(()=>{ | 544 | this.$nextTick(()=>{ |
543 | this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6; | 545 | this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 54; |
544 | }) | 546 | }) |
545 | } | 547 | } |
546 | }, | 548 | }, |
... | @@ -551,6 +553,9 @@ export default { | ... | @@ -551,6 +553,9 @@ export default { |
551 | selectedZt(n){ | 553 | selectedZt(n){ |
552 | this.legendToggleFlag = true; | 554 | this.legendToggleFlag = true; |
553 | }, | 555 | }, |
556 | lpbContentwidth(n){ | ||
557 | console.log(n,'lpbContentwidth'); | ||
558 | } | ||
554 | }, | 559 | }, |
555 | }; | 560 | }; |
556 | </script> | 561 | </script> |
... | @@ -668,16 +673,16 @@ table:hover { | ... | @@ -668,16 +673,16 @@ table:hover { |
668 | .lpb{ | 673 | .lpb{ |
669 | box-sizing: border-box; | 674 | box-sizing: border-box; |
670 | padding-left: 2px; | 675 | padding-left: 2px; |
671 | .searchInput { | 676 | .searchInput { |
672 | transition: 0.5s; | 677 | transition: 0.5s; |
673 | margin-left: 20px; | 678 | margin-left: 20px; |
674 | display: inline-block; | 679 | display: inline-block; |
675 | } | 680 | } |
676 | .lpb-content{ | 681 | .lpb-content{ |
677 | margin-top: 20px; | 682 | margin-top: 20px; |
678 | background-color: #ffffff; | 683 | background-color: #ffffff; |
679 | display: flex; | 684 | display: flex; |
680 | overflow-y: scroll; | 685 | border: 1px solid #E6E6E6; |
681 | .lp-overview { | 686 | .lp-overview { |
682 | transition: 0.5s; | 687 | transition: 0.5s; |
683 | flex: 1; | 688 | flex: 1; |
... | @@ -714,6 +719,7 @@ table:hover { | ... | @@ -714,6 +719,7 @@ table:hover { |
714 | .fwyt { | 719 | .fwyt { |
715 | cursor: pointer; | 720 | cursor: pointer; |
716 | border-bottom: 1px solid #e6e6e6; | 721 | border-bottom: 1px solid #e6e6e6; |
722 | border-left: 1px solid #e6e6e6; | ||
717 | span { | 723 | span { |
718 | text-align: center; | 724 | text-align: center; |
719 | height: 100%; | 725 | height: 100%; | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="main"> | 2 | <div class="main1"> |
3 | <el-row v-show="isSearch"> | 3 | <el-row v-show="isSearch"> |
4 | <el-col :span="24"> | 4 | <el-col :span="24"> |
5 | <el-form :inline="true" class="demo-form-inline"> | 5 | <el-form :inline="true" class="demo-form-inline"> |
... | @@ -531,6 +531,7 @@ export default { | ... | @@ -531,6 +531,7 @@ export default { |
531 | if (!n) { | 531 | if (!n) { |
532 | this.getDyztBsmList(); | 532 | this.getDyztBsmList(); |
533 | this.getLpbFwytAndQlxz(); | 533 | this.getLpbFwytAndQlxz(); |
534 | this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 54; | ||
534 | // console.log(this.$refs.lpbContentWrap.clientWidth,'lpbContentWrap'); | 535 | // console.log(this.$refs.lpbContentWrap.clientWidth,'lpbContentWrap'); |
535 | // this.$nextTick(()=>{ | 536 | // this.$nextTick(()=>{ |
536 | // this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6; | 537 | // this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6; |
... | @@ -548,7 +549,12 @@ export default { | ... | @@ -548,7 +549,12 @@ export default { |
548 | } | 549 | } |
549 | </script> | 550 | </script> |
550 | <style scoped lang="less"> | 551 | <style scoped lang="less"> |
551 | .main{ | 552 | .main1{ |
553 | width: 100%; | ||
554 | height: 100%; | ||
555 | -webkit-box-sizing: border-box; | ||
556 | box-sizing: border-box; | ||
557 | padding: 20px; | ||
552 | .el-row{ | 558 | .el-row{ |
553 | box-sizing: border-box; | 559 | box-sizing: border-box; |
554 | padding-left: 2px; | 560 | padding-left: 2px; |
... | @@ -560,6 +566,7 @@ export default { | ... | @@ -560,6 +566,7 @@ export default { |
560 | .lpb{ | 566 | .lpb{ |
561 | box-sizing: border-box; | 567 | box-sizing: border-box; |
562 | padding-left: 2px; | 568 | padding-left: 2px; |
569 | |||
563 | .searchInput { | 570 | .searchInput { |
564 | transition: 0.5s; | 571 | transition: 0.5s; |
565 | margin-left: 20px; | 572 | margin-left: 20px; |
... | @@ -569,7 +576,7 @@ export default { | ... | @@ -569,7 +576,7 @@ export default { |
569 | margin-top: 20px; | 576 | margin-top: 20px; |
570 | background-color: #ffffff; | 577 | background-color: #ffffff; |
571 | display: flex; | 578 | display: flex; |
572 | overflow-y: scroll; | 579 | border: 1px solid #E6E6E6; |
573 | .lp-overview { | 580 | .lp-overview { |
574 | transition: 0.5s; | 581 | transition: 0.5s; |
575 | flex: 1; | 582 | flex: 1; |
... | @@ -606,6 +613,7 @@ export default { | ... | @@ -606,6 +613,7 @@ export default { |
606 | .fwyt { | 613 | .fwyt { |
607 | cursor: pointer; | 614 | cursor: pointer; |
608 | border-bottom: 1px solid #e6e6e6; | 615 | border-bottom: 1px solid #e6e6e6; |
616 | border-left: 1px solid #e6e6e6; | ||
609 | span { | 617 | span { |
610 | text-align: center; | 618 | text-align: center; |
611 | height: 100%; | 619 | height: 100%; | ... | ... |
... | @@ -10,7 +10,7 @@ | ... | @@ -10,7 +10,7 @@ |
10 | <jzx v-if="jzxVisible" :is-disabled="isDisabled"></jzx> | 10 | <jzx v-if="jzxVisible" :is-disabled="isDisabled"></jzx> |
11 | </el-tab-pane> | 11 | </el-tab-pane> |
12 | <el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane> | 12 | <el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane> |
13 | <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane> | 13 | <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane> |
14 | <el-tab-pane label="附件材料" name="fjcl"> | 14 | <el-tab-pane label="附件材料" name="fjcl"> |
15 | <fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane> | 15 | <fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane> |
16 | </el-tabs> | 16 | </el-tabs> |
... | @@ -42,6 +42,7 @@ export default { | ... | @@ -42,6 +42,7 @@ export default { |
42 | djbVisible:false, | 42 | djbVisible:false, |
43 | lshsVisible:false, | 43 | lshsVisible:false, |
44 | fjclVisible:false, | 44 | fjclVisible:false, |
45 | type:'zd' | ||
45 | }; | 46 | }; |
46 | }, | 47 | }, |
47 | methods: { | 48 | methods: { | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="lshs-content"> | 2 | <div class="lshs-content"> |
3 | <Lshs></Lshs> | 3 | <Lshs :type="type" :bsm="bsm"></Lshs> |
4 | </div> | 4 | </div> |
5 | </template> | 5 | </template> |
6 | 6 | ||
... | @@ -11,7 +11,16 @@ | ... | @@ -11,7 +11,16 @@ |
11 | export default { | 11 | export default { |
12 | name:"", | 12 | name:"", |
13 | components:{Lshs}, | 13 | components:{Lshs}, |
14 | props:{}, | 14 | props:{ |
15 | bsm: { | ||
16 | type: String, | ||
17 | default: "", | ||
18 | }, | ||
19 | type: { | ||
20 | type: String, | ||
21 | default: "", | ||
22 | }, | ||
23 | }, | ||
15 | data(){ | 24 | data(){ |
16 | return { | 25 | return { |
17 | data : {} | 26 | data : {} | ... | ... |
... | @@ -5,7 +5,7 @@ | ... | @@ -5,7 +5,7 @@ |
5 | <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad" :is-disabled="isDisabled"></yzgy></el-tab-pane> | 5 | <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad" :is-disabled="isDisabled"></yzgy></el-tab-pane> |
6 | <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> | 6 | <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> |
7 | <el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane> | 7 | <el-tab-pane label="楼盘表" name="lpb"><lpb v-if="lpbLoad"></lpb></el-tab-pane> |
8 | <el-tab-pane label="历史回溯" name="lshs"><lshs></lshs></el-tab-pane> | 8 | <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane> |
9 | <el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane> | 9 | <el-tab-pane label="附件材料" name="fjcl"><fjcl ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane> |
10 | </el-tabs> | 10 | </el-tabs> |
11 | </div> | 11 | </div> |
... | @@ -31,6 +31,8 @@ export default { | ... | @@ -31,6 +31,8 @@ export default { |
31 | activeName: "zrzxx", | 31 | activeName: "zrzxx", |
32 | lpbLoad:false, //默认不加载楼盘表组件 | 32 | lpbLoad:false, //默认不加载楼盘表组件 |
33 | yzgyLoad:false, | 33 | yzgyLoad:false, |
34 | lshsVisible:false, | ||
35 | type:'zrz', | ||
34 | }; | 36 | }; |
35 | }, | 37 | }, |
36 | methods: { | 38 | methods: { |
... | @@ -52,6 +54,9 @@ export default { | ... | @@ -52,6 +54,9 @@ export default { |
52 | if(!this.yzgyLoad){ | 54 | if(!this.yzgyLoad){ |
53 | this.yzgyLoad = tab.name == 'yzgy' ? true : false | 55 | this.yzgyLoad = tab.name == 'yzgy' ? true : false |
54 | } | 56 | } |
57 | if(tab.name === 'lshs'){ | ||
58 | this.lshsVisible = true; | ||
59 | } | ||
55 | }, | 60 | }, |
56 | }, | 61 | }, |
57 | created() {}, | 62 | created() {}, | ... | ... |
... | @@ -871,20 +871,6 @@ export default { | ... | @@ -871,20 +871,6 @@ export default { |
871 | margin-left: 62px; | 871 | margin-left: 62px; |
872 | box-sizing: border-box; | 872 | box-sizing: border-box; |
873 | padding: 0 20px; | 873 | padding: 0 20px; |
874 | /deep/.el-radio-button__inner { | ||
875 | border: 1px solid #00cacd; | ||
876 | color: #00cacd; | ||
877 | } | ||
878 | /deep/.el-radio-button__inner:hover { | ||
879 | color: #00cacd; | ||
880 | } | ||
881 | /deep/.is-active .el-radio-button__inner { | ||
882 | color: #fff; | ||
883 | } | ||
884 | /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner { | ||
885 | background-color: #00cacd; | ||
886 | border-color: #00cacd; | ||
887 | } | ||
888 | .searchInput { | 874 | .searchInput { |
889 | transition: 0.5s; | 875 | transition: 0.5s; |
890 | margin-left: 20px; | 876 | margin-left: 20px; |
... | @@ -979,6 +965,7 @@ export default { | ... | @@ -979,6 +965,7 @@ export default { |
979 | .fwyt { | 965 | .fwyt { |
980 | cursor: pointer; | 966 | cursor: pointer; |
981 | border-bottom: 1px solid #e6e6e6; | 967 | border-bottom: 1px solid #e6e6e6; |
968 | border-left: 1px solid #e6e6e6; | ||
982 | span { | 969 | span { |
983 | text-align: center; | 970 | text-align: center; |
984 | height: 100%; | 971 | height: 100%; | ... | ... |
... | @@ -17,7 +17,7 @@ | ... | @@ -17,7 +17,7 @@ |
17 | <tr height="30"> | 17 | <tr height="30"> |
18 | <td colspan="2" align="center">逻辑幢号</td> | 18 | <td colspan="2" align="center">逻辑幢号</td> |
19 | <td colspan="4"> | 19 | <td colspan="4"> |
20 | <el-input v-model="form.ljzh"></el-input> | 20 | <input class="formInput" ref="ljzh" @blur="inputBlur($event)" v-model="form.ljzh" /> |
21 | </td> | 21 | </td> |
22 | <td colspan="2" align="center">自然幢号</td> | 22 | <td colspan="2" align="center">自然幢号</td> |
23 | <td colspan="4"> | 23 | <td colspan="4"> |
... | @@ -25,9 +25,9 @@ | ... | @@ -25,9 +25,9 @@ |
25 | </td> | 25 | </td> |
26 | </tr> | 26 | </tr> |
27 | <tr height="30"> | 27 | <tr height="30"> |
28 | <td colspan="2" align="center">逻辑幢名称</td> | 28 | <td colspan="2" align="center">逻辑幢名称</td> |
29 | <td colspan="4"> | 29 | <td colspan="4"> |
30 | <el-input v-model="form.ljzmc"></el-input> | 30 | <input class="formInput" ref="ljzmc" @blur="inputBlur($event)" v-model="form.ljzmc" /> |
31 | </td> | 31 | </td> |
32 | <td colspan="2" align="center">建筑物状态</td> | 32 | <td colspan="2" align="center">建筑物状态</td> |
33 | <td colspan="4"> | 33 | <td colspan="4"> |
... | @@ -137,7 +137,7 @@ | ... | @@ -137,7 +137,7 @@ |
137 | </td> | 137 | </td> |
138 | <td colspan="9"> | 138 | <td colspan="9"> |
139 | <el-select-tree style="width:100%" | 139 | <el-select-tree style="width:100%" |
140 | ref="yt" | 140 | ref="fwjg" |
141 | v-if="show" | 141 | v-if="show" |
142 | :default-expand-all="defaultExpandAll" | 142 | :default-expand-all="defaultExpandAll" |
143 | :multiple="multiple" | 143 | :multiple="multiple" |
... | @@ -214,6 +214,8 @@ export default { | ... | @@ -214,6 +214,8 @@ export default { |
214 | label: 'mc' | 214 | label: 'mc' |
215 | }, | 215 | }, |
216 | 216 | ||
217 | rules:[], | ||
218 | |||
217 | form: { | 219 | form: { |
218 | zrzbsm: "", | 220 | zrzbsm: "", |
219 | ljzh: "", //逻辑幢号 | 221 | ljzh: "", //逻辑幢号 |
... | @@ -253,6 +255,16 @@ export default { | ... | @@ -253,6 +255,16 @@ export default { |
253 | }; | 255 | }; |
254 | }, | 256 | }, |
255 | methods: { | 257 | methods: { |
258 | |||
259 | inputBlur(e){ | ||
260 | if(e.target.value!=''){ | ||
261 | e.target.style.border="" | ||
262 | }else{ | ||
263 | e.target.style.border="1px solid red"; | ||
264 | e.target.style.boxSizing = 'border-box'; | ||
265 | } | ||
266 | }, | ||
267 | |||
256 | addYtInfo() { | 268 | addYtInfo() { |
257 | this.form.ytList.push({ | 269 | this.form.ytList.push({ |
258 | glbsm: "", | 270 | glbsm: "", |
... | @@ -330,30 +342,85 @@ export default { | ... | @@ -330,30 +342,85 @@ export default { |
330 | } | 342 | } |
331 | }, | 343 | }, |
332 | onSave(data, bsm) { | 344 | onSave(data, bsm) { |
345 | |||
346 | this.rules=[ | ||
347 | { | ||
348 | data:this.form.ljzh, | ||
349 | name:'自然幢号', | ||
350 | dom:this.$refs.ljzh, | ||
351 | rule: /^\s*$/g, //非空 | ||
352 | }, | ||
353 | { | ||
354 | data:this.form.ljzmc, | ||
355 | name:'不动产单元号', | ||
356 | dom:this.$refs.ljzmc, | ||
357 | rule: /^\s*$/g, //非空 | ||
358 | }, | ||
359 | ]; | ||
360 | this.form.ytList.forEach((item,index)=>{ | ||
361 | this.rules.push( | ||
362 | { | ||
363 | data:item.fwytzdbsm, | ||
364 | name:'用途', | ||
365 | dom:this.$refs.yt[index], | ||
366 | rule: /^\s*$/g, //非空 | ||
367 | }, | ||
368 | ) | ||
369 | }); | ||
370 | this.form.fwjgList.forEach((item,index)=>{ | ||
371 | this.rules.push( | ||
372 | { | ||
373 | data:item.fwjgzdbsm, | ||
374 | name:'房屋结构', | ||
375 | dom:this.$refs.fwjg[index], | ||
376 | rule: /^\s*$/g, //非空 | ||
377 | }, | ||
378 | ) | ||
379 | }); | ||
380 | |||
333 | //自然幢标识码 | 381 | //自然幢标识码 |
334 | this.form.zrzbsm = bsm; | 382 | this.form.zrzbsm = bsm; |
335 | if(this.ljzbsm == ''){ | 383 | let flag = true; |
336 | insertLjzInfo(this.form).then((res) => { | 384 | this.rules.forEach(item=>{ |
337 | if (res.code === 200) { | 385 | if(item.rule.test(item.data) || item.data == null){ |
338 | this.$message.success("保存成功"); | 386 | if(item.dom.$el){ |
339 | //更新树结构数据 | 387 | item.dom.$el.style.border = '1px solid red'; |
340 | console.log(this); | 388 | item.dom.$el.style.boxSizing = 'border-box'; |
341 | this.$parent.$parent.getLpbMenuTree(bsm); | ||
342 | //关闭弹框 | ||
343 | this.$parent.$parent.closeDaialog(); | ||
344 | }else{ | 389 | }else{ |
345 | this.$message.error(res.message); | 390 | item.dom.style.border = '1px solid red'; |
391 | item.dom.style.boxSizing = 'border-box'; | ||
346 | } | 392 | } |
347 | }); | 393 | flag = false; |
348 | }else{ | 394 | return false |
349 | //逻辑幢更新接口调用 TODO | 395 | } |
350 | console.log('保存'); | 396 | }) |
351 | updateQjLjz(this.form).then((res)=>{ | 397 | this.$nextTick(()=>{ |
352 | if(res.code === 200){ | 398 | if (flag && this.$refs.qlxzModule.getRulesResult()) { |
353 | this.$message.success("修改成功") | 399 | if(this.ljzbsm == ''){ |
400 | insertLjzInfo(this.form).then((res) => { | ||
401 | if (res.code === 200) { | ||
402 | this.$message.success("保存成功"); | ||
403 | //更新树结构数据 | ||
404 | console.log(this); | ||
405 | this.$parent.$parent.getLpbMenuTree(bsm); | ||
406 | //关闭弹框 | ||
407 | this.$parent.$parent.closeDaialog(); | ||
408 | }else{ | ||
409 | this.$message.error(res.message); | ||
410 | } | ||
411 | }); | ||
412 | }else{ | ||
413 | //逻辑幢更新接口调用 TODO | ||
414 | console.log('保存'); | ||
415 | updateQjLjz(this.form).then((res)=>{ | ||
416 | if(res.code === 200){ | ||
417 | this.$message.success("修改成功") | ||
418 | } | ||
419 | }) | ||
420 | } | ||
354 | } | 421 | } |
355 | }) | 422 | }) |
356 | } | 423 | |
357 | }, | 424 | }, |
358 | onSubmit() { | 425 | onSubmit() { |
359 | // console.log(this.form); | 426 | // console.log(this.form); |
... | @@ -411,6 +478,40 @@ export default { | ... | @@ -411,6 +478,40 @@ export default { |
411 | this.form.zrzh = this.$store.state.zrzh; | 478 | this.form.zrzh = this.$store.state.zrzh; |
412 | }, | 479 | }, |
413 | watch:{ | 480 | watch:{ |
481 | |||
482 | "form.ljzh":function (val) { | ||
483 | if (val != '') { | ||
484 | this.$refs.ljzh.style.border = ''; | ||
485 | } | ||
486 | }, | ||
487 | |||
488 | "form.ljzmc":function (val) { | ||
489 | if (val != '') { | ||
490 | this.$refs.ljzmc.style.border = ''; | ||
491 | } | ||
492 | }, | ||
493 | |||
494 | "form.ytList": { | ||
495 | handler : function (newVal, oldVal) { | ||
496 | newVal.forEach((item,ind)=>{ | ||
497 | if(item.fwytzdbsm != ''){ | ||
498 | this.$refs.yt[ind].$el.style.border="" | ||
499 | } | ||
500 | }) | ||
501 | }, | ||
502 | deep:true | ||
503 | }, | ||
504 | "form.fwjgList": { | ||
505 | handler : function (newVal, oldVal) { | ||
506 | newVal.forEach((item,ind)=>{ | ||
507 | if(item.fwjgzdbsm != ''){ | ||
508 | this.$refs.fwjg[ind].$el.style.border="" | ||
509 | } | ||
510 | }) | ||
511 | }, | ||
512 | deep:true | ||
513 | }, | ||
514 | |||
414 | ljzbsm: { | 515 | ljzbsm: { |
415 | handler: function (item) { | 516 | handler: function (item) { |
416 | console.log(item,'item'); | 517 | console.log(item,'item'); |
... | @@ -453,6 +554,7 @@ export default { | ... | @@ -453,6 +554,7 @@ export default { |
453 | //bgcolor:#F1F4FC; | 554 | //bgcolor:#F1F4FC; |
454 | background-color: #fff; | 555 | background-color: #fff; |
455 | width: 8.33%; | 556 | width: 8.33%; |
557 | height: 36px | ||
456 | } | 558 | } |
457 | 559 | ||
458 | .el-select { | 560 | .el-select { | ... | ... |
1 | <template> | 1 | <template> |
2 | <div class="">历史回溯</div> | 2 | <div class=""> |
3 | <Lshs :type="type" :bsm="bsm"></Lshs> | ||
4 | </div> | ||
3 | </template> | 5 | </template> |
4 | 6 | ||
5 | <script> | 7 | <script> |
8 | import Lshs from '@components/lshs/index'; | ||
6 | export default { | 9 | export default { |
7 | name:"", | 10 | name:"", |
8 | components:{}, | 11 | components:{Lshs}, |
9 | props:{}, | 12 | props:{ |
13 | bsm: { | ||
14 | type: String, | ||
15 | default: "", | ||
16 | }, | ||
17 | type: { | ||
18 | type: String, | ||
19 | default: "", | ||
20 | }, | ||
21 | }, | ||
10 | data(){ | 22 | data(){ |
11 | return { | 23 | return { |
12 | } | 24 | } | ... | ... |
-
Please register or sign in to post a comment