Browse Source

加退款以及多语言

zhangyong/feature-20260113094820-现金重构
ZhangYong 1 month ago
parent
commit
78cea9064d
  1. 4
      src/components/locales/lang/en.js
  2. 4
      src/components/locales/lang/zh-CN.js
  3. 77
      src/views/moneyManage/financialAccount/cashFlow.vue

4
src/components/locales/lang/en.js

@ -530,6 +530,10 @@ export default {
disable: "Disable", disable: "Disable",
received: "Received", received: "Received",
rejected: "Rejected", rejected: "Rejected",
refunded: "Refunded",
refundDetail: "Refund Detail",
refundAmount: "Refund Amt",
refundCurrency: "Refund Curr",
}, },
// Common Export Fields // Common Export Fields
common_export: { common_export: {

4
src/components/locales/lang/zh-CN.js

@ -530,6 +530,10 @@ export default {
disable: "禁用", disable: "禁用",
received: "已到账", received: "已到账",
rejected: "已驳回", rejected: "已驳回",
refunded: "已退款",
refundDetail: "退款明细",
refundAmount: "退款金额",
refundCurrency: "退款币种",
}, },
// 通用导出字段组 // 通用导出字段组
common_export: { common_export: {

77
src/views/moneyManage/financialAccount/cashFlow.vue

@ -34,7 +34,7 @@ const payPlatformOptions = ref([...paytypeList])
const statusOptions = [ const statusOptions = [
{ label: t('common_list.received'), value: 4 }, { label: t('common_list.received'), value: 4 },
{ label: t('common_list.rejected'), value: 6 }
{ label: t('common_list.refunded'), value: 6 }
] ]
// //
@ -448,11 +448,40 @@ onMounted(async () => {
<el-table-column prop="payType" :label="t('common_list.payModel')" width="120" align="center" /> <el-table-column prop="payType" :label="t('common_list.payModel')" width="120" align="center" />
<el-table-column prop="payTime" :label="t('common_list.payTime2')" width="180" align="center" /> <el-table-column prop="payTime" :label="t('common_list.payTime2')" width="180" align="center" />
<el-table-column prop="status" :label="t('common_list.status')" width="100" align="center" fixed="right">
<el-table-column prop="status" :label="t('common_list.status')" width="120" align="center" fixed="right">
<template #default="{ row }"> <template #default="{ row }">
<div style="display: flex; align-items: center;">
<el-tag :type="row.status === 4 ? 'success' : 'warning'" effect="plain"> <el-tag :type="row.status === 4 ? 'success' : 'warning'" effect="plain">
{{ row.status === 4 ? t('common_list.received') : t('common_list.rejected') }}
{{ row.status === 4 ? t('common_list.received') : t('common_list.refunded') }}
</el-tag> </el-tag>
<el-popover
v-model:visible="row.popoverVisible"
trigger="hover"
placement="top"
popper-class="refund-popover"
width="auto"
v-if="row.status === 6"
>
<div class="popover-content">
<div class="popover-title">{{ t('common_list.refundDetail') }}</div>
<div class="popover-item">
<span class="label">{{ t('common_list.refundAmount') }}</span>
<span class="value">{{ row.refundAmount || '-' }}</span>
</div>
<div class="popover-item">
<span class="label">{{ t('common_list.refundCurrency') }}</span>
<span class="value">{{ row.refundCurrency || '-' }}</span>
</div>
</div>
<template #reference>
<img
@click.stop
src="@/assets/SvgIcons/consume.svg"
style="width: 15px; height: 15px; margin-left: 5px; cursor: pointer; display: inline-block;"
>
</template>
</el-popover>
</div>
</template> </template>
</el-table-column> </el-table-column>
@ -630,7 +659,49 @@ onMounted(async () => {
</div> </div>
</template> </template>
<style lang="scss">
.refund-popover {
background-color: #EEF5FE !important;
border: none !important;
padding: 12px !important;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
width: 100px;
min-width: none;
.el-popper__arrow::before {
background-color: #EEF5FE !important;
border-color: #EEF5FE !important;
}
}
</style>
<style scoped lang="scss"> <style scoped lang="scss">
.popover-content {
.popover-title {
color: #409EFF;
font-weight: bold;
font-size: 14px;
margin-bottom: 8px;
}
.popover-item {
display: flex;
font-size: 13px;
color: #606266;
margin-bottom: 4px;
&:last-child {
margin-bottom: 0;
}
.label {
color: #606266;
}
.value {
color: #606266;
margin-left: 4px;
}
}
}
.cash-flow-container { .cash-flow-container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

Loading…
Cancel
Save