@@ -347,7 +348,7 @@ const adminStore = useAdminStore()
const { adminData, menuTree } = storeToRefs(adminStore)
import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
import moment from 'moment'
-import { productList } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
+import { productList, CurrencyForId } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
import RefundChargeBackground from '@/assets/images/refund-progress.png'
import { isNumber } from 'lodash'
@@ -403,6 +404,7 @@ const getRefund = async function () {
return
}
try {
+ const payCurrencySelect = ref('')
const statuses = ref([20, 22, 30, 32, 40, 41]) // 看不到进度没到这里的
if (searchForm.value.statuses === '审核通过') {
statuses.value = [30, 40]
@@ -416,14 +418,18 @@ const getRefund = async function () {
statuses.value = [20, 22, 30, 32, 40, 41]
}
- const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
+ const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
- if(searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)){
+ if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
ElMessage.error('精网号必须为数字')
return
}
+ if (searchForm.value.paymentCurrency) {
+ payCurrencySelect.value = CurrencyForId(searchForm.value.paymentCurrency)
+ }
+
const params = {
pageNum: pagination.value.pageNum,
pageSize: pagination.value.pageSize,
@@ -436,7 +442,7 @@ const getRefund = async function () {
// 20:地区负责人待审核;22:地区负责人驳回;
// 30:总部财务待审核;32:总部财务驳回;
// 40:执行人待处理;41:执行人已处理,退款完成;
- paymentCurrency: searchForm.value.paymentCurrency,//付款币种
+ paymentCurrency: payCurrencySelect.value,//付款币种
payType: searchForm.value.payType,//支付方式
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
@@ -569,6 +575,7 @@ const getMarket = async function () {
}
}
const exportExcel = async function () {
+ const payCurrencySelect = ref('')
const statuses = ref([20, 22, 30, 32, 40, 41]) // 看不到进度没到这里的
if (searchForm.value.statuses === '审核通过') {
statuses.value = [30, 40]
@@ -583,12 +590,16 @@ const exportExcel = async function () {
}
const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
- ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
+ ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
- if(searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)){
- ElMessage.error('精网号必须为数字')
- return
- }
+ if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
+ ElMessage.error('精网号必须为数字')
+ return
+ }
+
+ if (searchForm.value.paymentCurrency) {
+ payCurrencySelect.value = CurrencyForId(searchForm.value.paymentCurrency)
+ }
const params = {
pageNum: pagination.value.pageNum,
@@ -602,7 +613,7 @@ const exportExcel = async function () {
// 20:地区负责人待审核;22:地区负责人驳回;
// 30:总部财务待审核;32:总部财务驳回;
// 40:执行人待处理;41:执行人已处理,退款完成;
- paymentCurrency: searchForm.value.paymentCurrency,//付款币种
+ paymentCurrency: payCurrencySelect.value,//付款币种
payType: searchForm.value.payType,//支付方式
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index 1d68e31..bb378ae 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -30,14 +30,13 @@
付款币种
-
+
支付方式
-
+
@@ -347,7 +346,7 @@ const adminStore = useAdminStore()
const { adminData, menuTree } = storeToRefs(adminStore)
import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
import moment from 'moment'
-import { productList } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
+import { productList, CurrencyForId } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
import RefundFinanceBackground from '@/assets/images/refund-progress.png'
import { isNumber } from 'lodash'
@@ -497,7 +496,7 @@ const getRefund = async function () {
// 20:地区负责人待审核;22:地区负责人驳回;
// 30:总部财务待审核;32:总部财务驳回;
// 40:执行人待处理;41:执行人已处理,退款完成;
- paymentCurrency: searchForm.value.paymentCurrency,//付款币种
+ paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),//付款币种
payType: searchForm.value.payType,//支付方式
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
@@ -665,7 +664,7 @@ const exportExcel = async function () {
// 20:地区负责人待审核;22:地区负责人驳回;
// 30:总部财务待审核;32:总部财务驳回;
// 40:执行人待处理;41:执行人已处理,退款完成;
- paymentCurrency: searchForm.value.paymentCurrency,//付款币种
+ paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),//付款币种
payType: searchForm.value.payType,//支付方式
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index 9818b6f..39c26de 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -31,14 +31,13 @@
付款币种
-
+
支付方式
-
+
@@ -360,7 +359,7 @@ const adminStore = useAdminStore()
const { adminData, menuTree } = storeToRefs(adminStore)
import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
import moment from 'moment'
-import { productList } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
+import { productList, CurrencyForId } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
import { isNumber } from 'lodash'
const startsWith1 = (mainStr, prefix) => {
// 处理前缀为空字符串的情况(空字符串是所有字符串的前缀)
@@ -492,7 +491,7 @@ const getRefund = async function () {
markets: searchForm.value.markets,
goodsName: goodsName,
statuses: statusParam.value,
- paymentCurrency: searchForm.value.paymentCurrency,
+ paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),
payType: searchForm.value.payType,
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
@@ -639,7 +638,7 @@ const exportExcel = async function () {
markets: searchForm.value.markets,
goodsName: goodsName,
statuses: statusParam.value,
- paymentCurrency: searchForm.value.paymentCurrency,
+ paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),
payType: searchForm.value.payType,
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index 549048d..05c6c71 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -30,14 +30,13 @@
付款币种
-
+
支付方式
-
+
@@ -232,7 +231,7 @@ const { adminData, menuTree } = storeToRefs(adminStore)
import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
import ConfirmDialog from '@/components/dialogs/ConfirmDialog.vue'
import { pa } from 'element-plus/es/locales.mjs'
-import { productList } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
+import { productList,CurrencyForId } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
import RefundRecallBackground from '@/assets/images/refund-recall.png'
import { isNumber } from 'lodash'
@@ -304,7 +303,7 @@ const getRefund = async function () {
// 20:地区负责人待审核;22:地区负责人驳回;
// 30:总部财务待审核;32:总部财务驳回;
// 40:执行人待处理;41:执行人已处理,退款完成;
- paymentCurrency: searchForm.value.paymentCurrency,//付款币种
+ paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),//付款币种
payType: searchForm.value.payType,//支付方式
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",