Merge branch 'dev'
Showing
5 changed files
with
34 additions
and
46 deletions
1 | <!-- | 1 | <!-- |
2 | * @Description: | 2 | * @Description: |
3 | * @Autor: renchao | 3 | * @Autor: renchao |
4 | * @LastEditTime: 2023-11-02 13:39:28 | 4 | * @LastEditTime: 2023-12-20 17:31:14 |
5 | --> | 5 | --> |
6 | <template> | 6 | <template> |
7 | <div class="tableBox"> | 7 | <div class="tableBox"> |
... | @@ -74,7 +74,7 @@ | ... | @@ -74,7 +74,7 @@ |
74 | <el-link v-if="['zxywh', 'ywh'].includes(item.prop)" | 74 | <el-link v-if="['zxywh', 'ywh'].includes(item.prop)" |
75 | @click="handleSelectYwh(row, row[item.prop])" | 75 | @click="handleSelectYwh(row, row[item.prop])" |
76 | type="primary">{{ row[item.prop] }}</el-link> | 76 | type="primary">{{ row[item.prop] }}</el-link> |
77 | <span v-if="!['qszt','ywh', 'zxywh' ].includes(item.prop)">{{ getLable(item.prop,row[item.prop]) }}</span> | 77 | <span v-if="!['qszt','ywh', 'zxywh'].includes(item.prop)">{{ getLable(item.prop,row[item.prop]) }}</span> |
78 | </p> | 78 | </p> |
79 | 79 | ||
80 | <el-tooltip | 80 | <el-tooltip |
... | @@ -138,6 +138,9 @@ | ... | @@ -138,6 +138,9 @@ |
138 | render: false, | 138 | render: false, |
139 | }; | 139 | }; |
140 | }, | 140 | }, |
141 | mounted () { | ||
142 | console.log(this.columns); | ||
143 | }, | ||
141 | methods: { | 144 | methods: { |
142 | getLable (prop, label) { | 145 | getLable (prop, label) { |
143 | const ztObj = { | 146 | const ztObj = { | ... | ... |
... | @@ -4,7 +4,7 @@ class data extends filter { | ... | @@ -4,7 +4,7 @@ class data extends filter { |
4 | constructor() { | 4 | constructor() { |
5 | super() | 5 | super() |
6 | } | 6 | } |
7 | columns() { | 7 | columns () { |
8 | return { | 8 | return { |
9 | //空列值个数 | 9 | //空列值个数 |
10 | emptycolNum: 3, | 10 | emptycolNum: 3, |
... | @@ -200,21 +200,13 @@ class data extends filter { | ... | @@ -200,21 +200,13 @@ class data extends filter { |
200 | label: "权利性质", | 200 | label: "权利性质", |
201 | }, | 201 | }, |
202 | { | 202 | { |
203 | prop: "ytmc", | 203 | prop: "qlytmc", |
204 | label: "土地用途", | 204 | label: "土地用途", |
205 | }, | 205 | }, |
206 | { | 206 | { |
207 | prop: "syqqzsj", | 207 | prop: "syqqzsj", |
208 | label: "使用权起止时间", | 208 | label: "使用权起止时间", |
209 | }, | 209 | }, |
210 | // { | ||
211 | // prop: "syqjssj", | ||
212 | // label: "使用权结束时间", | ||
213 | // }, | ||
214 | // { | ||
215 | // prop: "tdsyqx", | ||
216 | // label: "土地使用期限", | ||
217 | // }, | ||
218 | { | 210 | { |
219 | prop: "tdsyqx", | 211 | prop: "tdsyqx", |
220 | label: "土地使用期限", | 212 | label: "土地使用期限", |
... | @@ -242,7 +234,7 @@ class data extends filter { | ... | @@ -242,7 +234,7 @@ class data extends filter { |
242 | { | 234 | { |
243 | prop: "fj", | 235 | prop: "fj", |
244 | label: "附记", | 236 | label: "附记", |
245 | }, | 237 | } |
246 | ], | 238 | ], |
247 | FDCQ1: [ | 239 | FDCQ1: [ |
248 | { | 240 | { | ... | ... |
... | @@ -80,7 +80,7 @@ class data extends filter { | ... | @@ -80,7 +80,7 @@ class data extends filter { |
80 | { | 80 | { |
81 | prop: "qlrzjhm", | 81 | prop: "qlrzjhm", |
82 | label: "证件号", | 82 | label: "证件号", |
83 | }, | 83 | }, |
84 | { | 84 | { |
85 | prop: "ytmc", | 85 | prop: "ytmc", |
86 | label: "土地用途", | 86 | label: "土地用途", |
... | @@ -192,7 +192,7 @@ class data extends filter { | ... | @@ -192,7 +192,7 @@ class data extends filter { |
192 | label: "证件号", | 192 | label: "证件号", |
193 | }, | 193 | }, |
194 | { | 194 | { |
195 | prop: "mjmc", | 195 | prop: "qlmjmc", |
196 | label: "使用权面积", | 196 | label: "使用权面积", |
197 | }, | 197 | }, |
198 | { | 198 | { |
... | @@ -200,21 +200,13 @@ class data extends filter { | ... | @@ -200,21 +200,13 @@ class data extends filter { |
200 | label: "权利性质", | 200 | label: "权利性质", |
201 | }, | 201 | }, |
202 | { | 202 | { |
203 | prop: "ytmc", | 203 | prop: "qlytmc", |
204 | label: "土地用途", | 204 | label: "土地用途", |
205 | }, | 205 | }, |
206 | { | 206 | { |
207 | prop: "syqqzsj", | 207 | prop: "syqqzsj", |
208 | label: "使用权起止时间", | 208 | label: "使用权起止时间", |
209 | }, | 209 | }, |
210 | // { | ||
211 | // prop: "syqjssj", | ||
212 | // label: "使用权结束时间", | ||
213 | // }, | ||
214 | // { | ||
215 | // prop: "tdsyqx", | ||
216 | // label: "土地使用期限", | ||
217 | // }, | ||
218 | { | 210 | { |
219 | prop: "tdsyqx", | 211 | prop: "tdsyqx", |
220 | label: "土地使用期限", | 212 | label: "土地使用期限", |
... | @@ -357,20 +349,20 @@ class data extends filter { | ... | @@ -357,20 +349,20 @@ class data extends filter { |
357 | { | 349 | { |
358 | prop: "sjyt", | 350 | prop: "sjyt", |
359 | label: "实际用途", | 351 | label: "实际用途", |
360 | },{ | 352 | }, { |
361 | prop: "fwjg", | 353 | prop: "fwjg", |
362 | label: "房屋结构", | 354 | label: "房屋结构", |
363 | },{ | 355 | }, { |
364 | prop: "fwjgmc", | 356 | prop: "fwjgmc", |
365 | label: "房屋结构名称", | 357 | label: "房屋结构名称", |
366 | },{ | 358 | }, { |
367 | prop: "jzmj", | 359 | prop: "jzmj", |
368 | label: "建筑面积", | 360 | label: "建筑面积", |
369 | }, | 361 | }, |
370 | { | 362 | { |
371 | prop: "jgsj", | 363 | prop: "jgsj", |
372 | label: "竣工时间", | 364 | label: "竣工时间", |
373 | },{ | 365 | }, { |
374 | prop: "zts", | 366 | prop: "zts", |
375 | label: "总套数", | 367 | label: "总套数", |
376 | }, | 368 | }, |
... | @@ -471,7 +463,7 @@ class data extends filter { | ... | @@ -471,7 +463,7 @@ class data extends filter { |
471 | { | 463 | { |
472 | prop: "tdsyqzsj", | 464 | prop: "tdsyqzsj", |
473 | label: "使用权起止时间", | 465 | label: "使用权起止时间", |
474 | }, | 466 | }, |
475 | { | 467 | { |
476 | prop: "qdjgmc", | 468 | prop: "qdjgmc", |
477 | label: "房地产交易价格", | 469 | label: "房地产交易价格", |
... | @@ -679,13 +671,13 @@ class data extends filter { | ... | @@ -679,13 +671,13 @@ class data extends filter { |
679 | render: (h, scope) => { | 671 | render: (h, scope) => { |
680 | return ( | 672 | return ( |
681 | <div> | 673 | <div> |
682 | <span v-show={scope.row.dybdclx == '1'}>土地</span> | 674 | <span v-show={scope.row.dybdclx == '1'}>土地</span> |
683 | <span v-show={scope.row.dybdclx == '2'}>土地和房屋</span> | 675 | <span v-show={scope.row.dybdclx == '2'}>土地和房屋</span> |
684 | <span v-show={scope.row.dybdclx == '3'}>林地和林木</span> | 676 | <span v-show={scope.row.dybdclx == '3'}>林地和林木</span> |
685 | <span v-show={scope.row.dybdclx == '4'}>土地和在建建筑物</span> | 677 | <span v-show={scope.row.dybdclx == '4'}>土地和在建建筑物</span> |
686 | <span v-show={scope.row.dybdclx == '5'}>海域</span> | 678 | <span v-show={scope.row.dybdclx == '5'}>海域</span> |
687 | <span v-show={scope.row.dybdclx == '6'}>海域和构筑物</span> | 679 | <span v-show={scope.row.dybdclx == '6'}>海域和构筑物</span> |
688 | <span v-show={scope.row.dybdclx == '7'}>其它</span> | 680 | <span v-show={scope.row.dybdclx == '7'}>其它</span> |
689 | </div> | 681 | </div> |
690 | ) | 682 | ) |
691 | } | 683 | } |
... | @@ -995,7 +987,7 @@ class data extends filter { | ... | @@ -995,7 +987,7 @@ class data extends filter { |
995 | { | 987 | { |
996 | prop: "ytmc", | 988 | prop: "ytmc", |
997 | label: "房屋用途", | 989 | label: "房屋用途", |
998 | }, | 990 | }, |
999 | { | 991 | { |
1000 | prop: "szc", | 992 | prop: "szc", |
1001 | label: "所在层", | 993 | label: "所在层", |
... | @@ -1019,7 +1011,7 @@ class data extends filter { | ... | @@ -1019,7 +1011,7 @@ class data extends filter { |
1019 | { | 1011 | { |
1020 | prop: "qdjg", | 1012 | prop: "qdjg", |
1021 | label: "取得价格/被担保主债权数额", | 1013 | label: "取得价格/被担保主债权数额", |
1022 | }, | 1014 | }, |
1023 | { | 1015 | { |
1024 | prop: "dbfw", | 1016 | prop: "dbfw", |
1025 | label: "担保范围", | 1017 | label: "担保范围", |
... | @@ -1286,7 +1278,7 @@ class data extends filter { | ... | @@ -1286,7 +1278,7 @@ class data extends filter { |
1286 | { | 1278 | { |
1287 | prop: "gyqk", | 1279 | prop: "gyqk", |
1288 | label: "共有情况", | 1280 | label: "共有情况", |
1289 | }, | 1281 | }, |
1290 | { | 1282 | { |
1291 | prop: "sllmsyq1", | 1283 | prop: "sllmsyq1", |
1292 | label: "森林林木所有权人", | 1284 | label: "森林林木所有权人", | ... | ... |
... | @@ -43,13 +43,11 @@ | ... | @@ -43,13 +43,11 @@ |
43 | }, | 43 | }, |
44 | printItem: "", | 44 | printItem: "", |
45 | printList: { | 45 | printList: { |
46 | |||
47 | }, | 46 | }, |
48 | } | 47 | } |
49 | }, | 48 | }, |
50 | mounted () { | 49 | mounted () { |
51 | sendThis(this); | 50 | sendThis(this); |
52 | this.fetchData() | ||
53 | }, | 51 | }, |
54 | computed: { | 52 | computed: { |
55 | ...mapGetters(['isRefresh']) | 53 | ...mapGetters(['isRefresh']) |
... | @@ -57,18 +55,21 @@ | ... | @@ -57,18 +55,21 @@ |
57 | watch: { | 55 | watch: { |
58 | isRefresh: { | 56 | isRefresh: { |
59 | handler (newVal, oldVal) { | 57 | handler (newVal, oldVal) { |
60 | if (newVal) this.fetchData() | 58 | if (newVal) this.queryClick() |
61 | }, | 59 | }, |
62 | immediate: true | 60 | immediate: true |
63 | } | 61 | } |
64 | }, | 62 | }, |
63 | activated () { | ||
64 | this.queryClick() | ||
65 | }, | ||
65 | methods: { | 66 | methods: { |
66 | /** | 67 | /** |
67 | * @description: fetchData | 68 | * @description: queryClick |
68 | * @author: renchao | 69 | * @author: renchao |
69 | */ | 70 | */ |
70 | fetchData () { | 71 | queryClick () { |
71 | selectPrintTemplateList({ ...this.pageData }).then(res => { | 72 | selectPrintTemplateList(this.pageData).then(res => { |
72 | if (res.code == 200) { | 73 | if (res.code == 200) { |
73 | let { total, records } = res.result | 74 | let { total, records } = res.result |
74 | this.tableData.total = total ? total : 0 | 75 | this.tableData.total = total ? total : 0 | ... | ... |
-
Please register or sign in to post a comment