Skip to content

C
center-finance
提交 f954161d authored 作者: matian's avatar matian
浏览文件
操作

feat:财务系统优化

上级 1752febe
隐藏空白字符变更
内嵌 并排
正在显示 包含 200 行增加 和 3 行删除
src/modules/payment/components/Channel.vue
浏览文件 @ f954161d
<!-- 支付详情-渠道信息 -->
<template>
<table border="1" cellspacing="0" class="tableDetail">
<!-- {{
dealList
}} -->
<tr class="part">
<th>不含税销售金额</th>
<td>{{ dealList.sales_amount_excluding_tax }}</td>
......@@ -11,7 +14,7 @@
</tr>
<tr class="title">
<th>服务费比例</th>
<td>{{ dealList.service_charge_ratio }}</td>
<td>{{ serviceChargeRatio() }}</td>
<th>代理服务费</th>
<td>{{ dealList.agency_service_fee }}</td>
<th>代理服务费（不含税金额）</th>
......@@ -39,6 +42,31 @@ export default {
type: Object,
default: () => {}
}
},
methods: {
serviceChargeRatio() {
if (this.dealList.service_fee_rules_type) {
if (this.dealList.service_fee_rules_type === '1' || this.dealList.service_fee_rules_type === '3') {
if (this.dealList.service_charge_ratio) {
return this.dealList.service_charge_ratio + '%'
} else {
return 0 + '%'
}
} else {
if (this.dealList.service_charge_ratio) {
return (
Math.round(
(JSON.parse(this.dealList.service_charge_ratio)[0].start /
JSON.parse(this.dealList.service_charge_ratio)[0].end) *
10000
) /
100.0 +
'%'
)
}
}
}
}
}
}
</script>
src/modules/payment/components/Collection.vue
浏览文件 @ f954161d
......@@ -17,12 +17,56 @@
<th>待确认金额</th>
<td>{{ dealList.amount_waiting_for_confirm }}</td>
</tr>
<tr>
<th>首款应缴金额</th>
<td>{{ dealList.first_payment }}</td>
<th>首款实缴金额</th>
<td>{{ dealList.first_payment_amount }}</td>
<th>首款待缴金额</th>
<td>{{ dealList.first_amount_need_to_pay }}</td>
</tr>
<tr>
<th>首款手续费</th>
<td>{{ dealList.first_service_charge }}</td>
<th>首款到账金额</th>
<td>{{ dealList.first_amount_received }}</td>
<th>首款待确认金额</th>
<td>{{ dealList.first_waiting_for_confirm }}</td>
</tr>
<tr>
<th>尾款应缴金额</th>
<td>{{ dealList.final_payment }}</td>
<th>尾款实缴金额</th>
<td>{{ dealList.final_payment_amount }}</td>
<th>尾款待缴金额</th>
<td>{{ dealList.final_amount_need_to_pay }}</td>
</tr>
<tr>
<th>尾款手续费</th>
<td>{{ dealList.final_service_charge }}</td>
<th>尾款到账金额</th>
<td>{{ dealList.final_amount_received }}</td>
<th>尾款待确认金额</th>
<td>{{ dealList.final_waiting_for_confirm }}</td>
</tr>
<tr>
<th>首次缴费时间</th>
<td colspan="2">{{ dealList.first_payment_time }}</td>
<th>末次缴费时间</th>
<td colspan="2">{{ dealList.final_payment_time }}</td>
</tr>
<tr>
<th>首款首次缴费时间</th>
<td colspan="2">{{ dealList.first_first_time }}</td>
<th>首款末次缴费时间</th>
<td colspan="2">{{ dealList.first_last_time }}</td>
</tr>
<tr>
<th>尾款首次缴费时间</th>
<td colspan="2">{{ dealList.final_first_time }}</td>
<th>尾款末次缴费时间</th>
<td colspan="2">{{ dealList.final_last_time }}</td>
</tr>
</table>
</template>
......
src/modules/payment/components/Confirmed.vue
浏览文件 @ f954161d
......@@ -49,6 +49,7 @@ export default {
minWidth: 100
},
{ label: '支付金额', prop: 'amount', align: 'center', minWidth: 100 },
{ label: '支付类型', prop: 'stages_type_name', align: 'center', minWidth: 100 },
{ label: '支付时间', prop: 'payment_time', align: 'center', minWidth: 300 },
{ label: '支付方式', prop: 'payment_method', align: 'center', minWidth: 100 },
{ label: '其他支付方式', prop: 'payment_method_others', align: 'center', minWidth: 100 },
......
src/modules/payment/components/SecondChannel.vue 0 → 100644
浏览文件 @ f954161d
<!-- 支付详情-渠道信息 -->
<template>
<table border="1" cellspacing="0" class="tableDetail">
<tr class="part">
<th>不含税销售金额</th>
<td>{{ dealList.sales_amount_excluding_tax }}</td>
<th>渠道代理费提基数</th>
<td>{{ dealList.channel_agent_fee_base }}</td>
<th>服务费规则</th>
<td>{{ dealList.service_fee_rules }}</td>
</tr>
<tr class="title">
<th>服务费比例</th>
<td>{{ serviceChargeRatio() }}</td>
<th>代理服务费</th>
<td>{{ dealList.agency_service_fee }}</td>
<th>代理服务费（不含税金额）</th>
<td>{{ dealList.agency_service_fee_excluding_tax }}</td>
</tr>
<tr class="title">
<th>户名</th>
<td>{{ dealList.channel_account_name }}</td>
<th>账号</th>
<td>{{ dealList.channel_account }}</td>
<th>开户行</th>
<td>{{ dealList.channel_bank_of_deposit }}</td>
</tr>
<tr class="title">
<th>渠道税率</th>
<td colspan="5">{{ dealList.channel_tax_rate }}</td>
</tr>
<tr class="title">
<th>分成方式</th>
<td colspan="5">{{ dealList.secondary_division_type }}</td>
</tr>
</table>
</template>
<script>
export default {
props: {
dealList: {
type: Object,
default: () => {}
}
},
methods: {
serviceChargeRatio() {
if (this.dealList.secondary_service_fee_rules_type) {
if (
this.dealList.secondary_service_fee_rules_type === '1' ||
this.dealList.secondary_service_fee_rules_type === '3'
) {
if (this.dealList.secondary_service_charge_ratio) {
return this.dealList.secondary_service_charge_ratio + '%'
} else {
return 0 + '%'
}
} else {
if (this.dealList.secondary_service_charge_ratio) {
return (
Math.round(
(JSON.parse(this.dealList.secondary_service_charge_ratio)[0].start /
JSON.parse(this.dealList.secondary_service_charge_ratio)[0].end) *
10000
) /
100.0 +
'%'
)
}
}
}
}
}
}
</script>
src/modules/payment/components/Toconfirm.vue
浏览文件 @ f954161d
......@@ -37,6 +37,7 @@ export default {
},
{ label: '支付人姓名', prop: 'payer_name', align: 'center', minWidth: 150 },
{ label: '支付金额', prop: 'amount', align: 'center', minWidth: 100 },
{ label: '支付类型', prop: 'stages_type_name', align: 'center', minWidth: 100 },
{ label: '支付时间', prop: 'payment_time', align: 'center', minWidth: 100 },
{ label: '支付方式', prop: 'payment_method', align: 'center', minWidth: 100 },
{ label: '其他支付方式', prop: 'payment_method_others', align: 'center', minWidth: 150 },
......
src/modules/payment/views/Deal.vue
浏览文件 @ f954161d
......@@ -20,6 +20,10 @@
<th>支付时间</th>
<td colspan="3">{{ row.payment_time }}</td>
</tr>
<tr>
<th>支付类型</th>
<td colspan="7">{{ row.stages_type_name }}</td>
</tr>
<tr>
<td></td>
<td colspan="7">
......
src/modules/payment/views/Detail.vue
浏览文件 @ f954161d
......@@ -37,6 +37,9 @@
<app-card title="渠道信息">
<Channel :dealList="dealList" />
</app-card>
<app-card title="二级渠道信息">
<second-channel :dealList="dealList" />
</app-card>
<app-card title="支付待确认记录">
<Toconfirm :dealList="dealList" />
</app-card>
......@@ -56,9 +59,10 @@ import Ticket from '../components/Ticket.vue'
import Channel from '../components/Channel.vue'
import Toconfirm from '../components/Toconfirm.vue'
import Confirmed from '../components/Confirmed.vue'
import SecondChannel from '../components/SecondChannel.vue'
import { payDetail, confirmPayDetail, cancelPayDetail } from '../api'
export default {
components: { AppCard, Order, Student, Collection, Ticket, Channel, Toconfirm, Confirmed },
components: { AppCard, Order, Student, Collection, Ticket, Channel, Toconfirm, Confirmed, SecondChannel },
data() {
return {
id: '',
......
src/modules/payment/views/List.vue
浏览文件 @ f954161d
......@@ -284,11 +284,49 @@ export default {
{ label: '手续费', prop: 'service_charge', align: 'center', minWidth: 100 },
{ label: '到账金额', prop: 'amount_received', align: 'center', minWidth: 100 },
{ label: '待缴金额', prop: 'amount_waiting_for_pay', align: 'center', minWidth: 100 },
{ label: '首款应缴金额', prop: 'first_payment', align: 'center', minWidth: 100 },
{ label: '首款实缴金额', prop: 'first_payment_amount', align: 'center', minWidth: 100 },
{ label: '首款手续费', prop: 'first_service_charge', align: 'center', minWidth: 100 },
{ label: '首款到账金额', prop: 'first_amount_received', align: 'center', minWidth: 100 },
{ label: '首款待缴金额', prop: 'first_amount_need_to_pay', align: 'center', minWidth: 100 },
{ label: '尾款应缴金额', prop: 'final_payment', align: 'center', minWidth: 100 },
{ label: '尾款实缴金额', prop: 'final_payment_amount', align: 'center', minWidth: 100 },
{ label: '尾款手续费', prop: 'final_service_charge', align: 'center', minWidth: 100 },
{ label: '尾款到账金额', prop: 'final_amount_received', align: 'center', minWidth: 100 },
{ label: '尾款待缴金额', prop: 'final_amount_need_to_pay', align: 'center', minWidth: 100 },
{ label: '跟进人', prop: 'sales_rep_user_id_name', align: 'center', minWidth: 100 },
{ label: '渠道', prop: 'channel_id_name', align: 'center', minWidth: 300 },
{ label: '交易流水号', prop: 'txn_id_list', align: 'center', minWidth: 300 },
{ label: '服务费规则', prop: 'service_fee_rules', align: 'center', minWidth: 120 },
{ label: '服务费比例', prop: 'service_charge_ratio', align: 'center', minWidth: 120 },
{
label: '服务费比例',
prop: 'service_charge_ratio',
align: 'center',
minWidth: 120,
computed({ row }) {
console.log(row)
if (row.service_fee_rules_type) {
if (row.service_fee_rules_type === '1' || row.service_fee_rules_type === '3') {
if (row.service_charge_ratio) {
return row.service_charge_ratio + '%'
} else {
return 0 + '%'
}
} else {
if (row.service_charge_ratio) {
return (
Math.round(
(JSON.parse(row.service_charge_ratio)[0].start / JSON.parse(row.service_charge_ratio)[0].end) *
10000
) /
100.0 +
'%'
)
}
}
}
}
},
{ label: '不含税销售金额', prop: 'sales_amount_excluding_tax', align: 'center', minWidth: 150 },
{ label: '渠道代理提基数', prop: 'channel_agent_fee_base', align: 'center', minWidth: 150 },
{ label: '代理服务费', prop: 'agency_service_fee', align: 'center', minWidth: 120 },
......@@ -341,6 +379,7 @@ export default {
}
},
created() {
console.log(11111)
this.fetchCondition() // 获取过滤条件
},
methods: {
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论