From b77da6a838e6dd023e98949967d3ce8a58552922 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 29 十一月 2024 14:08:43 +0800
Subject: [PATCH] 开发更新
---
admin/src/views/finance/bull.vue | 130 ++++++++++++++++++++++++++++---------------
1 files changed, 84 insertions(+), 46 deletions(-)
diff --git a/admin/src/views/finance/bull.vue b/admin/src/views/finance/bull.vue
index 99cc8ed..936cc3c 100644
--- a/admin/src/views/finance/bull.vue
+++ b/admin/src/views/finance/bull.vue
@@ -3,29 +3,57 @@
<QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
<div class="df_sb mt20">
<div class="tabs">
- <div class="tab" :class="{ active: activeTabs == 0 }" @click="tabsClick(0)">鏀舵璐﹀崟</div>
- <div class="tab" :class="{ active: activeTabs == 1 }" @click="tabsClick(1)">浠樻璐﹀崟</div>
+ <div class="tab" :class="{ active: billType === 0 }" @click="tabsClick(0)">鏀舵璐﹀崟</div>
+ <div class="tab" :class="{ active: billType === 1 }" @click="tabsClick(1)">浠樻璐﹀崟</div>
</div>
<div class="btns">
- <el-button type="primary" @click="$refs.EditRef.open('鍒涘缓鏀舵璐﹀崟')" icon="el-icon-plus"
+ <el-button type="primary" @click="addOpen" icon="el-icon-plus"
v-permissions="['business:ywpatrolline:create']">鏂板缓</el-button>
<el-button @click="handleDetail" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
</div>
</div>
<el-table v-loading="loading" :data="list" stripe>
- <el-table-column prop="" label="瀹㈡埛鍚嶇О" min-width="100" show-overflow-tooltip />
- <el-table-column prop="code" label="妤煎畤鍚嶇О" min-width="100" show-overflow-tooltip />
- <el-table-column prop="name" label="鎴块棿鍙�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="stautsName" label="鍚堝悓缂栧彿" min-width="100" show-overflow-tooltip />
- <el-table-column prop="remark" label="缁撴竻鐘舵��" min-width="100" show-overflow-tooltip />
- <el-table-column prop="createTime" label="璐﹀崟閲戦" min-width="100" show-overflow-tooltip />
- <el-table-column prop="createTime" label="搴旀敹閲戦" min-width="100" show-overflow-tooltip />
- <el-table-column prop="createTime" label="瀹炴敹閲戦" min-width="100" show-overflow-tooltip />
- <el-table-column prop="createTime" label="闇�鏀堕噾棰�" min-width="100" show-overflow-tooltip />
- <el-table-column prop="createTime" label="璐圭敤绫诲瀷" min-width="100" show-overflow-tooltip />
- <el-table-column prop="createTime" label="鏄惁閫炬湡" min-width="100" show-overflow-tooltip />
- <el-table-column prop="createTime" label="璁¤垂鍛ㄦ湡" min-width="100" show-overflow-tooltip />
- <el-table-column prop="createTime" label="搴旀敹鏃ユ湡" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="customerName" label="瀹㈡埛鍚嶇О" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鎴块棿" min-width="170" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ <div style="display: flex; flex-direction: column;" v-if="row.roomPathName">
+ <span v-for="(item, index) in row.roomPathName.split(';')" :key="index">{{item}}</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="contractCode" label="鍚堝悓缂栧彿" min-width="100" show-overflow-tooltip />
+ <el-table-column label="缁撴竻鐘舵��" min-width="100" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ <span v-if="row.payStatus === 0">寰呮敹娆�</span>
+ <span v-if="row.payStatus === 1">宸茬粨娓�</span>
+ <span v-if="row.payStatus === 2">閮ㄥ垎缁撴竻</span>
+ <span v-if="row.payStatus === 3">寰呬粯娆�</span>
+ <span v-if="row.payStatus === 4">寰呴��娆�</span>
+ <span v-if="row.payStatus === 5">宸插叧闂�</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="totleFee" label="璐﹀崟閲戦" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="receivableFee" label="搴旀敹閲戦" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="actReceivableFee" label="瀹炴敹閲戦" min-width="100" show-overflow-tooltip />
+ <el-table-column prop="needReceivableFee" label="闇�鏀堕噾棰�" min-width="100" show-overflow-tooltip />
+ <el-table-column label="璐圭敤绫诲瀷" min-width="100" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ <span v-if="row.feeType === 0">鍛ㄦ湡璐圭敤</span>
+ <span v-if="row.feeType === 1">涓�娆℃�ц垂鐢�</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鏄惁閫炬湡" min-width="100" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ <span v-if="row.isOverdue === 0">鍚�</span>
+ <span v-if="row.isOverdue === 1">鏄�</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="璁¤垂鍛ㄦ湡" min-width="100" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ {{ row.startDate }} ~ {{ row.endDate }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="planPayDate" label="搴旀敹鏃ユ湡" min-width="100" show-overflow-tooltip />
<el-table-column prop="createTime" label="璐﹀崟鏉ユ簮" min-width="100" show-overflow-tooltip />
<el-table-column prop="statusName" label="鍚堝悓鐘舵��" min-width="100" fixed="right" show-overflow-tooltip />
<el-table-column label="鎿嶄綔" min-width="120" fixed="right">
@@ -39,6 +67,7 @@
</div>
<Edit ref="EditRef" @success="getList" />
<Detail ref="DetailRef" @success="getList" />
+ <BullEditFu ref="BullEditFu" @success="getList" />
</div>
</template>
@@ -46,6 +75,7 @@
import Pagination from '@/components/common/Pagination'
import QueryForm from '@/components/common/QueryForm'
import Edit from './components/bullEdit.vue'
+import BullEditFu from './components/bullEditFu.vue'
import Detail from './components/bullDetail.vue'
import { fetchList } from '@/api/bill'
export default {
@@ -53,9 +83,10 @@
Pagination,
QueryForm,
Edit,
- Detail
+ Detail,
+ BullEditFu
},
- data() {
+ data () {
return {
loading: false,
pagination: {
@@ -63,64 +94,71 @@
page: 1,
total: 0
},
- activeTabs: 0,
- filters: {},
+ billType: 0,
+ filters: {
+ status: 0
+ },
list: [],
total: 0,
- statusMap: [
- { value: 0, label: '寰呮敹娆�' },
- { value: 1, label: '宸茬粨绠�' },
- { value: 2, label: '閮ㄥ垎缁撴竻' },
- { value: 3, label: '寰呴��娆�' },
- { value: 4, label: '寰呬粯娆�' },
- ],
queryFormConfig: {
formItems: [
{
- filed: 'name',
+ filed: 'customerName',
type: 'input',
- label: '瀹㈡埛鍚嶇О',
+ label: '瀹㈡埛鍚嶇О'
},
{
filed: 'status',
type: 'select',
label: '璐﹀崟鐘舵��',
options: [
- { value: '0', label: '寮�鍚�' },
- { value: '1', label: '鍏抽棴' },
+ { value: 0, label: '寮�鍚�' },
+ { value: 1, label: '鍏抽棴' }
]
},
{
- filed: 'status',
+ filed: 'payStatus',
type: 'select',
label: '缁撴竻鐘舵��',
- options: this.statusMap
+ options: [
+ { value: 0, label: '寰呮敹娆�' },
+ { value: 1, label: '宸茬粨绠�' },
+ { value: 2, label: '閮ㄥ垎缁撴竻' },
+ { value: 3, label: '寰呴��娆�' },
+ { value: 4, label: '寰呬粯娆�' }
+ ]
},
{
filed: 'selDate',
type: 'daterange',
label: '搴旀敹/浠樻棩鏈�'
- },
- ],
- online: true
+ }
+ ]
}
}
},
- created() {
+ created () {
this.getList()
},
methods: {
+ addOpen () {
+ if (this.billType === 0) {
+ this.$refs.EditRef.open('鍒涘缓鏀舵璐﹀崟')
+ } else {
+ this.$refs.BullEditFu.open('鍒涘缓浠樻璐﹀崟')
+ }
+ },
getList (page) {
const { pagination, filters } = this
this.loading = true
fetchList({
model: {
- ...filters
+ ...filters,
+ billType: this.billType
},
capacity: pagination.pageSize,
page: page || pagination.page
}).then(res => {
- console.log(res)
this.loading = false
this.list = res.records || []
this.list.forEach(item => {
@@ -131,19 +169,20 @@
this.loading = false
})
},
- tabsClick(val) {
- this.activeTabs = val
+ tabsClick (val) {
+ this.billType = val
+ this.getList()
},
- handleDetail(row) {
- this.$refs.DetailRef.open()
+ handleDetail (row) {
+ this.$refs.DetailRef.open('璐﹀崟璇︽儏', row.id)
},
- clear() {
+ clear () {
this.filters = {}
this.pagination.pageSize = 10
this.pagination.page = 1
this.getList()
},
- handleSizeChange(capacity) {
+ handleSizeChange (capacity) {
this.pagination.pageSize = capacity
this.getList()
}
@@ -157,7 +196,6 @@
.tabs {
display: flex;
margin-bottom: 20px;
- display: flex;
justify-content: center;
.tab {
--
Gitblit v1.9.3