Compare commits

...

4 Commits

Author SHA1 Message Date
ZhangYong 9cd27400df 流水账页面序号问题 3 weeks ago
ZhangYong cf3869aa06 支付方式顺序修改 3 weeks ago
ZhangYong ec9dcffc53 活动加搜索 3 weeks ago
ZhangYong 778754bfe4 优化2.0,需求1 3 weeks ago
  1. 84
      src/components/MoneyManage/ProductSelect.vue
  2. 22
      src/components/locales/lang/en.js
  3. 22
      src/components/locales/lang/zh-CN.js
  4. 103
      src/views/moneyManage/financialAccount/cashFlow.vue
  5. 6
      src/views/moneyManage/financialAccount/performanceAttribution.vue
  6. 26
      src/views/moneyManage/receiveDetail/receiveFinance.vue
  7. 26
      src/views/moneyManage/receiveDetail/receiveManage.vue
  8. 45
      src/views/moneyManage/receiveDetail/receiveService.vue
  9. 26
      src/views/moneyManage/refundDetail/refundService.vue

84
src/components/MoneyManage/ProductSelect.vue

@ -82,9 +82,15 @@
<div class="checktxt">{{ t('cash.other') }}</div> <div class="checktxt">{{ t('cash.other') }}</div>
<hr class="line"> <hr class="line">
<el-radio-group v-model="selectedValue"> <el-radio-group v-model="selectedValue">
<el-radio v-for="ai in InfoFee" :key="ai" :label="ai" :value="ai">
<div v-for="ai in InfoFee" :key="ai" class="radio-wrapper">
<el-radio class="radio" :value="ai" @click="handleClick(ai)">
{{ ai }} {{ ai }}
</el-radio> </el-radio>
<div v-if="showPanel&&ai==t('cash.HC')" class="cascader-panel" @click.stop>
<el-cascader-panel :options="cascaderOptions" :value="cascaderValue"
@change="handlePanelChange" />
</div>
</div>
</el-radio-group> </el-radio-group>
</div> </div>
</div> </div>
@ -134,6 +140,7 @@ const selectedValue = ref('')
watch(selectedValue, (newVal) => { watch(selectedValue, (newVal) => {
emit('update:modelValue', newVal ? newVal : ''); emit('update:modelValue', newVal ? newVal : '');
console.log('更新父组件', newVal);
selectedItem.value = newVal || ''; selectedItem.value = newVal || '';
}); });
@ -158,6 +165,56 @@ const InfoFee = [
t('cash.BGmember'), t('cash.BGmember'),
t('cash.HC') t('cash.HC')
] ]
const showPanel = ref(false)
const handleClick = (ai) => {
if (ai == t('cash.HC')) {
showPanel.value = true
}
}
const cascaderValue = ref([])
const handlePanelChange = (val) => {
selectedValue.value = val[val.length - 1]
showPanel.value = false //
console.log('selectedValue.value', selectedValue.value);
}
//
const cascaderOptions = [
{
value: 'realTime',
label: t('cash.aiService.realTime'),
children: [
{ value: t('cash.aiService.HCInfoFeeRealTimeUS'), label: t('cash.softwareMenu.usStock') },
{ value: t('cash.aiService.HCInfoFeeRealTimeHK'), label: t('cash.softwareMenu.hkStock') },
{ value: t('cash.aiService.HCInfoFeeRealTimeAStock'), label: t('cash.softwareMenu.aStock') },
{ value: t('cash.aiService.HCInfoFeeRealTimeSingaporeStock'), label: t('cash.softwareMenu.singaporeStock') },
{ value: t('cash.aiService.HCInfoFeeRealTimeJapanStock'), label: t('cash.softwareMenu.japanStock') },
{ value: t('cash.aiService.HCInfoFeeRealTimeThailandStock'), label: t('cash.softwareMenu.thailandStock') },
{ value: t('cash.aiService.HCInfoFeeRealTimeVietnamStock'), label: t('cash.softwareMenu.vietnamStock') },
{ value: t('cash.aiService.HCInfoFeeRealTimeIndonesiaStock'), label: t('cash.softwareMenu.indonesiaStock') },
{ value: t('cash.aiService.HCInfoFeeRealTimeKoreaStock'), label: t('cash.softwareMenu.koreaStock') },
{ value: t('cash.aiService.HCInfoFeeRealTimeTaiwanStock'), label: t('cash.softwareMenu.taiwanStock') }
]
},
{
value: 'delayed',
label: t('cash.aiService.delayed'),
children: [
{ value: t('cash.aiService.HCInfoFeeDelayUS'), label: t('cash.softwareMenu.usStock') },
{ value: t('cash.aiService.HCInfoFeeDelayHK'), label: t('cash.softwareMenu.hkStock') },
{ value: t('cash.aiService.HCInfoFeeDelayAStock'), label: t('cash.softwareMenu.aStock') },
{ value: t('cash.aiService.HCInfoFeeDelaySingaporeStock'), label: t('cash.softwareMenu.singaporeStock') },
{ value: t('cash.aiService.HCInfoFeeDelayJapanStock'), label: t('cash.softwareMenu.japanStock') },
{ value: t('cash.aiService.HCInfoFeeDelayThailandStock'), label: t('cash.softwareMenu.thailandStock') },
{ value: t('cash.aiService.HCInfoFeeDelayVietnamStock'), label: t('cash.softwareMenu.vietnamStock') },
{ value: t('cash.aiService.HCInfoFeeDelayIndonesiaStock'), label: t('cash.softwareMenu.indonesiaStock') },
{ value: t('cash.aiService.HCInfoFeeDelayKoreaStock'), label: t('cash.softwareMenu.koreaStock') },
{ value: t('cash.aiService.HCInfoFeeDelayTaiwanStock'), label: t('cash.softwareMenu.taiwanStock') }
]
}
]
// 使menuData // 使menuData
const menuData = [ const menuData = [
{ {
@ -375,9 +432,8 @@ defineExpose({ resetSelect });
position: absolute; position: absolute;
top: 100%; top: 100%;
left: 0; left: 0;
width: 160%;
width: 200%;
max-height: 700px; max-height: 700px;
overflow-y: auto;
min-height: 200px; min-height: 200px;
display: flex; display: flex;
padding: 10px; padding: 10px;
@ -457,6 +513,28 @@ defineExpose({ resetSelect });
.ai { .ai {
width: 100%; width: 100%;
.radio-wrapper {
position: relative;
display: inline-block;
margin-right: 32px;
.radio {
margin-right: 0;
}
.cascader-panel {
position: absolute;
top: -36px;
left: 100px;
z-index: 1000;
border: 1px solid #e6e6e6;
border-radius: 4px;
background: #E4F0FC;
margin-bottom: 10px;
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
}
}
} }
.marketprodut { .marketprodut {

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

@ -1128,6 +1128,28 @@ export default {
superCompass: "Super Compass", superCompass: "Super Compass",
aiDetectionTool: "AI Detector", aiDetectionTool: "AI Detector",
superDetectionTool: "Super Detector", superDetectionTool: "Super Detector",
realTime: "Real Time",
delayed: "Delay",
HCInfoFeeRealTimeUS: "HC Info Fee - Real Time - US Stock",
HCInfoFeeRealTimeHK: "HC Info Fee - Real Time - HK Stock",
HCInfoFeeRealTimeAStock: "HC Info Fee - Real Time - A Stock",
HCInfoFeeRealTimeSingaporeStock: "HC Info Fee - Real Time - Singapore Stock",
HCInfoFeeRealTimeJapanStock: "HC Info Fee - Real Time - Japan Stock",
HCInfoFeeRealTimeThailandStock: "HC Info Fee - Real Time - Thailand Stock",
HCInfoFeeRealTimeVietnamStock: "HC Info Fee - Real Time - Vietnam Stock",
HCInfoFeeRealTimeIndonesiaStock: "HC Info Fee - Real Time - Indonesia Stock",
HCInfoFeeRealTimeKoreaStock: "HC Info Fee - Real Time - Korea Stock",
HCInfoFeeRealTimeTaiwanStock: "HC Info Fee - Real Time - Taiwan Stock",
HCInfoFeeDelayUS: "HC Info Fee - Delay - US Stock",
HCInfoFeeDelayHK: "HC Info Fee - Delay - HK Stock",
HCInfoFeeDelayAStock: "HC Info Fee - Delay - A Stock",
HCInfoFeeDelaySingaporeStock: "HC Info Fee - Delay - Singapore Stock",
HCInfoFeeDelayJapanStock: "HC Info Fee - Delay - Japan Stock",
HCInfoFeeDelayThailandStock: "HC Info Fee - Delay - Thailand Stock",
HCInfoFeeDelayVietnamStock: "HC Info Fee - Delay - Vietnam Stock",
HCInfoFeeDelayIndonesiaStock: "HC Info Fee - Delay - Indonesia Stock",
HCInfoFeeDelayKoreaStock: "HC Info Fee - Delay - Korea Stock",
HCInfoFeeDelayTaiwanStock: "HC Info Fee - Delay - Taiwan Stock",
}, },
markets: { markets: {
HongKong: "Hong Kong", HongKong: "Hong Kong",

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

@ -1141,6 +1141,28 @@ export default {
superCompass: "超级机构罗盘", superCompass: "超级机构罗盘",
aiDetectionTool: "AI机构探测神器", aiDetectionTool: "AI机构探测神器",
superDetectionTool: "超级机构探测神器", superDetectionTool: "超级机构探测神器",
realTime: "实时",
delayed: "延时",
HCInfoFeeRealTimeUS: "HC信息费-实时-美股",
HCInfoFeeRealTimeHK: "HC信息费-实时-港股",
HCInfoFeeRealTimeAStock: "HC信息费-实时-A股",
HCInfoFeeRealTimeSingaporeStock: "HC信息费-实时-新加坡股",
HCInfoFeeRealTimeJapanStock: "HC信息费-实时-日本股",
HCInfoFeeRealTimeThailandStock: "HC信息费-实时-泰国股",
HCInfoFeeRealTimeVietnamStock: "HC信息费-实时-越南股",
HCInfoFeeRealTimeIndonesiaStock: "HC信息费-实时-印尼股",
HCInfoFeeRealTimeKoreaStock: "HC信息费-实时-韩国股",
HCInfoFeeRealTimeTaiwanStock: "HC信息费-实时-台湾股",
HCInfoFeeDelayUS: "HC信息费-延时-美股",
HCInfoFeeDelayHK: "HC信息费-延时-港股",
HCInfoFeeDelayAStock: "HC信息费-延时-A股",
HCInfoFeeDelaySingaporeStock: "HC信息费-延时-新加坡股",
HCInfoFeeDelayJapanStock: "HC信息费-延时-日本股",
HCInfoFeeDelayThailandStock: "HC信息费-延时-泰国股",
HCInfoFeeDelayVietnamStock: "HC信息费-延时-越南股",
HCInfoFeeDelayIndonesiaStock: "HC信息费-延时-印尼股",
HCInfoFeeDelayKoreaStock: "HC信息费-延时-韩国股",
HCInfoFeeDelayTaiwanStock: "HC信息费-延时-台湾股",
}, },
// 市场 // 市场
markets: { markets: {

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

@ -18,19 +18,19 @@ const { t } = useI18n()
const route = useRoute() const route = useRoute()
const paytypeList = [ const paytypeList = [
t('cash.payMethods.stripe'),
t('cash.payMethods.paymentAsia'),
t('cash.payMethods.ipay88'),
t('cash.payMethods.bankTransfer'),
t('cash.payMethods.card'),
t('cash.payMethods.cash'),
t('cash.payMethods.check'),
t('cash.payMethods.grabpay'),
t('cash.payMethods.nets'),
t('cash.payMethods.transfer'),
t('cash.payMethods.paypal'),
t('cash.payMethods.stripe2'),
t('cash.payMethods.paysolution'),
t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.stripe2'), // Stripe2
t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.grabpay'), // Grabpay
t('cash.payMethods.nets'), // Nets
t('cash.payMethods.transfer'), // E-Transfer
t('cash.payMethods.paypal'), // PayPal
t('cash.payMethods.paysolution'), // Paysolution
t('cash.payMethods.bankTransfer'),//
t('cash.payMethods.card'), //
t('cash.payMethods.cash'), //
t('cash.payMethods.check'), //
] ]
const payPlatformOptions = ref([...paytypeList]) const payPlatformOptions = ref([...paytypeList])
@ -108,13 +108,13 @@ const fetchData = async () => {
pageSize: queryParams.pageSize, pageSize: queryParams.pageSize,
fundsDTO: { fundsDTO: {
jwcode: queryParams.jwcode, jwcode: queryParams.jwcode,
localMarket:queryParams.markets,
localMarket: queryParams.markets,
startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '', startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '',
endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '', endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '',
payType: normalizePayType(queryParams.payType || ''), payType: normalizePayType(queryParams.payType || ''),
orderCode: queryParams.orderCode, orderCode: queryParams.orderCode,
statuses: formatStatuses(queryParams.statuses), statuses: formatStatuses(queryParams.statuses),
markets:[],
markets: [],
} }
} }
@ -254,25 +254,25 @@ const handleExport = async () => {
} }
// 3 // 3
return statuses; return statuses;
};
};
try { try {
const params = { const params = {
pageNum: queryParams.pageNum, pageNum: queryParams.pageNum,
pageSize: queryParams.pageSize, pageSize: queryParams.pageSize,
fundsDTO: { fundsDTO: {
jwcode: queryParams.jwcode, jwcode: queryParams.jwcode,
localMarket:queryParams.markets,
localMarket: queryParams.markets,
startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '', startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '',
endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '', endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '',
payType: normalizePayType(queryParams.payType || ''), payType: normalizePayType(queryParams.payType || ''),
orderCode: queryParams.orderCode, orderCode: queryParams.orderCode,
statuses: formatStatuses(queryParams.statuses), statuses: formatStatuses(queryParams.statuses),
markets:[],
markets: [],
} }
} }
// TODO: URL // TODO: URL
const res = await exportFunds( params )
const res = await exportFunds(params)
if (res.code == 200) { if (res.code == 200) {
console.log('导出参数', params) console.log('导出参数', params)
@ -402,16 +402,9 @@ onMounted(async () => {
<div class="search-item"> <div class="search-item">
<span class="label">{{ t('common.market') }}</span> <span class="label">{{ t('common.market') }}</span>
<!-- 下拉多选使用 el-cascader 匹配地区树结构 --> <!-- 下拉多选使用 el-cascader 匹配地区树结构 -->
<el-cascader
v-model="queryParams.markets"
:options="marketOptions"
:props="{ multiple: true, emitPath: false }"
collapse-tags
collapse-tags-tooltip
:placeholder="t('common.marketPlaceholder')"
clearable
style="width: 220px;"
/>
<el-cascader v-model="queryParams.markets" :options="marketOptions"
:props="{ multiple: true, emitPath: false }" collapse-tags collapse-tags-tooltip
:placeholder="t('common.marketPlaceholder')" clearable style="width: 220px;" />
</div> </div>
<div class="search-item"> <div class="search-item">
<span class="label">{{ t('common.payPlatform1') }}</span> <span class="label">{{ t('common.payPlatform1') }}</span>
@ -432,15 +425,9 @@ onMounted(async () => {
<div class="search-item" style="width: auto;"> <div class="search-item" style="width: auto;">
<span class="label">{{ t('common.payTime2') }}</span> <span class="label">{{ t('common.payTime2') }}</span>
<el-date-picker
v-model="queryParams.timeRange"
type="datetimerange"
:range-separator="t('common.to')"
:start-placeholder="t('common.startTime')"
:end-placeholder="t('common.endTime')"
:default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
style="width: 350px;"
/>
<el-date-picker v-model="queryParams.timeRange" type="datetimerange" :range-separator="t('common.to')"
:start-placeholder="t('common.startTime')" :end-placeholder="t('common.endTime')"
:default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]" style="width: 350px;" />
</div> </div>
<div class="search-btn-group"> <div class="search-btn-group">
<el-button type="primary" @click="handleSearch">{{ t('common.search') }}</el-button> <el-button type="primary" @click="handleSearch">{{ t('common.search') }}</el-button>
@ -455,8 +442,14 @@ onMounted(async () => {
<!-- 表格区域 --> <!-- 表格区域 -->
<el-card class="table-card"> <el-card class="table-card">
<el-table :data="tableData" v-loading="loading" style="width: 100%; flex: 1;" :cell-style="{ textAlign: 'center' }" :header-cell-style="{ background: '#F3FAFE', color: '#333',textAlign: 'center' }">
<el-table-column type="index" :label="t('common_list.id')" width="60" align="center" fixed="left" />
<el-table :data="tableData" v-loading="loading" style="width: 100%; flex: 1;"
:cell-style="{ textAlign: 'center' }"
:header-cell-style="{ background: '#F3FAFE', color: '#333', textAlign: 'center' }">
<el-table-column type="index" :label="t('common_list.id')" width="60" align="center" fixed="left">
<template #default="scope">
<span>{{ scope.$index + 1 + (queryParams.pageNum - 1) * queryParams.pageSize }}</span>
</template>
</el-table-column>
<el-table-column prop="jwcode" :label="t('common_list.jwcode')" width="120" fixed="left" /> <el-table-column prop="jwcode" :label="t('common_list.jwcode')" width="120" fixed="left" />
<el-table-column prop="name" :label="t('common_list.name')" width="150" show-overflow-tooltip /> <el-table-column prop="name" :label="t('common_list.name')" width="150" show-overflow-tooltip />
<el-table-column prop="marketName" :label="t('common_list.market')" width="120" show-overflow-tooltip /> <el-table-column prop="marketName" :label="t('common_list.market')" width="120" show-overflow-tooltip />
@ -467,14 +460,16 @@ onMounted(async () => {
{{ row.paymentAmount }} {{ row.paymentCurrency }} {{ row.paymentAmount }} {{ row.paymentCurrency }}
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column prop="paymentCurrencyName" :label="t('common_list.payCurrency')" width="120" show-overflow-tooltip />
<el-table-column prop="paymentCurrencyName" :label="t('common_list.payCurrency')" width="120"
show-overflow-tooltip />
<el-table-column prop="receivedAmount" :label="t('common_list.receiveAmount')" width="150" align="right"> <el-table-column prop="receivedAmount" :label="t('common_list.receiveAmount')" width="150" align="right">
<!-- <template #default="{ row }"> <!-- <template #default="{ row }">
{{ row.receivedAmount }} {{ row.receivedCurrency }} {{ row.receivedAmount }} {{ row.receivedCurrency }}
</template> --> </template> -->
</el-table-column> </el-table-column>
<el-table-column prop="receivedCurrencyName" :label="t('common_list.receiveCurrency')" width="120" show-overflow-tooltip />
<el-table-column prop="receivedCurrencyName" :label="t('common_list.receiveCurrency')" width="120"
show-overflow-tooltip />
<el-table-column prop="handlingCharge" :label="t('common_list.fee')" width="100" align="right" /> <el-table-column prop="handlingCharge" :label="t('common_list.fee')" width="100" align="right" />
<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" />
@ -486,13 +481,8 @@ onMounted(async () => {
<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.refunded') }} {{ row.status === 4 ? t('common_list.received') : t('common_list.refunded') }}
</el-tag> </el-tag>
<el-popover
trigger="hover"
placement="top"
popper-class="refund-popover"
width="auto"
v-if="row.status === 6"
>
<el-popover trigger="hover" placement="top" popper-class="refund-popover" width="auto"
v-if="row.status === 6">
<div class="popover-content"> <div class="popover-content">
<div class="popover-title">{{ t('common_list.refundDetail') }}</div> <div class="popover-title">{{ t('common_list.refundDetail') }}</div>
<div class="popover-item"> <div class="popover-item">
@ -505,11 +495,8 @@ onMounted(async () => {
</div> </div>
</div> </div>
<template #reference> <template #reference>
<img
@click.stop
src="@/assets/SvgIcons/consume.svg"
style="width: 15px; height: 15px; margin-left: 5px; cursor: pointer; display: inline-block;"
>
<img @click.stop src="@/assets/SvgIcons/consume.svg"
style="width: 15px; height: 15px; margin-left: 5px; cursor: pointer; display: inline-block;">
</template> </template>
</el-popover> </el-popover>
</div> </div>
@ -700,6 +687,7 @@ onMounted(async () => {
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
width: 100px; width: 100px;
min-width: none; min-width: none;
.el-popper__arrow::before { .el-popper__arrow::before {
background-color: #EEF5FE !important; background-color: #EEF5FE !important;
border-color: #EEF5FE !important; border-color: #EEF5FE !important;
@ -707,14 +695,14 @@ onMounted(async () => {
} }
</style> </style>
<style scoped lang="scss"> <style scoped lang="scss">
.popover-content {
.popover-content {
.popover-title { .popover-title {
color: #409EFF; color: #409EFF;
font-weight: bold; font-weight: bold;
font-size: 14px; font-size: 14px;
margin-bottom: 8px; margin-bottom: 8px;
} }
.popover-item { .popover-item {
display: flex; display: flex;
font-size: 13px; font-size: 13px;
@ -724,15 +712,18 @@ onMounted(async () => {
&:last-child { &:last-child {
margin-bottom: 0; margin-bottom: 0;
} }
.label { .label {
color: #606266; color: #606266;
} }
.value { .value {
color: #606266; color: #606266;
margin-left: 4px; margin-left: 4px;
} }
} }
} }
.cash-flow-container { .cash-flow-container {
display: flex; display: flex;
flex-direction: column; flex-direction: column;

6
src/views/moneyManage/financialAccount/performanceAttribution.vue

@ -313,7 +313,11 @@ onMounted( async() => {
<!-- 表格区域 --> <!-- 表格区域 -->
<el-card class="table-card"> <el-card class="table-card">
<el-table :data="tableData" v-loading="loading" style="width: 100%; flex: 1;" :cell-style="{ textAlign: 'center' }" :header-cell-style="{ background: '#F3FAFE', color: '#333',textAlign: 'center' }"> <el-table :data="tableData" v-loading="loading" style="width: 100%; flex: 1;" :cell-style="{ textAlign: 'center' }" :header-cell-style="{ background: '#F3FAFE', color: '#333',textAlign: 'center' }">
<el-table-column type="index" :label="t('common_list.id')" min-width="60" align="center" fixed="left" />
<el-table-column type="index" :label="t('common_list.id')" min-width="60" align="center" fixed="left" >
<template #default="scope">
<span>{{ scope.$index + 1 + (queryParams.pageNum - 1) * queryParams.pageSize }}</span>
</template>
</el-table-column>
<el-table-column prop="jwcode" :label="t('common_list.jwcode')" min-width="120" fixed="left" /> <el-table-column prop="jwcode" :label="t('common_list.jwcode')" min-width="120" fixed="left" />
<el-table-column prop="name" :label="t('common_list.name')" min-width="150" show-overflow-tooltip /> <el-table-column prop="name" :label="t('common_list.name')" min-width="150" show-overflow-tooltip />
<el-table-column prop="marketName" :label="t('common_list.market')" min-width="120" show-overflow-tooltip /> <el-table-column prop="marketName" :label="t('common_list.market')" min-width="120" show-overflow-tooltip />

26
src/views/moneyManage/receiveDetail/receiveFinance.vue

@ -768,19 +768,19 @@ const customOptions = ref([
t('cash.currency.rmb'), // (CNY) t('cash.currency.rmb'), // (CNY)
]) ])
const paytypeList = [ const paytypeList = [
t('cash.payMethods.stripe'),
t('cash.payMethods.paymentAsia'),
t('cash.payMethods.ipay88'),
t('cash.payMethods.bankTransfer'),
t('cash.payMethods.card'),
t('cash.payMethods.cash'),
t('cash.payMethods.check'),
t('cash.payMethods.grabpay'),
t('cash.payMethods.nets'),
t('cash.payMethods.transfer'),
t('cash.payMethods.paypal'),
t('cash.payMethods.stripe2'),
t('cash.payMethods.paysolution'),
t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.stripe2'), // Stripe2
t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.grabpay'), // Grabpay
t('cash.payMethods.nets'), // Nets
t('cash.payMethods.transfer'), // E-Transfer
t('cash.payMethods.paypal'), // PayPal
t('cash.payMethods.paysolution'), // Paysolution
t('cash.payMethods.bankTransfer'),//
t('cash.payMethods.card'), //
t('cash.payMethods.cash'), //
t('cash.payMethods.check'), //
]; ];
const paytypeOptions = ref([...paytypeList]); const paytypeOptions = ref([...paytypeList]);

26
src/views/moneyManage/receiveDetail/receiveManage.vue

@ -768,19 +768,19 @@ const customOptions = ref([
t('cash.currency.rmb'), // (CNY) t('cash.currency.rmb'), // (CNY)
]) ])
const paytypeList = [ const paytypeList = [
t('cash.payMethods.stripe'),
t('cash.payMethods.paymentAsia'),
t('cash.payMethods.ipay88'),
t('cash.payMethods.bankTransfer'),
t('cash.payMethods.card'),
t('cash.payMethods.cash'),
t('cash.payMethods.check'),
t('cash.payMethods.grabpay'),
t('cash.payMethods.nets'),
t('cash.payMethods.transfer'),
t('cash.payMethods.paypal'),
t('cash.payMethods.stripe2'),
t('cash.payMethods.paysolution'),
t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.stripe2'), // Stripe2
t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.grabpay'), // Grabpay
t('cash.payMethods.nets'), // Nets
t('cash.payMethods.transfer'), // E-Transfer
t('cash.payMethods.paypal'), // PayPal
t('cash.payMethods.paysolution'), // Paysolution
t('cash.payMethods.bankTransfer'),//
t('cash.payMethods.card'), //
t('cash.payMethods.cash'), //
t('cash.payMethods.check'), //
]; ];
const paytypeOptions = ref([...paytypeList]); const paytypeOptions = ref([...paytypeList]);

45
src/views/moneyManage/receiveDetail/receiveService.vue

@ -213,12 +213,12 @@
</el-form-item> </el-form-item>
<el-form-item :label="t('common_add.activity')" required prop="activity"> <el-form-item :label="t('common_add.activity')" required prop="activity">
<el-select v-model="addFormData.activity" :placeholder="t('common_add.activityPlaceholder')" <el-select v-model="addFormData.activity" :placeholder="t('common_add.activityPlaceholder')"
clearable>
filterable clearable>
<el-option v-for="item in activityList" :key="item.id" :label="item.activityName" <el-option v-for="item in activityList" :key="item.id" :label="item.activityName"
:value="item.id" /> :value="item.id" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="t('common_add.productName')" required @change="ifGold" prop="goodsName">
<el-form-item :label="t('common_add.productName')" required prop="goodsName">
<ProductSelect ref="productSelectRef" v-model="addFormData.goodsName"></ProductSelect> <ProductSelect ref="productSelectRef" v-model="addFormData.goodsName"></ProductSelect>
</el-form-item> </el-form-item>
<el-form-item v-show="!isGold" :label="t('common_add.productNum')" required> <el-form-item v-show="!isGold" :label="t('common_add.productNum')" required>
@ -615,6 +615,7 @@ const ifGold = () => {
addFormData.value.goodNum = 0 addFormData.value.goodNum = 0
} else { } else {
isGold.value = false isGold.value = false
console.log('12312312',addFormData.value.goodsName);
numUnitList.value = [t('cash.unit'), t('cash.year'), t('cash.month')] numUnitList.value = [t('cash.unit'), t('cash.year'), t('cash.month')]
const selectItems = ref([ const selectItems = ref([
t('cash.aiService.aiTracking'), t('cash.aiService.aiTracking'),
@ -627,7 +628,27 @@ const ifGold = () => {
t('cash.aiService.superPulse'), t('cash.aiService.superPulse'),
t('cash.aiService.superCompass'), t('cash.aiService.superCompass'),
t('cash.aiService.aiDetectionTool'), t('cash.aiService.aiDetectionTool'),
t('cash.aiService.superDetectionTool')
t('cash.aiService.superDetectionTool'),
t('cash.aiService.HCInfoFeeDelayUS'),
t('cash.aiService.HCInfoFeeDelayHK'),
t('cash.aiService.HCInfoFeeDelayAStock'),
t('cash.aiService.HCInfoFeeDelaySingaporeStock'),
t('cash.aiService.HCInfoFeeDelayJapanStock'),
t('cash.aiService.HCInfoFeeDelayThailandStock'),
t('cash.aiService.HCInfoFeeDelayIndonesiaStock'),
t('cash.aiService.HCInfoFeeDelayVietnamStock'),
t('cash.aiService.HCInfoFeeDelayKoreaStock'),
t('cash.aiService.HCInfoFeeDelayTaiwanStock'),
t('cash.aiService.HCInfoFeeRealTimeUS'),
t('cash.aiService.HCInfoFeeRealTimeHK'),
t('cash.aiService.HCInfoFeeRealTimeAStock'),
t('cash.aiService.HCInfoFeeRealTimeSingaporeStock'),
t('cash.aiService.HCInfoFeeRealTimeJapanStock'),
t('cash.aiService.HCInfoFeeRealTimeThailandStock'),
t('cash.aiService.HCInfoFeeRealTimeIndonesiaStock'),
t('cash.aiService.HCInfoFeeRealTimeVietnamStock'),
t('cash.aiService.HCInfoFeeRealTimeKoreaStock'),
t('cash.aiService.HCInfoFeeRealTimeTaiwanStock'),
]) ])
if (selectItems.value.includes(addFormData.value.goodsName)) { if (selectItems.value.includes(addFormData.value.goodsName)) {
if (addOrEdit.value == 1) { if (addOrEdit.value == 1) {
@ -644,6 +665,10 @@ const ifGold = () => {
} }
} }
watch(() => addFormData.value.goodsName, () => {
ifGold()
})
// //
const isGroup = ref(false) const isGroup = ref(false)
const ifGroup = () => { const ifGroup = () => {
@ -922,17 +947,17 @@ const customOptions = ref([
const paytypeOptions = ref([ const paytypeOptions = ref([
t('cash.payMethods.stripe'), // Stripe t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.stripe2'), // Stripe2
t('cash.payMethods.ipay88'), // Ipay88 t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.grabpay'), // Grabpay t('cash.payMethods.grabpay'), // Grabpay
t('cash.payMethods.nets'), // Nets t('cash.payMethods.nets'), // Nets
t('cash.payMethods.transfer'), // E-Transfer t('cash.payMethods.transfer'), // E-Transfer
t('cash.payMethods.paypal'), // PayPal t('cash.payMethods.paypal'), // PayPal
t('cash.payMethods.paysolution'), // Paysolution
t('cash.payMethods.bankTransfer'),// t('cash.payMethods.bankTransfer'),//
t('cash.payMethods.card'), // t('cash.payMethods.card'), //
t('cash.payMethods.cash'), // t('cash.payMethods.cash'), //
t('cash.payMethods.check'), // t('cash.payMethods.check'), //
t('cash.payMethods.paysolution'), // Paysolution
t('cash.payMethods.stripe2'), // Stripe2
]) ])
const MoneyAddressOptions = ref([ const MoneyAddressOptions = ref([
t('cash.markets.Malaysia'), // 西 t('cash.markets.Malaysia'), // 西
@ -1192,17 +1217,17 @@ const getAdminData = async () => {
const paytypeList = ref([ const paytypeList = ref([
t('cash.payMethods.stripe'), // Stripe t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.stripe2'), // Stripe2
t('cash.payMethods.ipay88'), // Ipay88 t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.bankTransfer'),//
t('cash.payMethods.card'), //
t('cash.payMethods.cash'), //
t('cash.payMethods.check'), //
t('cash.payMethods.grabpay'), // Grabpay t('cash.payMethods.grabpay'), // Grabpay
t('cash.payMethods.nets'), // Nets t('cash.payMethods.nets'), // Nets
t('cash.payMethods.transfer'), // E-Transfer t('cash.payMethods.transfer'), // E-Transfer
t('cash.payMethods.paypal'), // PayPal t('cash.payMethods.paypal'), // PayPal
t('cash.payMethods.stripe2'), // Stripe2
t('cash.payMethods.paysolution'), // Paysolution t('cash.payMethods.paysolution'), // Paysolution
t('cash.payMethods.bankTransfer'),//
t('cash.payMethods.card'), //
t('cash.payMethods.cash'), //
t('cash.payMethods.check'), //
]) ])
const getMarket = async function () { const getMarket = async function () {
try { try {

26
src/views/moneyManage/refundDetail/refundService.vue

@ -567,19 +567,19 @@ const currencies = computed(() => [
t('cash.currency.rmb'), t('cash.currency.rmb'),
]) ])
const channelOptions = computed(() => [ const channelOptions = computed(() => [
t('cash.payMethods.stripe'),
t('cash.payMethods.paymentAsia'),
t('cash.payMethods.ipay88'),
t('cash.payMethods.bankTransfer'),
t('cash.payMethods.card'),
t('cash.payMethods.cash'),
t('cash.payMethods.check'),
t('cash.payMethods.grabpay'),
t('cash.payMethods.nets'),
t('cash.payMethods.transfer'),
t('cash.payMethods.paypal'),
t('cash.payMethods.stripe2'),
t('cash.payMethods.paysolution'),
t('cash.payMethods.stripe'), // Stripe
t('cash.payMethods.paymentAsia'), // PaymentAsia
t('cash.payMethods.stripe2'), // Stripe2
t('cash.payMethods.ipay88'), // Ipay88
t('cash.payMethods.grabpay'), // Grabpay
t('cash.payMethods.nets'), // Nets
t('cash.payMethods.transfer'), // E-Transfer
t('cash.payMethods.paypal'), // PayPal
t('cash.payMethods.paysolution'), // Paysolution
t('cash.payMethods.bankTransfer'),//
t('cash.payMethods.card'), //
t('cash.payMethods.cash'), //
t('cash.payMethods.check'), //
]) ])
const reset = function () { const reset = function () {

Loading…
Cancel
Save