diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue index 580c71a..43cfbf0 100644 --- a/src/views/moneyManage/receiveDetail/receiveFinance.vue +++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue @@ -621,7 +621,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'; @@ -762,6 +762,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; @@ -877,6 +882,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; diff --git a/src/views/moneyManage/receiveDetail/receiveHead.vue b/src/views/moneyManage/receiveDetail/receiveHead.vue index d010e96..4e9078c 100644 --- a/src/views/moneyManage/receiveDetail/receiveHead.vue +++ b/src/views/moneyManage/receiveDetail/receiveHead.vue @@ -511,7 +511,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([]) @@ -617,6 +617,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; @@ -773,6 +778,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 580c71a..ba7c008 100644 --- a/src/views/moneyManage/receiveDetail/receiveManage.vue +++ b/src/views/moneyManage/receiveDetail/receiveManage.vue @@ -621,6 +621,9 @@ 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([]) // 地区财务专属组件 import CurrencySelect from '@/components/MoneyManage/CurrencySelect.vue'; @@ -646,8 +649,6 @@ const tableData = ref([]); const total = ref(0); const pageInfo = ref({ pageSize: 10, pageNum: 1 }); -// 筛选地区树 -const market = ref([]) // 搜索条件 const searchData = ref({}); @@ -762,6 +763,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; @@ -892,6 +898,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 938ef7d..3d36f27 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -424,6 +424,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' @@ -520,6 +521,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 {