From ce53f8ffbd9e557b375cfbc7683cf142babef8cb Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Fri, 21 Nov 2025 19:36:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=8C=88=20style:=20=E5=AE=A2=E6=9C=8D?= =?UTF-8?q?=EF=BC=8C=E8=B4=A2=E5=8A=A1=EF=BC=8C=E6=80=BB=E9=83=A8=E8=B4=A2?= =?UTF-8?q?=E5=8A=A1=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moneyManage/refundDetail/refundFinance.vue | 2 +- src/views/moneyManage/refundDetail/refundHeader.vue | 2 +- src/views/moneyManage/refundDetail/refundService.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue index bb378ae..5e16485 100644 --- a/src/views/moneyManage/refundDetail/refundFinance.vue +++ b/src/views/moneyManage/refundDetail/refundFinance.vue @@ -103,7 +103,7 @@ style="margin-top: 1vh;"> - +
退款申请信息
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue index 39c26de..865a3ff 100644 --- a/src/views/moneyManage/refundDetail/refundHeader.vue +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -104,7 +104,7 @@ style="margin-top: 1vh;"> - +
退款申请信息
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue index 05c6c71..780a556 100644 --- a/src/views/moneyManage/refundDetail/refundService.vue +++ b/src/views/moneyManage/refundDetail/refundService.vue @@ -115,7 +115,7 @@ style="margin-top: 1vh;"> - +
From 85290ba848a3647ecfb6f1aa744a6003c5ee66ae Mon Sep 17 00:00:00 2001 From: lihuilin Date: Fri, 21 Nov 2025 19:40:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=94=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/moneyManage/receiveDetail/receiveFinance.vue | 16 +++++++++++++--- src/views/moneyManage/receiveDetail/receiveHead.vue | 12 +++++++++++- src/views/moneyManage/receiveDetail/receiveManage.vue | 12 +++++++++++- src/views/moneyManage/receiveDetail/receiveService.vue | 6 ++++++ src/views/usergold/gold/clientCountDetail.vue | 2 +- 5 files changed, 42 insertions(+), 6 deletions(-) diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue index 0e10eab..315323c 100644 --- a/src/views/moneyManage/receiveDetail/receiveFinance.vue +++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue @@ -611,7 +611,7 @@ import moment from 'moment'; import _ from 'lodash'; import { Plus } from '@element-plus/icons-vue'; import { startsWith } from './utils/util.js' - +import { isNumber } from 'lodash' // 地区财务专属组件 import CurrencySelect from '@/components/MoneyManage/CurrencySelect.vue'; @@ -752,6 +752,11 @@ const exportExcel = async function () { payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency); } + if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { + ElMessage.error('精网号只能是数字') + return + } + const cashRoleId = '1'; const submitterMarket = adminData.value.markets; searchData.value.status = 46; @@ -867,6 +872,11 @@ const getlist = async () => { payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency); } + if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { + ElMessage.error('精网号只能是数字') + return + } + // 地区财务固定参数：角色ID=1，按标签页筛选状态 const cashRoleId = '1'; const receivedMarket = adminData.value.markets; @@ -877,7 +887,7 @@ const getlist = async () => { // 地区处理 const markets = ref(null) - if(searchData.value.markets) { + if (searchData.value.markets) { markets.value = searchData.value.markets[searchData.value.markets.length - 1] console.log('地区转换', markets.value) } @@ -895,7 +905,7 @@ const getlist = async () => { submitterMarket: receivedMarket, goodsName: goodsName, // market: MarketNameForId(searchData.value.market) - market:markets.value + market: markets.value } } }); diff --git a/src/views/moneyManage/receiveDetail/receiveHead.vue b/src/views/moneyManage/receiveDetail/receiveHead.vue index 7529bdf..d9aafc1 100644 --- a/src/views/moneyManage/receiveDetail/receiveHead.vue +++ b/src/views/moneyManage/receiveDetail/receiveHead.vue @@ -503,7 +503,7 @@ import moment from 'moment'; import _ from 'lodash'; import { Plus } from '@element-plus/icons-vue'; import { startsWith } from './utils/util.js' - +import { isNumber } from 'lodash' // 筛选地区树 const market = ref([]) @@ -609,6 +609,11 @@ const exportExcel = async function () { payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency); } + if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { + ElMessage.error('精网号只能是数字') + return + } + const cashRoleId = '2'; const submitterMarket = adminData.value.markets; searchData.value.status = 46; @@ -765,6 +770,11 @@ const getlist = async () => { console.log('地区转换', markets.value) } + if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { + ElMessage.error('精网号只能是数字') + return + } + const result = await request({ url: '/cashCollection/selectCollection', data: { diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue index 1513fc0..6b90f61 100644 --- a/src/views/moneyManage/receiveDetail/receiveManage.vue +++ b/src/views/moneyManage/receiveDetail/receiveManage.vue @@ -611,7 +611,7 @@ import moment from 'moment'; import _ from 'lodash'; import { Plus } from '@element-plus/icons-vue'; import { startsWith } from './utils/util.js' - +import { isNumber } from 'lodash' // 筛选地区树 const market = ref([]) @@ -752,6 +752,11 @@ const exportExcel = async function () { payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency); } + if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { + ElMessage.error('精网号只能是数字') + return + } + const cashRoleId = '1'; const submitterMarket = adminData.value.markets; searchData.value.status = 46; @@ -882,6 +887,11 @@ const getlist = async () => { console.log('地区转换', markets.value) } + if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { + ElMessage.error('精网号只能是数字') + return + } + const result = await request({ url: '/cashCollection/selectCollection', data: { diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index 78c511e..aa0e65e 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -414,6 +414,7 @@ import moment from 'moment' import { useAdminStore } from '@/store/index.js' import { hasMenuPermission } from '@/utils/menuTreePermission.js' import _ from 'lodash' +import { isNumber } from 'lodash' // 导入客服相关规则和静态数据 import { addFormRule } from './utils/recriveFormRules.js' import { productList, MarketNameForId, CurrencyForId, marketList, statusList } from './utils/staticData.js' @@ -510,6 +511,11 @@ const getlist = async () => { searchData.value.market = '' } + if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) { + ElMessage.error('精网号只能是数字') + return + } + const result = await request({ url: '/cashCollection/selectCollection', data: { diff --git a/src/views/usergold/gold/clientCountDetail.vue b/src/views/usergold/gold/clientCountDetail.vue index e60f7b7..882f909 100644 --- a/src/views/usergold/gold/clientCountDetail.vue +++ b/src/views/usergold/gold/clientCountDetail.vue @@ -138,7 +138,7 @@ const get = async function (val) { if (typeof val === 'number') { getObj.value.pageNum = val } - if (getTime.value.length === 2) {//检查是否同时选择了开始时间和结束时间，如果不是则置空 + if (getTime.value && getTime.value.length === 2) {//检查是否同时选择了开始时间和结束时间，如果不是则置空 goldDetail.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss'); goldDetail.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss'); } else {