Merge branch 'milestone-20251104-现金二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20251104-现金二期

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;

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;
@@ -780,6 +785,11 @@ const getlist = async () => {
             }
         }
 
+        if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
+            ElMessage.error('精网号只能是数字')
+            return
+        }
+
         const result = await request({
             url: '/cashCollection/selectCollection',
             data: {

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;

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'
@@ -526,6 +527,11 @@ const getlist = async () => {
             }
         }
 
+        if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
+            ElMessage.error('精网号只能是数字')
+            return
+        }
+
         const result = await request({
             url: '/cashCollection/selectCollection',
             data: {

src/views/moneyManage/refundDetail/refundFinance.vue

@@ -103,7 +103,7 @@
             style="margin-top: 1vh;"></el-pagination>
     </el-card>
 
-    <el-dialog v-model="showAudit" title="审核" class="audit" width="35vw" overflow draggable>
+    <el-dialog v-model="showAudit" title="审核" class="audit" width="35vw" overflow draggable style="background-color: #F3FAFE !important;">
         <div class="top">
             <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
             <div class="top-item">

src/views/moneyManage/refundDetail/refundHeader.vue

@@ -104,7 +104,7 @@
             style="margin-top: 1vh;"></el-pagination>
     </el-card>
 
-    <el-dialog v-model="showAudit2" title="审核" class="audit2" width="35vw" overflow draggable>
+    <el-dialog v-model="showAudit2" title="审核" class="audit2" width="35vw" overflow draggable style="background-color: #F3FAFE !important;">
         <div class="top">
             <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
             <div class="top-item">

src/views/moneyManage/refundDetail/refundService.vue

@@ -115,7 +115,7 @@
             style="margin-top: 1vh;"></el-pagination>
     </el-card>
 
-    <el-dialog v-model="showEdit" title="退款" class="editDialog" overflow draggable style="width: 40vw;">
+    <el-dialog v-model="showEdit" title="退款" class="editDialog" overflow draggable style="width: 40vw; background-color: #F3FAFE !important;">
         <div style="display: flex;">
             <div class="left">
                 <div class="add-item">

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 {