master
xy 1 year ago
parent 021af81fa2
commit a902480169

@ -2,107 +2,113 @@
<div style="padding: 20px;"> <div style="padding: 20px;">
<el-row :gutter="20"> <el-row :gutter="20">
<el-col :span="24"> <el-col :span="24">
<Card style="margin-bottom: 20px" :padding="20"> <Card style="margin-bottom: 20px">
<div class="card-title"> <el-row :gutter="20">
<div class="title-icon"> <el-col :span="12">
<i class="el-icon-s-claim"></i> <div class="card-title">
</div> <div class="title-icon">
<p>合同待办</p> <i class="el-icon-s-claim"></i>
</div>
<div <p>合同待办</p>
class="lease-status-switch"
:data-status="radio" <div
> class="lease-status-switch"
<div :data-status="radio"
v-for="(item, index) in status" >
:data-status="index" <div
:class="{ 'active-switch': radio === index }" v-for="(item, index) in status"
@click="radioPick(index)" :data-status="index"
> :class="{ 'active-switch': radio === index }"
<el-badge :value="statusTotal[index]" :max="99"> @click="radioPick(index)"
{{ item }} >
</el-badge> <el-badge :value="statusTotal[index]" :max="99">
{{ item }}
</el-badge>
</div>
</div>
<div class="lease-legend">
<div>土地</div>
<div>房产</div>
</div>
<div class="more" @click="$router.push('/lease')">
<Icon type="md-add" />
</div>
</div> </div>
</div>
<div class="lease-legend">
<div>土地</div>
<div>房产</div>
</div>
<div class="more" @click="$router.push('/lease')">
<Icon type="md-add" />
</div>
</div>
<div class="card-content">
<Table
:loading="leaseTableLoading"
size="small"
stripe
highlight-row
:height="300"
:data="leases"
:columns="leaseTable"
></Table>
<div class="page">
<Page
style="margin-top: 14px; display: flex; justify-content: flex-end"
size="small"
:current.sync="leaseSelect.page"
:total="leaseTotal"
show-elevator
show-total
:page-size="leaseSelect.page_size"
@on-change="getLeases"
></Page>
</div>
</div>
<div class="card-title" style="margin-top: 20px;">
<div class="title-icon">
<i class="el-icon-s-claim"></i>
</div>
<p>收租待办</p>
<div <div class="card-content">
class="lease-status-switch" <Table
:data-status="radio1" :loading="leaseTableLoading"
> size="small"
<div stripe
v-for="(item, index) in status" highlight-row
:data-status="index" :height="300"
:class="{ 'active-switch': radio1 === index }" :data="leases"
@click="radio1Pick(index)" :columns="leaseTable"
> ></Table>
<el-badge :value="statusTotal1[index]" :max="99"> <div class="page">
{{ item }} <Page
</el-badge> style="margin-top: 14px; display: flex; justify-content: flex-end"
size="small"
:current.sync="leaseSelect.page"
:total="leaseTotal"
show-elevator
show-total
:page-size="leaseSelect.page_size"
@on-change="getLeases"
></Page>
</div>
</div> </div>
</div> </el-col>
</div> <el-col :span="12">
<div class="card-content"> <div class="card-title">
<Table <div class="title-icon">
:loading="payTableLoading" <i class="el-icon-s-claim"></i>
size="small" </div>
stripe <p>收租待办</p>
highlight-row
:height="300" <div
:data="pays" class="lease-status-switch"
:columns="payTable" :data-status="radio1"
></Table> >
<div class="page"> <div
<Page v-for="(item, index) in status"
style="margin-top: 14px; display: flex; justify-content: flex-end" :data-status="index"
size="small" :class="{ 'active-switch': radio1 === index }"
:current.sync="paySelect.page" @click="radio1Pick(index)"
:total="payTotal" >
show-elevator <el-badge :value="statusTotal1[index]" :max="99">
show-total {{ item }}
:page-size="paySelect.page_size" </el-badge>
@on-change="getLeasePay" </div>
></Page> </div>
</div> </div>
</div> <div class="card-content">
<Table
:loading="payTableLoading"
size="small"
stripe
highlight-row
:height="300"
:data="pays"
:columns="payTable"
></Table>
<div class="page">
<Page
style="margin-top: 14px; display: flex; justify-content: flex-end"
size="small"
:current.sync="paySelect.page"
:total="payTotal"
show-elevator
show-total
:page-size="paySelect.page_size"
@on-change="getLeasePay"
></Page>
</div>
</div>
</el-col>
</el-row>
</Card> </Card>
</el-col> </el-col>

@ -174,7 +174,7 @@ export default {
const workbook = XLSX.read(data, { type: 'array', cellDates: true, defval: "" }); const workbook = XLSX.read(data, { type: 'array', cellDates: true, defval: "" });
const worksheet = workbook.Sheets[workbook.SheetNames[0]]; const worksheet = workbook.Sheets[workbook.SheetNames[0]];
const merges = Array.from(new Set(worksheet['!merges'].map(i => JSON.stringify({ rs: i.s.r-2 , re: i.e.r-2 })))).map(JSON.parse) const merges = Array.from(new Set(worksheet['!merges']?.map(i => JSON.stringify({ rs: i.s.r-2 , re: i.e.r-2 })))).map(JSON.parse)
const jsonData = XLSX.utils.sheet_to_json(worksheet, { header: 1, defval: "" }); const jsonData = XLSX.utils.sheet_to_json(worksheet, { header: 1, defval: "" });
const headers = jsonData.splice(0, 1)[0] const headers = jsonData.splice(0, 1)[0]
const list = jsonData.slice(1) const list = jsonData.slice(1)

@ -666,12 +666,12 @@ export default {
this.table.unshift( { this.table.unshift( {
label: "资产", label: "资产",
prop: 'assets', prop: 'assets',
width: 300, width: 320,
align: 'left', align: 'left',
customFn: row => { customFn: row => {
let tags = row.id_leases_to_assets_lease_id_relation?.slice(0,1)?.map(i => { let tags = row.id_leases_to_assets_lease_id_relation?.slice(0,1)?.map(i => {
let asset = i.house_id ? row.houses.find(j => j.id === i.house_id) : row.land.find(j => j.id === i.land_id) let asset = i.house_id ? row.houses.find(j => j.id === i.house_id) : row.land.find(j => j.id === i.land_id)
return (<Tag color="success" style="background: rgb(65, 100, 227) !important;">{(i.land_id ? '【土地】' : '【房产】')+(asset?.name || i.name || " ")}</Tag>) return (<Tag color="success" style="background: rgb(65, 100, 227) !important;">{(i.land_id ? '【土地】' : '【房产】')+(asset?.name || i.name || " ")}-{ i.xiangxiweizhi }</Tag>)
}) })
return ( return (
@ -679,10 +679,12 @@ export default {
{ {
tags.slice(0, 1) tags.slice(0, 1)
} }
<br></br>
<el-popover title="资产" width={600}> <el-popover title="资产" width={600}>
<el-link slot="reference" <el-link slot="reference"
type="primary" type="primary"
style={{ style={{
"font-size": "13px",
"word-break": "keep-all", "word-break": "keep-all",
display: tags.length > 0 ? "inline" : "none", display: tags.length > 0 ? "inline" : "none",
}}>更多</el-link> }}>更多</el-link>

Loading…
Cancel
Save