diff --git a/src/views/consume/coinConsumeDetail.vue b/src/views/consume/coinConsumeDetail.vue index 18200db..763b955 100644 --- a/src/views/consume/coinConsumeDetail.vue +++ b/src/views/consume/coinConsumeDetail.vue @@ -378,10 +378,14 @@ const handleSortChange = (column) => { } const exportExcel = async function () { const params = { - text:'', - deptid:'', - sort:1, - field:'', + consumUser :{ + jwcode:consumerUser.value.jwcode || '', + payPlatform:consumerUser.value.payPlatform || '', + market:consumerUser.value.market || '', + startTime:consumerUser.value.startTime || '', + endTime:consumerUser.value.endTime || '', + goodsName:consumerUser.value.goodsName || '' + }, page:getObj.pageNum, size:getObj.pageSize } diff --git a/src/views/home.vue b/src/views/home.vue index cd4a36a..c543fbf 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -10,6 +10,7 @@ import API from '@/util/http' import dmmn from '../assets/link.png' import { useRoute } from 'vue-router' import moment from 'moment' +import { ca } from 'element-plus/es/locales.mjs' const router = useRouter() const imgrule1 = dmmn @@ -78,6 +79,37 @@ const getExportList = async () => { } } +//根据状态返回对应的标签类型 +const getTagType = (state) => { + switch (state) { + case 0: + return 'info'; + case 1: + return 'primary'; + case 2: + return'success'; + case 3: + return 'danger'; + default: + return 'info'; + } +} +//根据状态返回对应的标签文案 +const getTagText = (state) => { + switch (state) { + case 0: + return '待执行'; + case 1: + return '执行中'; + case 2: + return'执行完成'; + case 3: + return '执行出错'; + default: + return '未知状态'; + } +} + // 下载导出文件 const downloadExportFile = (item) => { if (item.state === 2) { @@ -271,8 +303,9 @@ const openExportList = () => { diff --git a/src/views/recharge/addCoinRecharge.vue b/src/views/recharge/addCoinRecharge.vue index b3b7047..1d0dba3 100644 --- a/src/views/recharge/addCoinRecharge.vue +++ b/src/views/recharge/addCoinRecharge.vue @@ -206,8 +206,8 @@ const rules = reactive({ const numValue = Number(value); if (isNaN(numValue)) { callback(new Error('请输入有效的数字')); - } else if (numValue < 0) { - callback(new Error('输入金额不能小于0')); + } else if (numValue <= 0) { + callback(new Error('输入金额必须大于0')); } else { callback(); } @@ -245,7 +245,7 @@ const rules = reactive({ if (isNaN(numValue)) { callback(new Error('请输入有效的数字')); } else if (numValue < 0) { - callback(new Error('输入金额必须大于0')); + callback(new Error('输入金额不能小于0')); } else { callback(); } @@ -288,8 +288,8 @@ const rules = reactive({ const numValue = Number(value); if (isNaN(numValue)) { callback(new Error('请输入有效的数字')); - } else if (numValue < 0) { - callback(new Error('输入金额不能小于0')); + } else if (numValue <= 0) { + callback(new Error('输入金额必须大于0')); } else { callback(); } diff --git a/src/views/recharge/coinRechargeDetail.vue b/src/views/recharge/coinRechargeDetail.vue index 3f927d9..9eb0e50 100644 --- a/src/views/recharge/coinRechargeDetail.vue +++ b/src/views/recharge/coinRechargeDetail.vue @@ -187,6 +187,7 @@ const get = async function (val) { // 复制一份 rechargeUser.value 并移除排序字段和排序方式 const detailWithoutSort = ref({ market: rechargeUser.value.market, + activity: rechargeUser.value.activity, adminId: rechargeUser.value.adminId, startTime: rechargeUser.value.startTime, endTime: rechargeUser.value.endTime, @@ -313,16 +314,27 @@ const get7Days = function () { } const exportExcel = async function () { const params = { - text:'', - deptid:'', - sort:1, - field:'', - page:getObj.pageNum, - size:getObj.pageSize + rechargeUser: { + jwcode: rechargeUser.value.jwcode || '', + market: rechargeUser.value.market || '', + payPlatform: rechargeUser.value.payPlatform || '', + activity: rechargeUser.value.activity || '', + startTime: rechargeUser.value.startTime || '', + endTime: rechargeUser.value.endTime || '' + }, + page: getObj.value.pageNum, + size: getObj.value.pageSize } - const res = await API({ url: '/export/exportRecharge', data: params }) - if (res.code === 200) { - ElMessage.success('导出成功') + try { + const res = await API({ url: '/export/exportRecharge', data: params }) + if (res.code === 200) { + ElMessage.success('导出成功') + } else { + ElMessage.error(res.message || '导出失败,请稍后重试') + } + } catch (error) { + console.log('请求失败', error) + ElMessage.error('导出失败,请稍后重试') } } diff --git a/src/views/refund/coinRefundDetail.vue b/src/views/refund/coinRefundDetail.vue index 1260e8c..9459a5a 100644 --- a/src/views/refund/coinRefundDetail.vue +++ b/src/views/refund/coinRefundDetail.vue @@ -319,17 +319,30 @@ const getGoods = async function () { } const exportExcel = async function () { const params = { - text:'', - deptid:'', - sort:1, - field:'', + refundUser: { + jwcode: refundUser.value.jwcode || '', + refundModel : refundUser.value.refundModel || '', + market: refundUser.value.market || '', + startTime: refundUser.value.startTime || '', + endTime: refundUser.value.endTime || '', + goodsName: refundUser.value.goodsName || '', + }, page:getObj.pageNum, size:getObj.pageSize } - const res = await API({ url: '/export/exportRefund', data: params }) + + try{ + const res = await API({ url: '/export/exportRefund', data: params }) if (res.code === 200) { - ElMessage.success('导出成功') + ElMessage.success('导出成功') + } else { + ElMessage.error(res.message || '导出失败,请稍后重试') + } + } catch (error) { + console.log('请求失败', error) + ElMessage.error('导出失败,请稍后重试') } + } // 挂载 onMounted(async function () { diff --git a/src/views/usergold/clientCountDetail.vue b/src/views/usergold/clientCountDetail.vue index 268fb6e..cbdd8f9 100644 --- a/src/views/usergold/clientCountDetail.vue +++ b/src/views/usergold/clientCountDetail.vue @@ -32,10 +32,14 @@ const getAdminData = async function () { } const exportExcel = async function () { const params = { - text:'', - deptid:'', - sort:1, - field:'', + goldDetail:{ + jwcode: goldDetail.value.jwcode || '', + payPlatform: goldDetail.value.payPlatform || '', + type: goldDetail.value.type || '', + market: goldDetail.value.market || '', + startTime: goldDetail.value.startTime || '', + endTime: goldDetail.value.endTime || '', + }, page:getObj.pageNum, size:getObj.pageSize }