master
xy 1 year ago
parent 23cc11ca43
commit a18fac0ca2

@ -47,7 +47,6 @@
:height="300" :height="300"
:data="leases" :data="leases"
:columns="leaseTable" :columns="leaseTable"
@on-row-dblclick="leaseRowDbclick"
></Table> ></Table>
<div class="page"> <div class="page">
<Page <Page
@ -96,7 +95,6 @@
:height="300" :height="300"
:data="pays" :data="pays"
:columns="payTable" :columns="payTable"
@on-row-dblclick="leasePlanDbclick"
></Table> ></Table>
<div class="page"> <div class="page">
<Page <Page
@ -287,7 +285,7 @@ export default {
title: "序号", title: "序号",
fixed: "left", fixed: "left",
align: "center", align: "center",
width: 60, width: 62,
render: (h, { row, column, index }) => { render: (h, { row, column, index }) => {
return h( return h(
"div", "div",
@ -395,6 +393,24 @@ export default {
render: (h, { row }) => { render: (h, { row }) => {
return h('div',`${row.department ? ('【' + row.department.name + '】') : ''}${row.admin ? row.admin.name : ''}`) return h('div',`${row.department ? ('【' + row.department.name + '】') : ''}${row.admin ? row.admin.name : ''}`)
} }
},
{
key: 'operate',
title: '操作',
width: 82,
align: 'center',
fixed: 'right',
render: (h, { row }) => h('Button', {
props: {
size: 'small',
type: 'primary'
},
on: {
click: _ => {
this.leasePlanDbclick(row)
}
}
}, '查看')
} }
], ],
@ -450,170 +466,58 @@ export default {
{ {
title: "资产名称", title: "资产名称",
key: "dikuaimingcheng", key: "dikuaimingcheng",
minWidth: 220, minWidth: 240,
fixed: "left", fixed: "left",
align: "left", align: "left",
render: (h, { row }) => { render: (h, { row }) => {
let tags = row.id_leases_to_assets_lease_id_relation?.map(item => { let tags = row.id_leases_to_assets_lease_id_relation?.map(item => {
if (item.land_id) { if (item.land_id) {
let land = row.land?.find(j => j.id === item.land_id) let land = row.land?.find(j => j.id === item.land_id)
return h('el-popover',{ return h(
props: { "Tag",
width: 240, {
trigger: 'hover', slot: 'reference',
placement: 'top' props: {
} type: "border",
},[ color: "#3fa45a",
h(
"Tag",
{
slot: 'reference',
props: {
type: "dot",
color: "#3fa45a",
},
style: {
background: "#e5f4ea !important",
},
}, },
land.name style: {
), background: "#e5f4ea !important",
h("div",{ },
slot: 'default' },
}, [ land.name
h('div', [ )
h('span',{
style: {
'font-weight': '500'
}
}, '资产名称:'),
h('span', land.name||item.name||'无')
]),
h('div', [
h('span', {
style: {
'font-weight': '500'
}
},'详细位置:'),
h('span', item.xiangxiweizhi||'无')
]),
h('div', [
h('span', {
style: {
'font-weight': '500'
}
},'出租面积:'),
h('span', item.chuzumianji||'0')
])
])
])
} else if (item.house_id) { } else if (item.house_id) {
let house = row.houses?.find(j => j.id === item.house_id) let house = row.houses?.find(j => j.id === item.house_id)
return h("el-popover",{ return h(
props: { "Tag",
width: 240, {
trigger: "hover", slot: "reference",
placement: 'top' props: {
} type: "border",
},[ color: "#2254e4",
h(
"Tag",
{
slot: "reference",
props: {
type: "dot",
color: "#2254e4",
},
style: {
background: "#e8edfc !important",
},
}, },
(house.name||'无') style: {
), background: "#e8edfc !important",
h("div",{ },
slot: 'default' },
},[ (house.name||'无')
h('div', [ )
h('span',{
style: {
'font-weight': '500'
}
}, '资产名称:'),
h('span', house.name||item.name||'无')
]),
h('div', [
h('span', {
style: {
'font-weight': '500'
}
},'详细位置:'),
h('span', item.xiangxiweizhi||'无')
]),
h('div', [
h('span', {
style: {
'font-weight': '500'
}
},'出租面积:'),
h('span', item.chuzumianji||'0')
])
])
])
} else { } else {
return h("el-popover",{ return h(
props: { "Tag",
width: 240, {
trigger: "hover", slot: "reference",
placement: 'top' props: {
} type: "border",
},[ color: "#6c3fa4",
h(
"Tag",
{
slot: "reference",
props: {
type: "dot",
color: "#6c3fa4",
},
style: {
background: "#b78cea !important",
},
}, },
item.name || "" style: {
), background: "#b78cea !important",
h(
"div",
{
slot: "default"
}, },
[ },
h('div', [ item.name || "无"
h('span',{ )
style: {
'font-weight': '500'
}
}, '资产名称:'),
h('span', item.name||'无')
]),
h('div', [
h('span', {
style: {
'font-weight': '500'
}
},'详细位置:'),
h('span', item.xiangxiweizhi||'无')
]),
h('div', [
h('span', {
style: {
'font-weight': '500'
}
},'出租面积:'),
h('span', item.chuzumianji||'0')
])
]
),
])
} }
}) })
@ -719,6 +623,24 @@ export default {
render: (h, { row }) => { render: (h, { row }) => {
return h('div',`${row.department ? ('【' + row.department.name + '】') : ''}${row.admin ? row.admin.name : ''}`) return h('div',`${row.department ? ('【' + row.department.name + '】') : ''}${row.admin ? row.admin.name : ''}`)
} }
},
{
key: 'operate',
title: '操作',
width: 82,
align: 'center',
fixed: 'right',
render: (h, { row }) => h('Button', {
props: {
size: 'small',
type: 'primary'
},
on: {
click: _ => {
this.leaseRowDbclick(row)
}
}
}, '查看')
} }
], ],
systemSelect: { systemSelect: {

Loading…
Cancel
Save