22dc8f67 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents 3b594f12 bf309e08
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 10
11 <template> 11 <template>
12 <div :class="['lb-table', customClass]"> 12 <div :class="['lb-table', customClass]">
13 <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: '50px' }" ref="elTable" :border='border' 13 <el-table v-if="!heightNumSetting" class="table-fixed" :row-style="{ height: '45px' }" ref="elTable" :border='border'
14 :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs" 14 :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs"
15 :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%" 15 :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
16 :span-method="this.merge ? this.mergeMethod : this.spanMethod"> 16 :span-method="this.merge ? this.mergeMethod : this.spanMethod">
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
24 </lb-column> 24 </lb-column>
25 </el-table> 25 </el-table>
26 26
27 <el-table v-else ref="elTable" class="table-fixed heightNumSetting" :row-style="{ height: '50px' }" 27 <el-table v-else ref="elTable" class="table-fixed heightNumSetting" :row-style="{ height: '45px' }"
28 :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs" 28 :border='border' :row-class-name="tableRowClassName" :show-header='showHeader' @row-click="singleElection" v-bind="$attrs"
29 :max-height="maxHeight" :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%" 29 :max-height="maxHeight" :height="tableHeight" v-on="$listeners" :data="data" style="width: 100%"
30 :span-method="this.merge ? this.mergeMethod : this.spanMethod"> 30 :span-method="this.merge ? this.mergeMethod : this.spanMethod">
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-15 10:03:39 4 * @LastEditTime: 2023-11-15 16:18:58
5 */ 5 */
6 import Vue from 'vue' 6 import Vue from 'vue'
7 import App from './App' 7 import App from './App'
...@@ -55,7 +55,7 @@ import 'quill/dist/quill.bubble.css' ...@@ -55,7 +55,7 @@ import 'quill/dist/quill.bubble.css'
55 Vue.use(VueQuillEditor) 55 Vue.use(VueQuillEditor)
56 56
57 import * as filters from './filters' // global filters 57 import * as filters from './filters' // global filters
58 Vue.use(Element, { size: 'mini', zIndex: 1000 }) 58 Vue.use(Element, { size: 'small', zIndex: 1000 })
59 Vue.use(Base) 59 Vue.use(Base)
60 Object.keys(filters).forEach(key => { 60 Object.keys(filters).forEach(key => {
61 Vue.filter(key, filters[key]) 61 Vue.filter(key, filters[key])
......
...@@ -271,12 +271,3 @@ ...@@ -271,12 +271,3 @@
271 .el-form-item--mini.el-form-item { 271 .el-form-item--mini.el-form-item {
272 margin-bottom: 10px; 272 margin-bottom: 10px;
273 } 273 }
...\ No newline at end of file ...\ No newline at end of file
274
275 .vue-treeselect__control {
276 height: 28px !important;
277 }
278
279 .vue-treeselect__placeholder,
280 .vue-treeselect__single-value {
281 line-height: 28px !important;
282 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
101 border-bottom: 1px solid $borderColor; 101 border-bottom: 1px solid $borderColor;
102 padding-left: 10px; 102 padding-left: 10px;
103 padding-bottom: 5px; 103 padding-bottom: 5px;
104 margin-bottom: 10px; 104 margin-bottom: 5px;
105 margin-top: 5px; 105 margin-top: 5px;
106 font-size: 16px; 106 font-size: 16px;
107 font-weight: 500; 107 font-weight: 500;
......
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 border-bottom: 1px solid $borderColor; 47 border-bottom: 1px solid $borderColor;
48 padding-left: 10px; 48 padding-left: 10px;
49 padding-bottom: 5px; 49 padding-bottom: 5px;
50 margin-bottom: 10px; 50 margin-bottom: 5px;
51 margin-top: 5px; 51 margin-top: 5px;
52 font-size: 16px; 52 font-size: 16px;
53 font-weight: 500; 53 font-weight: 500;
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-11-03 14:48:37 4 * @LastEditTime: 2023-11-15 15:47:29
5 --> 5 -->
6 <template> 6 <template>
7 <!-- 受理信息 --> 7 <!-- 受理信息 -->
...@@ -749,17 +749,6 @@ ...@@ -749,17 +749,6 @@
749 height: 50px; 749 height: 50px;
750 } 750 }
751 751
752 .slxx_title {
753 border-bottom: 1px solid $borderColor;
754 padding-left: 10px;
755 padding-bottom: 5px;
756 margin-bottom: 10px;
757 margin-top: 5px;
758 font-size: 16px;
759 font-weight: 500;
760 color: #4a4a4a;
761 }
762
763 .btn { 752 .btn {
764 text-align: center; 753 text-align: center;
765 padding-top: 10px; 754 padding-top: 10px;
......
1 <template> 1 <template>
2 <div class="jtfccx-edit"> 2 <div class="jtfccx-edit" style="margin-top:-5px">
3 <div class="jtfccx-edit-con"> 3 <div class="jtfccx-edit-con">
4 <b class="title">申请信息</b> 4 <b class="title">申请信息</b>
5 <el-form :model="form" label-width="120px"> 5 <el-form :model="form" label-width="120px">
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
28 <b class="title">权利人</b> 28 <b class="title">权利人</b>
29 <el-table 29 <el-table
30 :data="form.qlrList" 30 :data="form.qlrList"
31 height="160" 31 height="130"
32 border 32 border
33 :cell-style="{ textAlign: 'center' }" 33 :cell-style="{ textAlign: 'center' }"
34 :header-cell-style="{textAlign: 'center'}" 34 :header-cell-style="{textAlign: 'center'}"
...@@ -323,7 +323,6 @@ ...@@ -323,7 +323,6 @@
323 } 323 }
324 }, 324 },
325 methods: { 325 methods: {
326 // 字典
327 /** 326 /**
328 * @description: 字典 327 * @description: 字典
329 * @param {*} val 328 * @param {*} val
...@@ -362,7 +361,6 @@ ...@@ -362,7 +361,6 @@
362 } 361 }
363 }); 362 });
364 }, 363 },
365 //查询结果
366 /** 364 /**
367 * @description: 查询结果 365 * @description: 查询结果
368 * @author: renchao 366 * @author: renchao
...@@ -378,7 +376,6 @@ ...@@ -378,7 +376,6 @@
378 } 376 }
379 }); 377 });
380 }, 378 },
381 //重置
382 /** 379 /**
383 * @description: 重置 380 * @description: 重置
384 * @author: renchao 381 * @author: renchao
...@@ -502,25 +499,24 @@ ...@@ -502,25 +499,24 @@
502 <style scoped lang="scss"> 499 <style scoped lang="scss">
503 @import "~@/styles/mixin.scss"; 500 @import "~@/styles/mixin.scss";
504 @import "~@/styles/public.scss"; 501 @import "~@/styles/public.scss";
505
506 .title { 502 .title {
507 padding-bottom: 10px; 503 padding-bottom: 5px;
508 margin-bottom: 10px; 504 margin-bottom: 5px;
509 display: block; 505 display: block;
510 border-bottom: 1px solid $borderColor; 506 border-bottom: 1px solid $borderColor;
511 } 507 }
512 508 .jtfccx-edit-con {
509 max-height: 80vh;
510 overflow-y: scroll;
511 }
513 .jtfccx-edit { 512 .jtfccx-edit {
514 @include flex; 513 @include flex;
515 flex-direction: column; 514 flex-direction: column;
516 overflow-y: hidden; 515 overflow-y: hidden;
517 max-height: 85vh;
518 padding: 0 2px; 516 padding: 0 2px;
519 517
520 .submit-button { 518 .submit-button {
521 text-align: center; 519 text-align: center;
522 height: 52px;
523 padding-top: 10px;
524 background-color: #fff; 520 background-color: #fff;
525 } 521 }
526 } 522 }
......
1 /* 1 /*
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-06-14 14:48:35 4 * @LastEditTime: 2023-11-15 16:29:28
5 */ 5 */
6 import filter from '@/utils/filter.js' 6 import filter from '@/utils/filter.js'
7 class data extends filter { 7 class data extends filter {
...@@ -16,7 +16,7 @@ class data extends filter { ...@@ -16,7 +16,7 @@ class data extends filter {
16 }, 16 },
17 { 17 {
18 prop: 'bdcqzh', 18 prop: 'bdcqzh',
19 width: '110', 19 width: 150,
20 label: '不动产权证号', 20 label: '不动产权证号',
21 }, 21 },
22 { 22 {
...@@ -33,7 +33,7 @@ class data extends filter { ...@@ -33,7 +33,7 @@ class data extends filter {
33 }, 33 },
34 { 34 {
35 prop: 'bdcdyh', 35 prop: 'bdcdyh',
36 width: '110', 36 width: 150,
37 label: '不动产单元号', 37 label: '不动产单元号',
38 }, 38 },
39 { 39 {
...@@ -47,14 +47,16 @@ class data extends filter { ...@@ -47,14 +47,16 @@ class data extends filter {
47 { 47 {
48 prop: 'zjhm', 48 prop: 'zjhm',
49 label: '证件号', 49 label: '证件号',
50 width: 120,
50 }, 51 },
51 { 52 {
52 prop: 'fdzl', 53 prop: 'fdzl',
54 width: 120,
53 label: '房地坐落', 55 label: '房地坐落',
54 }, 56 },
55 { 57 {
56 prop: 'fwmj', 58 prop: 'fwmj',
57 width: '120', 59 width: 120,
58 label: '建筑面积(㎡)', 60 label: '建筑面积(㎡)',
59 }, 61 },
60 { 62 {
......
1 <!-- 1 <!--
2 * @Description: 2 * @Description:
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-07-24 11:27:00 4 * @LastEditTime: 2023-11-15 16:28:13
5 --> 5 -->
6 <template> 6 <template>
7 <div class="from-clues"> 7 <div class="from-clues">
...@@ -106,7 +106,7 @@ ...@@ -106,7 +106,7 @@
106 handleAdd () { 106 handleAdd () {
107 this.$popupDialog("家庭房产查询", "sqcx/jtfc/components/addjtfc", { 107 this.$popupDialog("家庭房产查询", "sqcx/jtfc/components/addjtfc", {
108 sqcxBsm: '' 108 sqcxBsm: ''
109 }) 109 }, '80%')
110 }, 110 },
111 /** 111 /**
112 * @description: handleAdd 112 * @description: handleAdd
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
116 handleViewClick (row) { 116 handleViewClick (row) {
117 this.$popupDialog("家庭房产查询", "sqcx/jtfc/components/addjtfc", { 117 this.$popupDialog("家庭房产查询", "sqcx/jtfc/components/addjtfc", {
118 sqcxBsm: row.bsmSqcx 118 sqcxBsm: row.bsmSqcx
119 }) 119 }, '80%')
120 } 120 }
121 } 121 }
122 } 122 }
......
...@@ -100,20 +100,18 @@ ...@@ -100,20 +100,18 @@
100 </el-col> 100 </el-col>
101 </el-row> 101 </el-row>
102 <el-row> 102 <el-row>
103 <el-col>
104 <lb-table :column="dyjlcolumns" :data="form.dyjlList" :maxHeight="200" heightNumSetting :pagination="false"> 103 <lb-table :column="dyjlcolumns" :data="form.dyjlList" :maxHeight="200" heightNumSetting :pagination="false">
105 </lb-table> 104 </lb-table>
106 </el-col>
107 </el-row> 105 </el-row>
108 </el-form> 106 </el-form>
109 </div> 107 </div>
110 </template> 108 </template>
111 109
112 <script> 110 <script>
113 import { getJtfcInfo } from "@/api/jtfc.js"; 111 import { getJtfcInfo } from "@/api/jtfc.js";
114 import { datas, sendThis } from "./sqcxjlInfodata"; 112 import { datas, sendThis } from "./sqcxjlInfodata";
115 113
116 export default { 114 export default {
117 props: ["formData"], 115 props: ["formData"],
118 data () { 116 data () {
119 return { 117 return {
...@@ -161,12 +159,16 @@ export default { ...@@ -161,12 +159,16 @@ export default {
161 }); 159 });
162 }, 160 },
163 methods: {}, 161 methods: {},
164 }; 162 };
165 </script> 163 </script>
166 <style scoped lang="scss"> 164 <style scoped lang="scss">
167 @import "~@/styles/mixin.scss"; 165 @import "~@/styles/mixin.scss";
168 166
169 /deep/.el-form-item { 167 /deep/.el-form-item {
170 margin-bottom: 0 !important; 168 margin-bottom: 0 !important;
171 } 169 }
170 .sqcxjlInfo {
171 max-height: 85vh;
172 overflow-y: scroll;
173 }
172 </style> 174 </style>
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-09-25 15:11:12 4 * @LastEditTime: 2023-11-15 15:46:54
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -566,17 +566,6 @@ ...@@ -566,17 +566,6 @@
566 height: 50px; 566 height: 50px;
567 } 567 }
568 568
569 .slxx_title {
570 border-bottom: 1px solid $borderColor;
571 padding-left: 10px;
572 padding-bottom: 5px;
573 margin-bottom: 10px;
574 margin-top: 5px;
575 font-size: 16px;
576 font-weight: 500;
577 color: #4a4a4a;
578 }
579
580 .btn { 569 .btn {
581 text-align: center; 570 text-align: center;
582 padding-top: 10px; 571 padding-top: 10px;
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-10-10 13:42:57 4 * @LastEditTime: 2023-11-15 15:46:58
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -686,17 +686,6 @@ ...@@ -686,17 +686,6 @@
686 height: 50px; 686 height: 50px;
687 } 687 }
688 688
689 .slxx_title {
690 border-bottom: 1px solid $borderColor;
691 padding-left: 10px;
692 padding-bottom: 5px;
693 margin-bottom: 10px;
694 margin-top: 5px;
695 font-size: 16px;
696 font-weight: 500;
697 color: #4a4a4a;
698 }
699
700 .btn { 689 .btn {
701 text-align: center; 690 text-align: center;
702 padding-top: 10px; 691 padding-top: 10px;
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-20 13:32:47 4 * @LastEditTime: 2023-11-15 15:47:37
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -593,17 +593,6 @@ ...@@ -593,17 +593,6 @@
593 height: 50px; 593 height: 50px;
594 } 594 }
595 595
596 .slxx_title {
597 border-bottom: 1px solid $borderColor;
598 padding-left: 10px;
599 padding-bottom: 5px;
600 margin-bottom: 10px;
601 margin-top: 5px;
602 font-size: 16px;
603 font-weight: 500;
604 color: #4a4a4a;
605 }
606
607 .btn { 596 .btn {
608 text-align: center; 597 text-align: center;
609 padding-top: 10px; 598 padding-top: 10px;
......
1 <!-- 1 <!--
2 * @Description: 受理信息 2 * @Description: 受理信息
3 * @Autor: renchao 3 * @Autor: renchao
4 * @LastEditTime: 2023-09-20 13:41:15 4 * @LastEditTime: 2023-11-15 15:47:02
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -498,17 +498,6 @@ ...@@ -498,17 +498,6 @@
498 height: 50px; 498 height: 50px;
499 } 499 }
500 500
501 .slxx_title {
502 border-bottom: 1px solid $borderColor;
503 padding-left: 10px;
504 padding-bottom: 5px;
505 margin-bottom: 10px;
506 margin-top: 5px;
507 font-size: 16px;
508 font-weight: 500;
509 color: #4a4a4a;
510 }
511
512 .btn { 501 .btn {
513 text-align: center; 502 text-align: center;
514 padding-top: 10px; 503 padding-top: 10px;
......
...@@ -530,17 +530,6 @@ ...@@ -530,17 +530,6 @@
530 height: 50px; 530 height: 50px;
531 } 531 }
532 532
533 .slxx_title {
534 border-bottom: 1px solid $borderColor;
535 padding-left: 10px;
536 padding-bottom: 5px;
537 margin-bottom: 10px;
538 margin-top: 5px;
539 font-size: 16px;
540 font-weight: 500;
541 color: #4a4a4a;
542 }
543
544 .btn { 533 .btn {
545 text-align: center; 534 text-align: center;
546 padding-top: 10px; 535 padding-top: 10px;
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-09-20 14:25:52 4 * @LastEditTime: 2023-11-15 15:47:55
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -557,17 +557,6 @@ ...@@ -557,17 +557,6 @@
557 height: 50px; 557 height: 50px;
558 } 558 }
559 559
560 .slxx_title {
561 border-bottom: 1px solid $borderColor;
562 padding-left: 10px;
563 padding-bottom: 5px;
564 margin-bottom: 10px;
565 margin-top: 5px;
566 font-size: 16px;
567 font-weight: 500;
568 color: #4a4a4a;
569 }
570
571 .btn { 560 .btn {
572 text-align: center; 561 text-align: center;
573 padding-top: 10px; 562 padding-top: 10px;
......
1 <!-- 1 <!--
2 * @Description: 房屋多幢受理信息 2 * @Description: 房屋多幢受理信息
3 * @Autor: ssq 3 * @Autor: ssq
4 * @LastEditTime: 2023-09-20 14:23:42 4 * @LastEditTime: 2023-11-15 15:48:15
5 --> 5 -->
6 <template> 6 <template>
7 <div class="slxx"> 7 <div class="slxx">
...@@ -575,17 +575,6 @@ ...@@ -575,17 +575,6 @@
575 height: 50px; 575 height: 50px;
576 } 576 }
577 577
578 .slxx_title {
579 border-bottom: 1px solid $borderColor;
580 padding-left: 10px;
581 padding-bottom: 5px;
582 margin-bottom: 10px;
583 margin-top: 5px;
584 font-size: 16px;
585 font-weight: 500;
586 color: #4a4a4a;
587 }
588
589 .btn { 578 .btn {
590 text-align: center; 579 text-align: center;
591 padding-top: 10px; 580 padding-top: 10px;
......
...@@ -517,17 +517,6 @@ ...@@ -517,17 +517,6 @@
517 height: 50px; 517 height: 50px;
518 } 518 }
519 519
520 .slxx_title {
521 border-bottom: 1px solid $borderColor;
522 padding-left: 10px;
523 padding-bottom: 5px;
524 margin-bottom: 10px;
525 margin-top: 5px;
526 font-size: 16px;
527 font-weight: 500;
528 color: #4a4a4a;
529 }
530
531 .btn { 520 .btn {
532 text-align: center; 521 text-align: center;
533 padding-top: 10px; 522 padding-top: 10px;
......
...@@ -455,17 +455,6 @@ ...@@ -455,17 +455,6 @@
455 height: 50px; 455 height: 50px;
456 } 456 }
457 457
458 .slxx_title {
459 border-bottom: 1px solid $borderColor;
460 padding-left: 10px;
461 padding-bottom: 5px;
462 margin-bottom: 10px;
463 margin-top: 5px;
464 font-size: 16px;
465 font-weight: 500;
466 color: #4a4a4a;
467 }
468
469 .btn { 458 .btn {
470 text-align: center; 459 text-align: center;
471 padding-top: 10px; 460 padding-top: 10px;
......