提交 c564140f authored 作者: matian's avatar matian

代码提交

上级 9e4d2038
......@@ -49,11 +49,15 @@ export function payConfirm(data) {
headers: { 'Content-Type': 'multipart/form-data' }
})
}
// 取消足额支付
// 确认足额支付
export function confirmPayDetail(data) {
return httpRequest.post('/api/finance/v1/payments/undo-confirm', data)
}
// 确认足额支付
// 取消足额支付
export function cancelPayDetail(data) {
return httpRequest.post('/api/finance/v1/payments/undo-confirm', data)
}
// 取消单条缴费到账
export function payCancel(data) {
return httpRequest.post('/api/finance/v1/payments/undo-details-confirm', data)
}
<!-- 支付详情-渠道信息 -->
<template>
<table border="1" width="1200px" cellspacing="0">
<table border="1" width="1500px" cellspacing="0" class="table">
<tr>
<th>不含税销售金额</th>
<td>{{dealList.sales_amount_excluding_tax}}</td>
<td>{{ dealList.sales_amount_excluding_tax }}</td>
<th>渠道代理费提基数</th>
<td>{{dealList.channel_agent_fee_base}}</td>
<td>{{ dealList.channel_agent_fee_base }}</td>
<th>服务费规则</th>
<td>{{dealList.service_fee_rules}}</td>
<td>{{ dealList.service_fee_rules }}</td>
</tr>
<tr>
<th>服务费比例</th>
<td>{{dealList.service_charge_ratio}}</td>
<td>{{ dealList.service_charge_ratio }}</td>
<th>代理服务费</th>
<td>{{dealList.agency_service_fee}}</td>
<td>{{ dealList.agency_service_fee }}</td>
<th>代理服务费(不含税金额)</th>
<td>{{dealList.agency_service_fee_excluding_tax}}</td>
<td>{{ dealList.agency_service_fee_excluding_tax }}</td>
</tr>
<tr>
<th>户名</th>
<td>{{dealList.channel_account_name}}</td>
<td>{{ dealList.channel_account_name }}</td>
<th>账号</th>
<td>{{dealList.channel_account}}</td>
<td>{{ dealList.channel_account }}</td>
<th>开户行</th>
<td>{{dealList.channel_bank_of_deposit}}</td>
<td>{{ dealList.channel_bank_of_deposit }}</td>
</tr>
<tr>
<th>渠道税率</th>
<td colspan="5">{{dealList.channel_tax_rate}}</td>
<td colspan="5">{{ dealList.channel_tax_rate }}</td>
</tr>
</table>
</template>
......@@ -38,10 +38,24 @@ export default {
dealList: {
type: Object,
default: () => {}
}
}
}
</script>
<style></style>
<style>
.table {
border: 1px solid #000;
}
th {
width: 120px;
text-align: center;
font-size: 20px;
color: rgb(10, 1, 1);
font-weight: normal;
}
td {
width: 120px;
text-align: center;
}
</style>
<!-- 支付详情-收款信息 -->
<template>
<table border="1" width="1200px" cellspacing="0">
<table border="1" width="1500px" cellspacing="0" class="table">
<tr>
<th>应缴金额</th>
<td>{{dealList.bill_total}}</td>
<td>{{ dealList.bill_total }}</td>
<th>实缴金额</th>
<td>{{dealList.amount_need_to_pay}}</td>
<td>{{ dealList.amount_need_to_pay }}</td>
<th>待缴金额</th>
<td>{{dealList.amount_waiting_for_pay}}</td>
<td>{{ dealList.amount_waiting_for_pay }}</td>
</tr>
<tr>
<th>手续费</th>
<td>{{dealList.service_charge}}</td>
<td>{{ dealList.service_charge }}</td>
<th>到账金额</th>
<td>{{dealList.amount_received}}</td>
<td>{{ dealList.amount_received }}</td>
<th>待确认金额</th>
<td>{{dealList.amount_waiting_for_confirm}}</td>
<td>{{ dealList.amount_waiting_for_confirm }}</td>
</tr>
<tr>
<th>首次缴费时间</th>
<td>{{dealList.first_payment_time}}</td>
<td colspan="2">{{ dealList.first_payment_time }}</td>
<th>末次缴费时间</th>
<td colspan="3">{{dealList.final_payment_time}}</td>
<td colspan="2">{{ dealList.final_payment_time }}</td>
</tr>
</table>
</template>
......@@ -38,5 +38,18 @@ export default {
</script>
<style>
.table {
border: 1px solid #000;
}
th {
width: 120px;
text-align: center;
font-size: 20px;
color: rgb(10, 1, 1);
font-weight: normal;
}
td {
width: 120px;
text-align: center;
}
</style>
<!-- 支付详情-已确认列表 -->
<template>
<app-card>
<app-list v-bind="tableOptions" ref="list" >
<template v-slot:table-x = "{ row }">
<app-list v-bind="tableOptions" ref="list">
<template v-slot:table-x="{ row }">
<router-link :to="{ name: 'paydetail', params: { id: row.id } }">
<el-button>查看</el-button>
</router-link>
<el-button @click="cancelReceive(row)">取消到账</el-button>
<el-button @click="cancelReceive(row)" style="margin-top: 5px">取消到账</el-button>
</template>
</app-list>
</app-card>
......@@ -15,7 +15,7 @@
// 组件
import AppList from '@/components/base/AppList.vue'
import AppCard from '@/components/base/AppCard.vue'
import { payDetail, payConfirm } from '../api'
import { payDetail, payCancel } from '../api'
const payStatusMap = { 20: '支付待确认', 30: '部分到账', 70: '足额支付待确认', 80: '足额支付' }
// 接口
export default {
......@@ -27,8 +27,7 @@ export default {
},
components: { AppCard, AppList },
data() {
return {
}
return {}
},
computed: {
// 列表配置
......@@ -48,8 +47,8 @@ export default {
{ label: '支付方式', prop: 'payment_method', align: 'center', minWidth: 100 },
{ label: '其他支付方式', prop: 'payment_method_others', align: 'center', minWidth: 100 },
{ label: '交易流水号', prop: 'txn_id', align: 'center', minWidth: 100 },
// eslint-disable-next-line object-curly-newline
{ label: '支付状态',
{
label: '支付状态',
prop: 'payment_status',
align: 'center',
minWidth: 100,
......@@ -67,7 +66,7 @@ export default {
// 取消到账
cancelReceive() {
const params = { id: this.id }
payConfirm(params).then(res => {
payCancel(params).then(res => {
if (res.code === 0) {
this.$parent.fetchTicketDetail()
}
......
<!-- 支付详情-订单信息 -->
<template>
<div>
<table border="1" width="1200px" cellspacing="0">
<table border="1" width="1500px" cellspacing="0" class="table">
<tr>
<th>订单用户名称</th>
<td>{{dealList.name}}</td>
<td>{{ dealList.name }}</td>
<td>订单编号</td>
<td>{{dealList.id}}</td>
<td>{{ dealList.id }}</td>
<td>支付状态</td>
<td>{{dealList.payment_status}}</td>
<td>{{ dealList.payment_status }}</td>
</tr>
<tr>
<th>备注</th>
<td colspan="5">{{dealList.comment}}</td>
<td colspan="5">{{ dealList.comment }}</td>
</tr>
</table>
</div>
......@@ -24,12 +24,25 @@ export default {
dealList: {
type: Object,
default: () => {}
}
},
mounted() {
}
mounted() {}
}
</script>
<style></style>
<style>
.table {
border: 1px solid #000;
}
th {
width: 120px;
text-align: center;
font-size: 20px;
color: rgb(10, 1, 1);
font-weight: normal;
}
td {
width: 120px;
text-align: center;
}
</style>
<!-- 支付详情-学员信息 -->
<template>
<div>
<table border="1" width="1200px" cellspacing="0">
<table border="1" width="1500px" cellspacing="0" class="table">
<tr>
<th>学员姓名</th>
<td>{{dealList.name}}</td>
<td>{{ dealList.name }}</td>
<th>报名项目</th>
<td>{{dealList.project_name}}</td>
<td>{{ dealList.project_name }}</td>
<td>所属班次</td>
<td>{{dealList.bill_customer_class}}</td>
<td>{{ dealList.bill_customer_class }}</td>
</tr>
<tr>
<th>开学时间</th>
<td>{{dealList.bill_customer_class_start_time}}</td>
<td>{{ dealList.bill_customer_class_start_time }}</td>
<th>学制期限</th>
<td>{{dealList.bill_customer_class_length_of_schooling}}</td>
<td>{{ dealList.bill_customer_class_length_of_schooling }}</td>
<th>跟进人</th>
<td>{{dealList.sales_rep_user_id_name}}</td>
<td>{{ dealList.sales_rep_user_id_name }}</td>
</tr>
</table>
</div>
......@@ -28,10 +28,24 @@ export default {
dealList: {
type: Object,
default: () => {}
}
}
}
</script>
<style></style>
<style>
.table {
border: 1px solid #000;
}
th {
width: 120px;
text-align: center;
font-size: 20px;
color: rgb(10, 1, 1);
font-weight: normal;
}
td {
width: 120px;
text-align: center;
}
</style>
<!-- 支付详情-发票表格 -->
<template>
<div class="ticketInfo">
<table border="1" width="1200px" cellspacing="0" class="table" v-for="(item, index) in invioceList" :key="index" >
<table border="1" width="1500px" cellspacing="0" class="table" v-for="(item, index) in invioceList" :key="index">
<tr>
<th colspan="10">发票{{ item.id }}</th>
</tr>
......@@ -20,9 +19,9 @@
</tr>
<tr v-show="item.invoice_status === 6">
<th>原发票号码</th>
<td>{{item.old_invoice_haoma}}</td>
<td>{{ item.old_invoice_haoma }}</td>
<th>原发票代码</th>
<td>{{item.old_invoice_daima}}</td>
<td>{{ item.old_invoice_daima }}</td>
</tr>
<tr>
<th>含税金额</th>
......@@ -50,13 +49,13 @@
</tr>
<tr>
<th>地址</th>
<td>{{item.taxpayer_address}}</td>
<td>{{ item.taxpayer_address }}</td>
<th>电话</th>
<td>{{item.taxpayer_mobile}}</td>
<td>{{ item.taxpayer_mobile }}</td>
<th>开户行</th>
<td>{{item.taxpayer_bank_name}}</td>
<td>{{ item.taxpayer_bank_name }}</td>
<th>银行账号</th>
<td>{{item.taxpayer_bank_account}}</td>
<td>{{ item.taxpayer_bank_account }}</td>
</tr>
<tr>
<th>邮寄地址</th>
......@@ -104,6 +103,18 @@ export default {
<style>
.table {
border: 1px solid #000;
margin-bottom: 40px;
}
th {
width: 120px;
text-align: center;
font-size: 20px;
color: rgb(10, 1, 1);
font-weight: normal;
}
td {
width: 120px;
text-align: center;
}
</style>
......@@ -5,27 +5,27 @@
<table border="1" width="720px" cellspacing="0" class="table">
<tr>
<th>客户姓名</th>
<td>{{detailList.name}}</td>
<td>{{ detailList.name }}</td>
<th>客户编号</th>
<td>{{detailList.customer_id}}</td>
<td>{{ detailList.customer_id }}</td>
<th>订单编号</th>
<td>{{detailList.id}}</td>
<td>{{ detailList.id }}</td>
</tr>
<tr>
<th>支付状态</th>
<td>{{detailList.payment_status}}</td>
<td>{{ detailList.payment_status }}</td>
<th>报名项目</th>
<td>{{detailList.project_id}}</td>
<td>{{ detailList.project_id }}</td>
<th>应缴金额</th>
<td>{{detailList.bill_total}}</td>
<td>{{ detailList.bill_total }}</td>
</tr>
<tr>
<th>实缴金额</th>
<td>{{detailList.amount_need_to_pay}}</td>
<td>{{ detailList.amount_need_to_pay }}</td>
<th>交易流水号</th>
<td>{{detailList.txn_id_list}}</td>
<td>{{ detailList.txn_id_list }}</td>
<th>缴费时间</th>
<td>{{detailList.final_payment_time}}</td>
<td>{{ detailList.final_payment_time }}</td>
</tr>
</table>
<el-form label-width="120px" ref="ruleForm" :model="form" :rules="rules">
......@@ -68,19 +68,19 @@
<el-input v-model="form.taxpayer_identifier"></el-input>
</el-form-item>
<!-- 企业纸质显示 -->
<div v-show="form.people_type === 1 && form.invioce_type === 3">
<el-form-item label="地址" prop="taxpayer_address" >
<el-input v-model="form.taxpayer_address"></el-input>
</el-form-item>
<el-form-item label="电话" prop="taxpayer_mobile">
<el-input v-model="form.taxpayer_mobile"></el-input>
</el-form-item>
<el-form-item label="开户行" prop="taxpayer_bank_name">
<el-input v-model="form.taxpayer_bank_name"></el-input>
</el-form-item>
<el-form-item label="银行账号" prop="taxpayer_bank_account">
<el-input v-model="form.taxpayer_bank_account"></el-input>
</el-form-item>
<div v-show="form.people_type === 1 && form.invioce_type === 3">
<el-form-item label="地址" prop="taxpayer_address">
<el-input v-model="form.taxpayer_address"></el-input>
</el-form-item>
<el-form-item label="电话" prop="taxpayer_mobile">
<el-input v-model="form.taxpayer_mobile"></el-input>
</el-form-item>
<el-form-item label="开户行" prop="taxpayer_bank_name">
<el-input v-model="form.taxpayer_bank_name"></el-input>
</el-form-item>
<el-form-item label="银行账号" prop="taxpayer_bank_account">
<el-input v-model="form.taxpayer_bank_account"></el-input>
</el-form-item>
</div>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark"></el-input>
......@@ -217,6 +217,13 @@ export default {
}
})
}
},
watch: {
'form.people_type': function (oldVal, val) {
if (val !== oldVal) {
this.form.invioce_type = ''
}
}
}
}
</script>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论