d3d9b671 by renchao@pashanhoo.com

Merge branch 'dev'

2 parents c59b3c58 d3bb8a8d
<!--
* @Description:
* @Autor: renchao
* @LastEditTime: 2023-11-02 13:39:28
* @LastEditTime: 2023-12-20 17:31:14
-->
<template>
<div class="tableBox">
......@@ -74,7 +74,7 @@
<el-link v-if="['zxywh', 'ywh'].includes(item.prop)"
@click="handleSelectYwh(row, row[item.prop])"
type="primary">{{ row[item.prop] }}</el-link>
<span v-if="!['qszt','ywh', 'zxywh' ].includes(item.prop)">{{ getLable(item.prop,row[item.prop]) }}</span>
<span v-if="!['qszt','ywh', 'zxywh'].includes(item.prop)">{{ getLable(item.prop,row[item.prop]) }}</span>
</p>
<el-tooltip
......@@ -138,6 +138,9 @@
render: false,
};
},
mounted () {
console.log(this.columns);
},
methods: {
getLable (prop, label) {
const ztObj = {
......
......@@ -4,7 +4,7 @@ class data extends filter {
constructor() {
super()
}
columns() {
columns () {
return {
//空列值个数
emptycolNum: 3,
......@@ -200,21 +200,13 @@ class data extends filter {
label: "权利性质",
},
{
prop: "ytmc",
prop: "qlytmc",
label: "土地用途",
},
{
prop: "syqqzsj",
label: "使用权起止时间",
},
// {
// prop: "syqjssj",
// label: "使用权结束时间",
// },
// {
// prop: "tdsyqx",
// label: "土地使用期限",
// },
{
prop: "tdsyqx",
label: "土地使用期限",
......@@ -242,7 +234,7 @@ class data extends filter {
{
prop: "fj",
label: "附记",
},
}
],
FDCQ1: [
{
......
<!--
* @Description:
* @Autor: miaofang
* @LastEditTime: 2023-10-30 10:40:48
* @LastEditTime: 2023-12-20 17:20:23
-->
<template>
<div class="djxxTable">
......
......@@ -80,7 +80,7 @@ class data extends filter {
{
prop: "qlrzjhm",
label: "证件号",
},
},
{
prop: "ytmc",
label: "土地用途",
......@@ -192,7 +192,7 @@ class data extends filter {
label: "证件号",
},
{
prop: "mjmc",
prop: "qlmjmc",
label: "使用权面积",
},
{
......@@ -200,21 +200,13 @@ class data extends filter {
label: "权利性质",
},
{
prop: "ytmc",
prop: "qlytmc",
label: "土地用途",
},
{
prop: "syqqzsj",
label: "使用权起止时间",
},
// {
// prop: "syqjssj",
// label: "使用权结束时间",
// },
// {
// prop: "tdsyqx",
// label: "土地使用期限",
// },
{
prop: "tdsyqx",
label: "土地使用期限",
......@@ -357,20 +349,20 @@ class data extends filter {
{
prop: "sjyt",
label: "实际用途",
},{
}, {
prop: "fwjg",
label: "房屋结构",
},{
}, {
prop: "fwjgmc",
label: "房屋结构名称",
},{
}, {
prop: "jzmj",
label: "建筑面积",
},
{
prop: "jgsj",
label: "竣工时间",
},{
}, {
prop: "zts",
label: "总套数",
},
......@@ -471,7 +463,7 @@ class data extends filter {
{
prop: "tdsyqzsj",
label: "使用权起止时间",
},
},
{
prop: "qdjgmc",
label: "房地产交易价格",
......@@ -679,13 +671,13 @@ class data extends filter {
render: (h, scope) => {
return (
<div>
<span v-show={scope.row.dybdclx == '1'}>土地</span>
<span v-show={scope.row.dybdclx == '2'}>土地和房屋</span>
<span v-show={scope.row.dybdclx == '3'}>林地和林木</span>
<span v-show={scope.row.dybdclx == '4'}>土地和在建建筑物</span>
<span v-show={scope.row.dybdclx == '5'}>海域</span>
<span v-show={scope.row.dybdclx == '6'}>海域和构筑物</span>
<span v-show={scope.row.dybdclx == '7'}>其它</span>
<span v-show={scope.row.dybdclx == '1'}>土地</span>
<span v-show={scope.row.dybdclx == '2'}>土地和房屋</span>
<span v-show={scope.row.dybdclx == '3'}>林地和林木</span>
<span v-show={scope.row.dybdclx == '4'}>土地和在建建筑物</span>
<span v-show={scope.row.dybdclx == '5'}>海域</span>
<span v-show={scope.row.dybdclx == '6'}>海域和构筑物</span>
<span v-show={scope.row.dybdclx == '7'}>其它</span>
</div>
)
}
......@@ -995,7 +987,7 @@ class data extends filter {
{
prop: "ytmc",
label: "房屋用途",
},
},
{
prop: "szc",
label: "所在层",
......@@ -1019,7 +1011,7 @@ class data extends filter {
{
prop: "qdjg",
label: "取得价格/被担保主债权数额",
},
},
{
prop: "dbfw",
label: "担保范围",
......@@ -1286,7 +1278,7 @@ class data extends filter {
{
prop: "gyqk",
label: "共有情况",
},
},
{
prop: "sllmsyq1",
label: "森林林木所有权人",
......
......@@ -43,13 +43,11 @@
},
printItem: "",
printList: {
},
}
},
mounted () {
sendThis(this);
this.fetchData()
},
computed: {
...mapGetters(['isRefresh'])
......@@ -57,18 +55,21 @@
watch: {
isRefresh: {
handler (newVal, oldVal) {
if (newVal) this.fetchData()
if (newVal) this.queryClick()
},
immediate: true
}
},
activated () {
this.queryClick()
},
methods: {
/**
* @description: fetchData
* @description: queryClick
* @author: renchao
*/
fetchData () {
selectPrintTemplateList({ ...this.pageData }).then(res => {
queryClick () {
selectPrintTemplateList(this.pageData).then(res => {
if (res.code == 200) {
let { total, records } = res.result
this.tableData.total = total ? total : 0
......