huangqizhen
/
gold-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

唉

lihuilin/feature-20251104102812-现金二期
lhl 1 week ago
parent
136152c50e
commit
a8e7f86c37
6 changed files with 43 additions and 35 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/views/activityManage/activity.vue
  2. 12
      src/views/moneyManage/executor/executor.vue
  3. 19
      src/views/moneyManage/refundDetail/refundCharge.vue
  4. 11
      src/views/moneyManage/refundDetail/refundFinance.vue
  5. 11
      src/views/moneyManage/refundDetail/refundHeader.vue
  6. 9
      src/views/moneyManage/refundDetail/refundService.vue

2
src/views/activityManage/activity.vue
View File

@ -439,7 +439,7 @@ const validateActivityName = (name) => {
} }
// 字符格式校验 // 字符格式校验
if (!activityNameReg.test(name)) { if (!activityNameReg.test(name)) {
ElMessage.error('活动名称仅支持汉字、英文字母、泰语、数字及常见标点');
ElMessage.error('活动名称仅支持汉字、英文字母、数字及常见标点，中文字符，。！？、；：“ ” ‘ ’ （）《》【】——～，英文字符, . ! ? : ; " ( ) [ ] - _ & + =/')
return false; return false;
} }
return true; return true;

12
src/views/moneyManage/executor/executor.vue
View File

@ -21,7 +21,7 @@
<div class="search"> <div class="search">
<el-text size="large" style="width:4vw;">退款币种</el-text> <el-text size="large" style="width:4vw;">退款币种</el-text>
<el-select v-model="searchForm.refundCurrency" style="width:9vw;" clearable> <el-select v-model="searchForm.refundCurrency" style="width:9vw;" clearable>
<el-option v-for="item in currencies" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in currencies" :key="item" :label="item" :value="item" />
</el-select> </el-select>
</div> </div>
</div> </div>
@ -29,7 +29,7 @@
<div class="search2"> <div class="search2">
<el-text size="large" style="width:4vw;">退款途径</el-text> <el-text size="large" style="width:4vw;">退款途径</el-text>
<el-select v-model="searchForm.refundChannels" style="width:9vw;" clearable> <el-select v-model="searchForm.refundChannels" style="width:9vw;" clearable>
<el-option v-for="item in channelOptions" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
</el-select> </el-select>
</div> </div>
<div class="search2"> <div class="search2">
@ -190,7 +190,7 @@
<div class="dialog-item"> <div class="dialog-item">
<el-text style="width:4vw;">退款币种</el-text> <el-text style="width:4vw;">退款币种</el-text>
<el-select v-model="editForm.refundCurrency" placeholder="请选择退款币种" style="width:10vw;"> <el-select v-model="editForm.refundCurrency" placeholder="请选择退款币种" style="width:10vw;">
<el-option v-for="item in currencies" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in currencies" :key="item" :label="item" :value="item" />
</el-select> </el-select>
</div> </div>
<div class="dialog-item"> <div class="dialog-item">
@ -200,7 +200,7 @@
<div class="dialog-item"> <div class="dialog-item">
<el-text style="width:4vw;">退款途径</el-text> <el-text style="width:4vw;">退款途径</el-text>
<el-select v-model="editForm.refundChannels" placeholder="请选择退款途径" style="width:10vw;"> <el-select v-model="editForm.refundChannels" placeholder="请选择退款途径" style="width:10vw;">
<el-option v-for="item in channelOptions" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
</el-select> </el-select>
</div> </div>
<div class="dialog-item"> <div class="dialog-item">
@ -242,7 +242,7 @@ import dayjs from 'dayjs'
import { useAdminStore } from "@/store/index.js" import { useAdminStore } from "@/store/index.js"
import { storeToRefs } from "pinia" import { storeToRefs } from "pinia"
import { Delete, Download, Plus, ZoomIn } from '@element-plus/icons-vue' import { Delete, Download, Plus, ZoomIn } from '@element-plus/icons-vue'
import { productList } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
import { productList, CurrencyForId } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
const adminStore = useAdminStore() const adminStore = useAdminStore()
const { adminData, menuTree } = storeToRefs(adminStore) const { adminData, menuTree } = storeToRefs(adminStore)
import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js" import { permissionMapping, findMenuById } from "@/utils/menuTreePermission.js"
@ -301,7 +301,7 @@ const getRefund = async function () {
// 20：地区负责人待审核；22：地区负责人驳回； // 20：地区负责人待审核；22：地区负责人驳回；
// 30：总部财务待审核；32：总部财务驳回； // 30：总部财务待审核；32：总部财务驳回；
// 40：执行人待处理；41：执行人已处理，退款完成； // 40：执行人待处理；41：执行人已处理，退款完成；
paymentCurrency: searchForm.value.paymentCurrency,
paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),
refundCurrency: searchForm.value.refundCurrency, refundCurrency: searchForm.value.refundCurrency,
sTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", sTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
eTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "", eTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",

19
src/views/moneyManage/refundDetail/refundCharge.vue
View File

@ -104,7 +104,8 @@
style="margin-top: 1vh;"></el-pagination> style="margin-top: 1vh;"></el-pagination>
</el-card> </el-card>
<el-dialog v-model="showAudit2" title="审核" class="audit2" width="35vw" overflow draggable style="background-color: #F3FAFE !important;">
<el-dialog v-model="showAudit2" title="审核" class="audit2" width="35vw" overflow draggable
style="background-color: #F3FAFE !important;">
<div class="top"> <div class="top">
<el-button @click="" class="smallTitle" size="small">退款申请信息</el-button> <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
<div class="top-item"> <div class="top-item">
@ -347,7 +348,7 @@ const adminStore = useAdminStore()
const { adminData, menuTree } = storeToRefs(adminStore) const { adminData, menuTree } = storeToRefs(adminStore)
import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js" import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
import moment from 'moment' 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 RefundChargeBackground from '@/assets/images/refund-progress.png'
import { isNumber } from 'lodash' import { isNumber } from 'lodash'
@ -403,6 +404,7 @@ const getRefund = async function () {
return return
} }
try { try {
const payCurrencySelect = ref('')
const statuses = ref([20, 22, 30, 32, 40, 41]) // 看不到进度没到这里的 const statuses = ref([20, 22, 30, 32, 40, 41]) // 看不到进度没到这里的
if (searchForm.value.statuses === '审核通过') { if (searchForm.value.statuses === '审核通过') {
statuses.value = [30, 40] statuses.value = [30, 40]
@ -424,6 +426,10 @@ const getRefund = async function () {
return return
} }
if (searchForm.value.paymentCurrency) {
payCurrencySelect.value = CurrencyForId(searchForm.value.paymentCurrency)
}
const params = { const params = {
pageNum: pagination.value.pageNum, pageNum: pagination.value.pageNum,
pageSize: pagination.value.pageSize, pageSize: pagination.value.pageSize,
@ -436,7 +442,7 @@ const getRefund = async function () {
// 20：地区负责人待审核；22：地区负责人驳回； // 20：地区负责人待审核；22：地区负责人驳回；
// 30：总部财务待审核；32：总部财务驳回； // 30：总部财务待审核；32：总部财务驳回；
// 40：执行人待处理；41：执行人已处理，退款完成； // 40：执行人待处理；41：执行人已处理，退款完成；
paymentCurrency: searchForm.value.paymentCurrency,//付款币种
paymentCurrency: payCurrencySelect.value,//付款币种
payType: searchForm.value.payType,//支付方式 payType: searchForm.value.payType,//支付方式
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", 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') : "", 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 exportExcel = async function () {
const payCurrencySelect = ref('')
const statuses = ref([20, 22, 30, 32, 40, 41]) // 看不到进度没到这里的 const statuses = ref([20, 22, 30, 32, 40, 41]) // 看不到进度没到这里的
if (searchForm.value.statuses === '审核通过') { if (searchForm.value.statuses === '审核通过') {
statuses.value = [30, 40] statuses.value = [30, 40]
@ -590,6 +597,10 @@ const exportExcel = async function () {
return return
} }
if (searchForm.value.paymentCurrency) {
payCurrencySelect.value = CurrencyForId(searchForm.value.paymentCurrency)
}
const params = { const params = {
pageNum: pagination.value.pageNum, pageNum: pagination.value.pageNum,
pageSize: pagination.value.pageSize, pageSize: pagination.value.pageSize,
@ -602,7 +613,7 @@ const exportExcel = async function () {
// 20：地区负责人待审核；22：地区负责人驳回； // 20：地区负责人待审核；22：地区负责人驳回；
// 30：总部财务待审核；32：总部财务驳回； // 30：总部财务待审核；32：总部财务驳回；
// 40：执行人待处理；41：执行人已处理，退款完成； // 40：执行人待处理；41：执行人已处理，退款完成；
paymentCurrency: searchForm.value.paymentCurrency,//付款币种
paymentCurrency: payCurrencySelect.value,//付款币种
payType: searchForm.value.payType,//支付方式 payType: searchForm.value.payType,//支付方式
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", 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') : "", endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",

11
src/views/moneyManage/refundDetail/refundFinance.vue
View File

@ -30,14 +30,13 @@
<div class="item2"> <div class="item2">
<el-text size="large" style="width:4vw;">付款币种</el-text> <el-text size="large" style="width:4vw;">付款币种</el-text>
<el-select v-model="searchForm.paymentCurrency" style="width:9vw;" clearable> <el-select v-model="searchForm.paymentCurrency" style="width:9vw;" clearable>
<el-option v-for="item in currencies" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in currencies" :key="item" :label="item" :value="item" />
</el-select> </el-select>
</div> </div>
<div class="item2"> <div class="item2">
<el-text size="large" style="width:4vw;">支付方式</el-text> <el-text size="large" style="width:4vw;">支付方式</el-text>
<el-select v-model="searchForm.payType" style="width:9vw;" clearable> <el-select v-model="searchForm.payType" style="width:9vw;" clearable>
<el-option v-for="item in channelOptions" :key="item.value" :label="item.label"
:value="item.value" />
<el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
</el-select> </el-select>
</div> </div>
<div class="item2" style="width: 28.5vw;"> <div class="item2" style="width: 28.5vw;">
@ -347,7 +346,7 @@ const adminStore = useAdminStore()
const { adminData, menuTree } = storeToRefs(adminStore) const { adminData, menuTree } = storeToRefs(adminStore)
import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js" import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
import moment from 'moment' 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 RefundFinanceBackground from '@/assets/images/refund-progress.png'
import { isNumber } from 'lodash' import { isNumber } from 'lodash'
@ -497,7 +496,7 @@ const getRefund = async function () {
// 20：地区负责人待审核；22：地区负责人驳回； // 20：地区负责人待审核；22：地区负责人驳回；
// 30：总部财务待审核；32：总部财务驳回； // 30：总部财务待审核；32：总部财务驳回；
// 40：执行人待处理；41：执行人已处理，退款完成； // 40：执行人待处理；41：执行人已处理，退款完成；
paymentCurrency: searchForm.value.paymentCurrency,//付款币种
paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),//付款币种
payType: searchForm.value.payType,//支付方式 payType: searchForm.value.payType,//支付方式
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", 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') : "", 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：地区负责人驳回； // 20：地区负责人待审核；22：地区负责人驳回；
// 30：总部财务待审核；32：总部财务驳回； // 30：总部财务待审核；32：总部财务驳回；
// 40：执行人待处理；41：执行人已处理，退款完成； // 40：执行人待处理；41：执行人已处理，退款完成；
paymentCurrency: searchForm.value.paymentCurrency,//付款币种
paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),//付款币种
payType: searchForm.value.payType,//支付方式 payType: searchForm.value.payType,//支付方式
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", 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') : "", endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",

11
src/views/moneyManage/refundDetail/refundHeader.vue
View File

@ -31,14 +31,13 @@
<div class="item2"> <div class="item2">
<el-text size="large" style="width:4vw;">付款币种</el-text> <el-text size="large" style="width:4vw;">付款币种</el-text>
<el-select v-model="searchForm.paymentCurrency" style="width:9vw;" placeholder="请选择付款币种" clearable> <el-select v-model="searchForm.paymentCurrency" style="width:9vw;" placeholder="请选择付款币种" clearable>
<el-option v-for="item in currencies" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in currencies" :key="item" :label="item" :value="item" />
</el-select> </el-select>
</div> </div>
<div class="item2"> <div class="item2">
<el-text size="large" style="width:4vw;">支付方式</el-text> <el-text size="large" style="width:4vw;">支付方式</el-text>
<el-select v-model="searchForm.payType" style="width:9vw;" placeholder="请选择支付方式" clearable> <el-select v-model="searchForm.payType" style="width:9vw;" placeholder="请选择支付方式" clearable>
<el-option v-for="item in channelOptions" :key="item.value" :label="item.label"
:value="item.value" />
<el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
</el-select> </el-select>
</div> </div>
<div class="item2" style="width: 28.5vw;"> <div class="item2" style="width: 28.5vw;">
@ -360,7 +359,7 @@ const adminStore = useAdminStore()
const { adminData, menuTree } = storeToRefs(adminStore) const { adminData, menuTree } = storeToRefs(adminStore)
import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js" import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
import moment from 'moment' 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' import { isNumber } from 'lodash'
const startsWith1 = (mainStr, prefix) => { const startsWith1 = (mainStr, prefix) => {
// 处理前缀为空字符串的情况（空字符串是所有字符串的前缀） // 处理前缀为空字符串的情况（空字符串是所有字符串的前缀）
@ -492,7 +491,7 @@ const getRefund = async function () {
markets: searchForm.value.markets, markets: searchForm.value.markets,
goodsName: goodsName, goodsName: goodsName,
statuses: statusParam.value, statuses: statusParam.value,
paymentCurrency: searchForm.value.paymentCurrency,
paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),
payType: searchForm.value.payType, payType: searchForm.value.payType,
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", 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') : "", 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, markets: searchForm.value.markets,
goodsName: goodsName, goodsName: goodsName,
statuses: statusParam.value, statuses: statusParam.value,
paymentCurrency: searchForm.value.paymentCurrency,
paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),
payType: searchForm.value.payType, payType: searchForm.value.payType,
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", 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') : "", endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",

9
src/views/moneyManage/refundDetail/refundService.vue
View File

@ -30,14 +30,13 @@
<div class="item2"> <div class="item2">
<el-text size="large" style="width:4vw;">付款币种</el-text> <el-text size="large" style="width:4vw;">付款币种</el-text>
<el-select v-model="searchForm.paymentCurrency" style="width:9vw;" clearable> <el-select v-model="searchForm.paymentCurrency" style="width:9vw;" clearable>
<el-option v-for="item in currencies" :key="item.value" :label="item.label" :value="item.value" />
<el-option v-for="item in currencies" :key="item" :label="item" :value="item" />
</el-select> </el-select>
</div> </div>
<div class="item2"> <div class="item2">
<el-text size="large" style="width:4vw;">支付方式</el-text> <el-text size="large" style="width:4vw;">支付方式</el-text>
<el-select v-model="searchForm.payType" style="width:9vw;" clearable> <el-select v-model="searchForm.payType" style="width:9vw;" clearable>
<el-option v-for="item in channelOptions" :key="item.value" :label="item.label"
:value="item.value" />
<el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
</el-select> </el-select>
</div> </div>
<div class="item2" style="width: 28.5vw;"> <div class="item2" style="width: 28.5vw;">
@ -232,7 +231,7 @@ const { adminData, menuTree } = storeToRefs(adminStore)
import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js" import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
import ConfirmDialog from '@/components/dialogs/ConfirmDialog.vue' import ConfirmDialog from '@/components/dialogs/ConfirmDialog.vue'
import { pa } from 'element-plus/es/locales.mjs' 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 RefundRecallBackground from '@/assets/images/refund-recall.png'
import { isNumber } from 'lodash' import { isNumber } from 'lodash'
@ -304,7 +303,7 @@ const getRefund = async function () {
// 20：地区负责人待审核；22：地区负责人驳回； // 20：地区负责人待审核；22：地区负责人驳回；
// 30：总部财务待审核；32：总部财务驳回； // 30：总部财务待审核；32：总部财务驳回；
// 40：执行人待处理；41：执行人已处理，退款完成； // 40：执行人待处理；41：执行人已处理，退款完成；
paymentCurrency: searchForm.value.paymentCurrency,//付款币种
paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),//付款币种
payType: searchForm.value.payType,//支付方式 payType: searchForm.value.payType,//支付方式
startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "", 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') : "", endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",

Write Preview
Loading…
Cancel
Save