md
This commit is contained in:
linfso
parent
aee77ed175
commit
f261fe006d
@ -1408,20 +1408,30 @@ export default {
|
||||
}
|
||||
|
||||
.full-block{
|
||||
height:100%;
|
||||
width:100%;
|
||||
overflow:hidden;
|
||||
}
|
||||
.flex-layout{
|
||||
display:flex;
|
||||
flex-direction:column;
|
||||
}
|
||||
.flex-auto{
|
||||
flex:1 1 auto
|
||||
}
|
||||
.flex-none{
|
||||
flex:none
|
||||
}
|
||||
height:100%;
|
||||
width:100%;
|
||||
overflow:hidden;
|
||||
}
|
||||
.flex-layout{
|
||||
display:flex;
|
||||
flex-direction:column;
|
||||
}
|
||||
.flex-auto{
|
||||
flex:1 1 auto
|
||||
}
|
||||
.flex-none{
|
||||
flex:none
|
||||
}
|
||||
|
||||
.el-table {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
.el-table__body-wrapper {
|
||||
flex: 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
<div v-if="(selTplCode=='TAN-GC-130' || selTplCode=='GC-NOLOGO') && isShowSubBillRange" class="subBillRange" style="display: inline-flex;font-size: 12px; line-height: 28px; font-weight: 600;">
|
||||
<div v-if="(selTplCode=='TAN-GC-130' || selTplCode=='TAN-ENGC-130') && isShowSubBillRange" class="subBillRange" style="display: inline-flex;font-size: 12px; line-height: 28px; font-weight: 600;">
|
||||
<span >子单范围:
|
||||
<el-input size="mini" style="width:40px" v-model="subBillStart" type="text" maxlength="4" ></el-input>
|
||||
-
|
||||
@ -299,7 +299,7 @@
|
||||
}
|
||||
|
||||
// 打印子单
|
||||
if(this.selTplCode=="TAN-GC-130" || this.selTplCode=="GC-NOLOGO"){
|
||||
if(this.selTplCode=="TAN-GC-130" || this.selTplCode=="TAN-ENGC-130"){
|
||||
for(let i=0;i<this.orderList.length;i++){
|
||||
let billCode=this.orderList[i];
|
||||
let subBillStart=1;
|
||||
@ -442,7 +442,7 @@
|
||||
}
|
||||
|
||||
// 打印子单
|
||||
if(this.selTplCode=="TAN-GC-130"|| this.selTplCode=='GC-NOLOGO'){
|
||||
if(this.selTplCode=="TAN-GC-130"|| this.selTplCode=='TAN-ENGC-130'){
|
||||
for(let i=0;i<this.orderList.length;i++){
|
||||
let billCode=this.orderList[i];
|
||||
let subBillStart=1;
|
||||
@ -558,7 +558,7 @@
|
||||
}
|
||||
|
||||
// 打印子单
|
||||
if(this.selTplCode=="TAN-GC-130" || this.selTplCode=='GC-NOLOGO'){
|
||||
if(this.selTplCode=="TAN-GC-130" || this.selTplCode=='TAN-ENGC-130'){
|
||||
for(let i=0;i<this.orderList.length;i++){
|
||||
let billCode=this.orderList[i];
|
||||
// 循环子单范围
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
<script>
|
||||
import ChargeBillMonthPanel from '@/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue';
|
||||
import BillDetailPanelReadOnly from '@/views/emis/emisSettleBill/panel/BillDetailPanel.vue';
|
||||
import BillDetailPanelReadOnly from '@/views/emis/emisSettleBill/panel/BillDetailPanelReadOnly.vue';
|
||||
|
||||
|
||||
export default {
|
||||
|
||||
@ -1,23 +1,41 @@
|
||||
<template>
|
||||
<div style="font-size: 12px;" >
|
||||
<div style="font-size: 12px;" v-if="settleBillItem">
|
||||
|
||||
<div style="margin-bottom:20px">
|
||||
<div style="margin-bottom:20px" >
|
||||
<el-descriptions :title="$t('账单信息')" size="mini" :column="4">
|
||||
<el-descriptions-item label="账单名称">{{ settleBillItem.settleBillName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="账单编号">{{ settleBillItem.settleBillNo }}</el-descriptions-item>
|
||||
<el-descriptions-item label="账单月份">{{ settleBillItem.billMonth }}</el-descriptions-item>
|
||||
<el-descriptions-item label="应收金额">{{ settleBillItem.recMoney }}</el-descriptions-item>
|
||||
<el-descriptions-item label="总票数">{{ settleBillItem.sendPieceSum }}</el-descriptions-item>
|
||||
<el-descriptions-item label="总件数">{{ settleBillItem.pieceNumber }}</el-descriptions-item>
|
||||
<el-descriptions-item label="结算重量">{{ settleBillItem.feeWeight }}</el-descriptions-item>
|
||||
<el-descriptions-item label="月结编号" v-if="settleBillItem.settleType==2">{{ settleBillItem.custNo }}</el-descriptions-item>
|
||||
<el-descriptions-item label="月结客户" v-if="settleBillItem.settleType==2">{{ settleBillItem.custName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="账单类型" >
|
||||
<el-descriptions-item label="账单类型" :span="2" >
|
||||
<span v-if="settleBillItem.settleType==1">现金账单</span>
|
||||
<span v-if="settleBillItem.settleType==2">月结账单</span>
|
||||
</el-descriptions-item>
|
||||
<!-- <el-descriptions-item label="月结编号" v-if="settleBillItem.settleType==2">{{ settleBillItem.custNo }}</el-descriptions-item> -->
|
||||
<el-descriptions-item label="月结客户" v-if="settleBillItem.settleType==2">{{ settleBillItem.custName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="销售联系人">{{ settleBillItem.salesmen }}</el-descriptions-item>
|
||||
<el-descriptions-item label="回款联系人">{{ settleBillItem.payee }}</el-descriptions-item>
|
||||
<el-descriptions-item label="回款联系人" :span="3" >{{ settleBillItem.payee }}</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="账单月份">{{ settleBillItem.billMonth }}</el-descriptions-item>
|
||||
<el-descriptions-item label="总票数">{{ settleBillItem.sendPieceSum }}</el-descriptions-item>
|
||||
<el-descriptions-item label="总件数">{{ settleBillItem.pieceNumber }}</el-descriptions-item>
|
||||
<el-descriptions-item label="结算重量" >{{ settleBillItem.feeWeight }}</el-descriptions-item>
|
||||
|
||||
|
||||
<el-descriptions-item label="应收金额"><span style="color:blue">￥{{ settleBillItem.recMoney }}</span></el-descriptions-item>
|
||||
<el-descriptions-item label="已收金额"><span style="color:red">￥{{ settleBillItem.recedMoney }}</span></el-descriptions-item>
|
||||
<el-descriptions-item label="退款金额" :span="2" >￥{{ settleBillItem.refundMoney }}</el-descriptions-item>
|
||||
|
||||
|
||||
<el-descriptions-item label="理赔金额">￥{{ settleBillItem.satisfyMoney }}</el-descriptions-item>
|
||||
<el-descriptions-item label="理赔原因" :span="3">{{ settleBillItem.satisfyReason }}</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="折让金额">￥{{ settleBillItem.allowanceMoney }}</el-descriptions-item>
|
||||
<el-descriptions-item label="折让原因" :span="3">{{ settleBillItem.allowanceReason }}</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="抵扣金额">￥{{ settleBillItem.deductionMoney }}</el-descriptions-item>
|
||||
<el-descriptions-item label="抵扣原因" :span="3">{{ settleBillItem.deductionReason }}</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="其他费用">￥{{ settleBillItem.otherMoney }}</el-descriptions-item>
|
||||
<el-descriptions-item label="其他原因" :span="3">{{ settleBillItem.otherReason }}</el-descriptions-item>
|
||||
|
||||
</el-descriptions>
|
||||
</div>
|
||||
@ -28,7 +46,7 @@
|
||||
<el-tag type="success" v-if="settleBillItem.paymentStatus==1">已收款</el-tag>
|
||||
<el-tag type="warning" v-if="settleBillItem.paymentStatus==2">部分收款</el-tag>
|
||||
</div>
|
||||
<div>总应收:<span style="color:red;font-weight:500;">{{ settleBillItem.recMoney }}</span>,已收:<span style="color:blue;font-weight:500;">{{ settleBillItem.recedMoney }}</span></div>
|
||||
<div>收款明细：总应收:<span style="color:red;font-weight:500;">￥{{ settleBillItem.recMoney }}</span>,￥已收:<span style="color:blue;font-weight:500;">{{ settleBillItem.recedMoney }}</span></div>
|
||||
<div>
|
||||
<PayRecordList :settleBillNo="settleBillNo"> </PayRecordList>
|
||||
</div>
|
||||
@ -48,6 +66,13 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div style="font-weight:500;margin-bottom:20px">
|
||||
子账单列表:
|
||||
</div>
|
||||
<div>
|
||||
<SubBillList :settleBillNo="settleBillNo"> </SubBillList>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -55,7 +80,7 @@
|
||||
import { getInfoBySettleBillNo } from "@/api/emis/emisSettleBill";
|
||||
import PayRecordList from '@/views/emis/emisSettlePayRecord/panel/PayRecordList.vue';
|
||||
import InvoiceRecordList from '@/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordList.vue';
|
||||
|
||||
import SubBillList from '@/views/emis/emisSettleSubBill/SubBillList.vue';
|
||||
export default {
|
||||
name: "BillDetailPanel",
|
||||
props:{
|
||||
@ -65,7 +90,8 @@ export default {
|
||||
},
|
||||
components: {
|
||||
PayRecordList,
|
||||
InvoiceRecordList
|
||||
InvoiceRecordList,
|
||||
SubBillList
|
||||
},
|
||||
dicts: [
|
||||
],
|
||||
|
||||
@ -190,10 +190,11 @@
|
||||
<el-table-column :label="$t('折让金额')" align="center" prop="allowanceMoney" width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('其他收费')" align="center" prop="otherMoney" width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('理赔原因')" align="center" prop="satisfyMoney" width="100" :show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('抵让原因')" align="center" prop="deductionReason" width="100" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('理赔原因')" align="center" prop="satisfyReason" width="100" :show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('折让原因')" align="center" prop="allowanceReason" width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('抵扣原因')" align="center" prop="deductionReason" width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('其他原因')" align="center" prop="otherReason" width="100" :show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('其他费用')" align="center" prop="otherReason" width="170" :show-overflow-tooltip="true"/>
|
||||
<!-- <el-table-column :label="$t('合计金额')" align="center" prop="sendMoneySum" width="100" :show-overflow-tooltip="true"/> -->
|
||||
|
||||
<el-table-column :label="$t('回款联系人')" align="center" prop="payee" width="100" />
|
||||
|
||||
@ -2,22 +2,41 @@
|
||||
<XdPageContainer class="app-container">
|
||||
|
||||
<div style="margin-bottom: 20px;">
|
||||
<el-descriptions title="账单信息" size="mini" border :column="4" v-if="settleBillItem">
|
||||
<el-descriptions-item label="账单名称">{{ settleBillItem.settleBillName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="账单编号">{{ settleBillItem.settleBillNo }}</el-descriptions-item>
|
||||
<el-descriptions-item label="账单月份">{{ settleBillItem.billMonth }}</el-descriptions-item>
|
||||
<el-descriptions-item label="应收金额">{{ settleBillItem.recMoney }}</el-descriptions-item>
|
||||
<el-descriptions-item label="总票数">{{ settleBillItem.sendPieceSum }}</el-descriptions-item>
|
||||
<el-descriptions-item label="总件数">{{ settleBillItem.pieceNumber }}</el-descriptions-item>
|
||||
<el-descriptions-item label="结算重量">{{ settleBillItem.feeWeight }}</el-descriptions-item>
|
||||
<el-descriptions-item label="月结编号" v-if="settleBillItem.settleType==2">{{ settleBillItem.custNo }}</el-descriptions-item>
|
||||
<el-descriptions-item label="月结客户" v-if="settleBillItem.settleType==2">{{ settleBillItem.custName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="账单类型" >
|
||||
<span v-if="settleBillItem.settleType==1">现金账单</span>
|
||||
<span v-if="settleBillItem.settleType==2">月结账单</span>
|
||||
</el-descriptions-item>
|
||||
<el-descriptions-item label="销售联系人">{{ settleBillItem.salesmen }}</el-descriptions-item>
|
||||
<el-descriptions-item label="回款联系人">{{ settleBillItem.payee }}</el-descriptions-item>
|
||||
|
||||
<el-descriptions :title="$t('账单信息')" size="mini" :column="4">
|
||||
<el-descriptions-item label="账单名称">{{ settleBillItem.settleBillName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="账单编号">{{ settleBillItem.settleBillNo }}</el-descriptions-item>
|
||||
<el-descriptions-item label="账单类型" :span="2" >
|
||||
<span v-if="settleBillItem.settleType==1">现金账单</span>
|
||||
<span v-if="settleBillItem.settleType==2">月结账单</span>
|
||||
</el-descriptions-item>
|
||||
<!-- <el-descriptions-item label="月结编号" v-if="settleBillItem.settleType==2">{{ settleBillItem.custNo }}</el-descriptions-item> -->
|
||||
<el-descriptions-item label="月结客户" v-if="settleBillItem.settleType==2">{{ settleBillItem.custName }}</el-descriptions-item>
|
||||
<el-descriptions-item label="销售联系人">{{ settleBillItem.salesmen }}</el-descriptions-item>
|
||||
<el-descriptions-item label="回款联系人" :span="3" >{{ settleBillItem.payee }}</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="账单月份">{{ settleBillItem.billMonth }}</el-descriptions-item>
|
||||
<el-descriptions-item label="总票数">{{ settleBillItem.sendPieceSum }}</el-descriptions-item>
|
||||
<el-descriptions-item label="总件数">{{ settleBillItem.pieceNumber }}</el-descriptions-item>
|
||||
<el-descriptions-item label="结算重量" >{{ settleBillItem.feeWeight }}</el-descriptions-item>
|
||||
|
||||
|
||||
<el-descriptions-item label="应收金额"><span style="color:blue">￥{{ settleBillItem.recMoney }}</span></el-descriptions-item>
|
||||
<el-descriptions-item label="已收金额"><span style="color:red">￥{{ settleBillItem.recedMoney }}</span></el-descriptions-item>
|
||||
<el-descriptions-item label="退款金额" :span="2" >￥{{ settleBillItem.refundMoney }}</el-descriptions-item>
|
||||
|
||||
|
||||
<el-descriptions-item label="理赔金额">￥{{ settleBillItem.satisfyMoney }}</el-descriptions-item>
|
||||
<el-descriptions-item label="理赔原因" :span="3">{{ settleBillItem.satisfyReason }}</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="折让金额">￥{{ settleBillItem.allowanceMoney }}</el-descriptions-item>
|
||||
<el-descriptions-item label="折让原因" :span="3">{{ settleBillItem.allowanceReason }}</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="抵扣金额">￥{{ settleBillItem.deductionMoney }}</el-descriptions-item>
|
||||
<el-descriptions-item label="抵扣原因" :span="3">{{ settleBillItem.deductionReason }}</el-descriptions-item>
|
||||
|
||||
<el-descriptions-item label="其他费用">￥{{ settleBillItem.otherMoney }}</el-descriptions-item>
|
||||
<el-descriptions-item label="其他原因" :span="3">{{ settleBillItem.otherReason }}</el-descriptions-item>
|
||||
|
||||
</el-descriptions>
|
||||
</div>
|
||||
@ -62,25 +81,24 @@
|
||||
<!-- 标准费用:<span>￥{{scope.row.waybillDetail.realFee}}</span> -->
|
||||
<el-table-column type="expand">
|
||||
<template slot-scope="scope">
|
||||
<div style="padding: 8px 50px;background:white">
|
||||
<div style="display:inline-flex;padding: 15px 0px;" >
|
||||
<div style="font-weight:500;margin-right:20px">总费用(CNY):<span>￥{{scope.row.billFee}}</span> </div>
|
||||
<div>
|
||||
<el-button
|
||||
type="text"
|
||||
size="mini"
|
||||
style="padding: 2px 10px;font-size: 13px;border: 1px solid #e1e1e1;"
|
||||
@click="handleShowTraceInfo(scope.row)"
|
||||
>运单详情</el-button>
|
||||
<div style="padding: 8px 50px;background: white;">
|
||||
<div style="display:inline-flex;padding: 15px 0px;" >
|
||||
<div style="font-weight:500">总费用(CNY):<span>{{scope.row.billFee}}</span></div>
|
||||
<div>
|
||||
<el-button
|
||||
type="text"
|
||||
size="mini"
|
||||
style="padding: 2px 10px;font-size: 13px;border: 1px solid #e1e1e1;"
|
||||
@click="handleShowTraceInfo(scope.row)"
|
||||
>运单详情</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="font-weight:500;margin-bottom:20px">费用备注:<span>{{scope.row.waybillDetail.feeRemark}}</span></div>
|
||||
<div style="font-weight:500">费用备注:<span>{{scope.row.waybillDetail.feeRemark}}</span></div>
|
||||
|
||||
<div style="width: 500px;">
|
||||
<BillFeeListPanel :key="'feeitem_'+scope.$index" :feeitemList="scope.row.feeitemList"></BillFeeListPanel>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div style="width: 500px;">
|
||||
<BillFeeListPanel :key="'feeitem_'+scope.$index" :feeitemList="scope.row.feeitemList"></BillFeeListPanel>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" />
|
||||
@ -198,6 +216,11 @@
|
||||
|
||||
</XdTable>
|
||||
|
||||
|
||||
<el-dialog :title="openTraceInfoTitle" :visible.sync="openTraceInfo" width="80%" :close-on-click-modal="false" v-dialogDrag append-to-body>
|
||||
<TraceWaybillDetailView :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
|
||||
</el-dialog>
|
||||
|
||||
</XdPageContainer>
|
||||
</template>
|
||||
|
||||
@ -294,6 +317,8 @@ export default {
|
||||
|
||||
settleBillItem:null,
|
||||
|
||||
|
||||
|
||||
currentId:null,
|
||||
openForm: false,
|
||||
titleForm: "",
|
||||
@ -304,6 +329,12 @@ export default {
|
||||
|
||||
currentSettleBillNo:null,
|
||||
|
||||
openTraceInfo:false,
|
||||
openTraceInfoTitle:null,
|
||||
currentTraceBillItem:null,
|
||||
currentTraceBillCode:null,
|
||||
|
||||
|
||||
// 弹出展示层
|
||||
id:null,
|
||||
titleView:"",
|
||||
@ -385,6 +416,12 @@ export default {
|
||||
this.loading = false;
|
||||
});
|
||||
},
|
||||
handleShowTraceInfo(row){
|
||||
this.openTraceInfoTitle="运单详情【"+row.billCode+"】";
|
||||
this.currentTraceBillCode=row.billCode;
|
||||
this.currentTraceBillItem=row.waybillDetail;
|
||||
this.openTraceInfo=true;
|
||||
},
|
||||
getList(row, column, event) {
|
||||
this.loading = true;
|
||||
this.queryParams.settleBillNo=this.settleBillNo
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<div>
|
||||
<XdTable v-loading="loading"
|
||||
border stripe
|
||||
size="mini"
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
<div >
|
||||
<el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
|
||||
<el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
|
||||
<el-col :span="24">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="" prop="recType" label-width="100px">
|
||||
<span slot="label">
|
||||
<span style="color: red">收退款类型</span>
|
||||
@ -13,6 +13,17 @@
|
||||
</el-radio-group>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<span style="font-size: 14px;font-weight: 500;color: #000000;">
|
||||
已收款:<span style="color: blue;">{{ settleBillItem.recedMoney }}</span>
|
||||
待收款:<span style="color: red;">{{ settleBillItem.recMoney-settleBillItem.recedMoney }}</span>
|
||||
</span>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<span v-if="settleBillItem.settleType==1">现金账单</span>
|
||||
<span v-if="settleBillItem.settleType==2">月结账单</span>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="6">
|
||||
<el-form-item label="账单编号" prop="settleBillNo">
|
||||
<el-input v-model="form.settleBillNo" disabled />
|
||||
@ -29,10 +40,16 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="应收金额" prop="recMoney">
|
||||
<el-form-item label="应收款" prop="recMoney">
|
||||
<el-input v-model="settleBillItem.recMoney" disabled />
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<!-- <el-col :span="6">
|
||||
<el-form-item label="已款" prop="recedMoney">
|
||||
<el-input v-model="settleBillItem.recedMoney" disabled />
|
||||
</el-form-item>
|
||||
</el-col> -->
|
||||
<!--
|
||||
<el-col :span="6">
|
||||
<el-form-item label="账单月份" prop="billMonth">
|
||||
@ -228,6 +245,21 @@
|
||||
<el-input v-model="form.refundMoney" placeholder="" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6" v-if="form.recType==2">
|
||||
<el-form-item label="退款时间" prop="refundDate">
|
||||
<span slot="label">
|
||||
<span style="color: red">退款时间</span>
|
||||
</span>
|
||||
<el-date-picker clearable
|
||||
v-model="form.refundDate"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="请选择退款日期"
|
||||
style="width:100%"
|
||||
>
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6" v-if="form.recType==2">
|
||||
|
||||
<el-form-item label="退款原因" prop="refundReason">
|
||||
@ -422,11 +454,19 @@ export default {
|
||||
// } else {
|
||||
|
||||
// }
|
||||
this.form.tradeDate = this.form.tradeDate + " 00:00:00";
|
||||
addEmisSettlePayRecord(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.$emit("on-changed");
|
||||
});
|
||||
if(this.form.tradeDate){
|
||||
this.form.tradeDate = this.form.tradeDate + " 00:00:00";
|
||||
}
|
||||
|
||||
if(this.form.refundDate){
|
||||
this.form.refundDate = this.form.refundDate + " 00:00:00";
|
||||
}
|
||||
|
||||
|
||||
addEmisSettlePayRecord(this.form).then(response => {
|
||||
this.$modal.msgSuccess("新增成功");
|
||||
this.$emit("on-changed");
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
@ -13,18 +13,17 @@
|
||||
@sort-change="handleSortChange"
|
||||
>
|
||||
|
||||
|
||||
<el-table-column :label="$t('支付流水号')" align="center" prop="payId" width="170" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('交易时间')" align="center" prop="tradeDate" width="170" :show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('流水号')" align="center" prop="payId" width="170" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('收款来源')" align="center" prop="settleType" width="80" >
|
||||
<template slot-scope="scope">
|
||||
<el-tag type="success" v-if="scope.row.settleType == '1'">月结收款</el-tag>
|
||||
<el-tag type="success" v-if="scope.row.settleType == '2'">现金收款</el-tag>
|
||||
<span v-else>其他</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('缴款客户')" align="center" prop="payMan" min-width="100" />
|
||||
<el-table-column :label="$t('月结编号')" align="center" prop="payManCode" min-width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('支付类型')" align="center" prop="payType" min-width="100" >
|
||||
<el-table-column :label="$t('缴款客户')" align="center" prop="payMan" width="150" :show-overflow-tooltip="true" />
|
||||
<!-- <el-table-column :label="$t('月结编号')" align="center" prop="payManCode" width="100" :show-overflow-tooltip="true"/> -->
|
||||
<el-table-column :label="$t('支付类型')" align="center" prop="payType" width="100" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.payType == '1'">微信支付</span>
|
||||
<span v-if="scope.row.payType == '2'">支付宝支付</span>
|
||||
@ -34,23 +33,38 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column :label="$t('收付类型')" align="center" prop="recType" min-width="100" >
|
||||
<el-table-column :label="$t('收付类型')" align="center" prop="recType" width="80" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.recType == '1'">收款</span>
|
||||
<span v-if="scope.row.recType == '2'">退款</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('支付金额')" align="center" prop="payMoney" min-width="100" />
|
||||
<el-table-column :label="$t('支付状态')" align="center" prop="payStatus" min-width="100" >
|
||||
<el-table-column :label="$t('支付状态')" align="center" prop="payStatus" width="100" >
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.payStatus == '0'">未支付</span>
|
||||
<span v-if="scope.row.payStatus == '1'">已支付</span>
|
||||
<span v-if="scope.row.payStatus == '2'">支付异常</span>
|
||||
<el-tag type="info" v-if="scope.row.payStatus == '0' || scope.row.payStatus==null">未支付</el-tag>
|
||||
<el-tag type="warning" v-if="scope.row.payStatus == '1'">支付中</el-tag>
|
||||
<el-tag type="warning" v-if="scope.row.payStatus == '2'">支付成功</el-tag>
|
||||
<el-tag type="error" v-if="scope.row.payStatus == '3'">支付失败 </el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="$t('异常描述')" align="center" prop="payStatusDesc" min-width="100" />
|
||||
<el-table-column :label="$t('交易时间')" align="center" prop="tradeDate" min-width="170" />
|
||||
<el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
|
||||
<el-table-column :label="$t('失败原因')" align="center" prop="payStatusDesc" width="100" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('支付金额')" align="center" prop="payMoney" width="100" />
|
||||
|
||||
<el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('折让金额')" align="center" prop="allowanceMoney" width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('其他收费')" align="center" prop="otherMoney" width="100" :show-overflow-tooltip="true"/>
|
||||
|
||||
<el-table-column :label="$t('理赔原因')" align="center" prop="satisfyReason" width="100" :show-overflow-tooltip="true" />
|
||||
<el-table-column :label="$t('折让原因')" align="center" prop="allowanceReason" width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('抵扣原因')" align="center" prop="deductionReason" width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column :label="$t('其他原因')" align="center" prop="otherReason" width="100" :show-overflow-tooltip="true" />
|
||||
|
||||
<el-table-column :label="$t('备注')" align="center" prop="remark" width="100" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="登记人" align="center" prop="createByName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="登记网点" align="center" prop="createSiteName" width="80" :show-overflow-tooltip="true"/>
|
||||
<el-table-column label="登记时间" align="center" prop="createTime" width="170"/>
|
||||
|
||||
</el-table>
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user