From 8d944a595cea068cb4fc03804a6d91c9ae24d879 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Sun, 23 Nov 2025 17:29:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B2=BE=E7=BD=91=E5=8F=B7=E6=9C=80=E9=95=BF8?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/executor/executor.vue        | 48 +++++++++++--------
 .../moneyManage/refundDetail/refundCharge.vue      | 37 +++++++++------
 .../moneyManage/refundDetail/refundFinance.vue     | 53 +++++++++++----------
 .../moneyManage/refundDetail/refundHeader.vue      | 42 ++++++++++-------
 .../moneyManage/refundDetail/refundService.vue     | 54 +++++++++++-----------
 5 files changed, 134 insertions(+), 100 deletions(-)

diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue
index 242a742..f7ff3ec 100644
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@@ -41,8 +41,8 @@
       <div class="search2" style="width: 25.5vw;">
         <el-text size="large" style="width:4vw;">退款时间</el-text>
         <el-date-picker v-model="dateRange" type="datetimerange" range-separator="至" start-placeholder="起始时间"
-          end-placeholder="结束时间" style="width:18vw;" clearable
-          :disabled-date="disabledDate" :default-time="defaultTime" />
+          end-placeholder="结束时间" style="width:18vw;" clearable :disabled-date="disabledDate"
+          :default-time="defaultTime" />
       </div>
       <div>
         <el-button type="primary" size="medium" @click="getRefund">查询</el-button>
@@ -54,10 +54,10 @@
   <el-card style="background-color: rgb(231,244,253);height:80vh;">
     <el-table :data="tableData" style="height:70vh;width:82vw;">
       <el-table-column type="index" label="序号" width="60" fixed="left">
-                <template #default="scope">
-                    {{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}
-                </template>
-            </el-table-column>
+        <template #default="scope">
+          {{ scope.$index + 1 + (pagination.pageNum - 1) * pagination.pageSize }}
+        </template>
+      </el-table-column>
       <el-table-column prop="jwcode" label="Homily ID" width="120" fixed="left" />
       <el-table-column prop="name" label="姓名" width="120" fixed="left" show-overflow-tooltip />
       <el-table-column prop="marketName" label="所属地区" width="120" />
@@ -123,11 +123,12 @@
       </el-table-column>
     </el-table>
     <el-pagination v-model:current-page="pagination.pageNum" v-model:page-size="pagination.pageSize"
-    @size-change="handlePageSizeChange" @current-change="handleCurrentChange"
+      @size-change="handlePageSizeChange" @current-change="handleCurrentChange"
       layout="total, sizes, prev, pager, next, jumper" :total="pagination.total" style="margin-top: 1vh;" />
   </el-card>
 
-  <el-dialog v-model="showEdit" class="edit" overflow draggable style="width: 40vw; background-color: #F3FAFE !important;">
+  <el-dialog v-model="showEdit" class="edit" overflow draggable
+    style="width: 40vw; background-color: #F3FAFE !important;">
     <div style="display: flex;">
       <div class="left">
         <div class="dialog-item">
@@ -175,7 +176,8 @@
         </div>
         <div class="dialog-item">
           <el-text style="width:4vw;">转账凭证</el-text>
-          <img v-if="editRow.payVoucher" :src="editRow.payVoucher" style="width: 80px; height: 80px; object-fit: cover;">
+          <img v-if="editRow.payVoucher" :src="editRow.payVoucher"
+            style="width: 80px; height: 80px; object-fit: cover;">
           <div v-else>
             无转账凭证
           </div>
@@ -282,12 +284,20 @@ const getRefund = async function () {
     }
 
     const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
-            ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
+      ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-    if(searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)){
-            ElMessage.error('精网号必须为数字')
-            return
-        }
+    if (searchForm.value.jwcode) {
+      const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+      if (!isPositiveInteger) {
+        ElMessage.error('请输入正确的精网号')
+        return;
+      }
+    }
+    // 增加精网号长度限制，防止后端400错误
+    if (searchForm.value.jwcode.length > 8) {
+      ElMessage.error('精网号长度不能超过8位')
+      return;
+    }
 
     const params = {
       pageNum: pagination.value.pageNum,
@@ -295,7 +305,7 @@ const getRefund = async function () {
       cashRecordDTO: {
         jwcode: searchForm.value.jwcode,
         name: searchForm.value.name,
-        markets: searchForm.value.markets && searchForm.value.markets.length > 0 ? [searchForm.value.markets[searchForm.value.markets.length - 1]] : [],  
+        markets: searchForm.value.markets && searchForm.value.markets.length > 0 ? [searchForm.value.markets[searchForm.value.markets.length - 1]] : [],
         goodsName: goodsName,
         statuses: statusesParam.value,//10：地区财务待审核；12：地区财务驳回；
         // 20：地区负责人待审核；22：地区负责人驳回；
@@ -495,12 +505,12 @@ const reset = function () {
   getRefund()
 }
 const handlePageSizeChange = function (val) {
-    pagination.value.pageSize = val
-    getRefund()
+  pagination.value.pageSize = val
+  getRefund()
 }
 const handleCurrentChange = function (val) {
-    pagination.value.pageNum = val
-    getRefund()
+  pagination.value.pageNum = val
+  getRefund()
 }
 onMounted(() => {
   console.log('???????????????????', adminData.value)
diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index 3389bd7..5a64898 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -421,17 +421,18 @@ const getRefund = async function () {
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
             ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-        // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-        //     ElMessage.error('精网号必须为数字')
-        //     return
-        // }
-      if (searchForm.value.jwcode) {
-        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
-        if (!isPositiveInteger) {
-          ElMessage.error('请输入正确的精网号')
-          return;
+        if (searchForm.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
+        }
+        // 增加精网号长度限制，防止后端400错误
+        if (searchForm.value.jwcode.length > 8) {
+            ElMessage.error('精网号长度不能超过8位')
+            return;
         }
-      }
 
         if (searchForm.value.paymentCurrency) {
             payCurrencySelect.value = CurrencyForId(searchForm.value.paymentCurrency)
@@ -599,10 +600,18 @@ const exportExcel = async function () {
     const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
         ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-    // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-    //     ElMessage.error('精网号必须为数字')
-    //     return
-    // }
+    if (searchForm.value.jwcode) {
+        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+        if (!isPositiveInteger) {
+            ElMessage.error('请输入正确的精网号')
+            return
+        }
+    }
+    // 增加精网号长度限制，防止后端400错误
+    if (searchForm.value.jwcode.length > 8) {
+        ElMessage.error('精网号长度不能超过8位')
+        return;
+    }
 
     if (searchForm.value.paymentCurrency) {
         payCurrencySelect.value = CurrencyForId(searchForm.value.paymentCurrency)
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index 6fe8560..7a4b1de 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -103,7 +103,8 @@
             style="margin-top: 1vh;"></el-pagination>
     </el-card>
 
-    <el-dialog v-model="showAudit" title="审核" class="audit" width="35vw" overflow draggable style="background-color: #F3FAFE !important;">
+    <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">
@@ -479,19 +480,20 @@ const getRefund = async function () {
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
             ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-        // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-        //     ElMessage.error('精网号必须为数字')
-        //     return
-        // }
-      if (searchForm.value.jwcode) {
-        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
-        if (!isPositiveInteger) {
-          ElMessage.error('请输入正确的精网号')
-          return;
+        if (searchForm.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
+        }
+        // 增加精网号长度限制，防止后端400错误
+        if (searchForm.value.jwcode.length > 8) {
+            ElMessage.error('精网号长度不能超过8位')
+            return;
         }
-      }
 
-      const params = {
+        const params = {
             pageNum: pagination.value.pageNum,
             pageSize: pagination.value.pageSize,
             cashRecordDTO: {
@@ -652,21 +654,22 @@ const exportExcel = async function () {
     }
 
     const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
-        ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
-
-    // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-    //     ElMessage.error('精网号必须为数字')
-    //     return
-    // }
-  if (searchForm.value.jwcode) {
-    const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
-    if (!isPositiveInteger) {
-      ElMessage.error('请输入正确的精网号')
-      return;
+        ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : '';
+
+    if (searchForm.value.jwcode) {
+        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+        if (!isPositiveInteger) {
+            ElMessage.error('请输入正确的精网号')
+            return;
+        }
+    }
+    // 增加精网号长度限制，防止后端400错误
+    if (searchForm.value.jwcode.length > 8) {
+        ElMessage.error('精网号长度不能超过8位')
+        return;
     }
-  }
 
-  const params = {
+    const params = {
         pageNum: pagination.value.pageNum,
         pageSize: pagination.value.pageSize,
         cashRecordDTO: {
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index 6401d72..fd0d6cb 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -104,7 +104,8 @@
             style="margin-top: 1vh;"></el-pagination>
     </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">
             <el-button @click="" class="smallTitle" size="small">退款申请信息</el-button>
             <div class="top-item">
@@ -477,19 +478,20 @@ const getRefund = async function () {
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
             ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-        // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-        //     ElMessage.error('精网号必须为数字')
-        //     return
-        // }
-      if (searchForm.value.jwcode) {
-        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
-        if (!isPositiveInteger) {
-          ElMessage.error('请输入正确的精网号')
-          return;
+        if (searchForm.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
+        }
+        // 增加精网号长度限制，防止后端400错误
+        if (searchForm.value.jwcode.length > 8) {
+            ElMessage.error('精网号长度不能超过8位')
+            return;
         }
-      }
 
-      const params = {
+        const params = {
             pageNum: pagination.value.pageNum,
             pageSize: pagination.value.pageSize,
             cashRecordDTO: {
@@ -633,10 +635,18 @@ const exportExcel = async function () {
     const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
         ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-    // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-    //     ElMessage.error('精网号必须为数字')
-    //     return
-    // }
+    if (searchForm.value.jwcode) {
+        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+        if (!isPositiveInteger) {
+            ElMessage.error('请输入正确的精网号')
+            return;
+        }
+    }
+    // 增加精网号长度限制，防止后端400错误
+    if (searchForm.value.jwcode.length > 8) {
+        ElMessage.error('精网号长度不能超过8位')
+        return;
+    }
 
     const params = {
         pageNum: pagination.value.pageNum,
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index dded353..e763ee4 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -115,7 +115,8 @@
             style="margin-top: 1vh;"></el-pagination>
     </el-card>
 
-    <el-dialog v-model="showEdit" title="退款" class="editDialog" overflow draggable style="width: 40vw; background-color: #F3FAFE !important;">
+    <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">
@@ -287,25 +288,26 @@ const getRefund = async function () {
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
             ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-        // if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
-        //     ElMessage.error('精网号必须为数字')
-        //     return
-        // }
-      if (searchForm.value.jwcode) {
-        const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
-        if (!isPositiveInteger) {
-          ElMessage.error('请输入正确的精网号')
-          return;
+        if (searchForm.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(searchForm.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
+        }        
+        // 增加精网号长度限制，防止后端400错误
+        if (searchForm.value.jwcode.length > 8) {
+            ElMessage.error('精网号长度不能超过8位')
+            return;
         }
-      }
 
-      const params = {
+        const params = {
             pageNum: pagination.value.pageNum,
             pageSize: pagination.value.pageSize,
             cashRecordDTO: {
                 jwcode: searchForm.value.jwcode,//精网号
                 name: searchForm.value.name,//姓名
-                markets: searchForm.value.market && searchForm.value.market.length > 0 ? [searchForm.value.market[searchForm.value.market.length - 1]] : [],  
+                markets: searchForm.value.market && searchForm.value.market.length > 0 ? [searchForm.value.market[searchForm.value.market.length - 1]] : [],
                 goodsName: goodsName,//商品名
                 statuses: statusParam.value,//10：地区财务待审核；12：地区财务驳回；
                 // 20：地区负责人待审核；22：地区负责人驳回；
@@ -375,25 +377,25 @@ const submitEdit = async function () {
             jwcode: editRow.value.jwcode,
             paymentAmount: editRow.value.paymentAmount,
             paymentCurrency: editRow.value.paymentCurrency,
-            newRefundGold: (editForm.value.partRefundGold*100),
-            newRefundFree: (editForm.value.partRefundFree)*100
+            newRefundGold: (editForm.value.partRefundGold * 100),
+            newRefundFree: (editForm.value.partRefundFree) * 100
 
         }
         console.log(editRow.value.goodsName);
-        
+
         if (editRow.value.goodsName != '金币充值') {
             params.newRefundGold = ''
-            params.newRefundFree = ''  
+            params.newRefundFree = ''
         }
-        if(editRow.value.goodsName == '金币充值'){
-            if(editForm.value.partRefundGold>editRow.value.gold){
-               ElMessage.error('退款金币数不能大于原金币数')
-               return
-            } 
-            if(editForm.value.partRefundFree>editRow.value.free){
-               ElMessage.error('退款免费金币数不能大于原免费金币数')
-               return
-            }       
+        if (editRow.value.goodsName == '金币充值') {
+            if (editForm.value.partRefundGold > editRow.value.gold) {
+                ElMessage.error('退款金币数不能大于原金币数')
+                return
+            }
+            if (editForm.value.partRefundFree > editRow.value.free) {
+                ElMessage.error('退款免费金币数不能大于原免费金币数')
+                return
+            }
         }
         const result = await API({
             url: '/Money/update',