From 7fb0ef1b6fd550e90c2a99b52b21f5b50ec7ad92 Mon Sep 17 00:00:00 2001
From: lihuilin <analsak@163.com>
Date: Thu, 20 Nov 2025 09:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A5=BD=E5=A4=9Abug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activityManage/activity.vue              |  9 ++++----
 src/views/moneyManage/executor/executor.vue        | 19 +++++++++++++++--
 .../moneyManage/refundDetail/refundCharge.vue      | 10 ++++++++-
 .../moneyManage/refundDetail/refundFinance.vue     | 10 ++++++++-
 .../moneyManage/refundDetail/refundHeader.vue      | 24 ++++++++++++++++++++--
 .../moneyManage/refundDetail/refundService.vue     | 16 ++++++++++-----
 6 files changed, 73 insertions(+), 15 deletions(-)

diff --git a/src/views/activityManage/activity.vue b/src/views/activityManage/activity.vue
index 4b35fb6..b0346cf 100644
--- a/src/views/activityManage/activity.vue
+++ b/src/views/activityManage/activity.vue
@@ -78,7 +78,7 @@
     <el-dialog v-model="showAdd" width="20vw" draggable align-center style="background-color: rgb(243,250,254);">
         <div class="add-item">
             <el-text size="large">活动名称：</el-text>
-            <el-input v-model="addForm.activityName" style="width: 12vw" placeholder="请输入活动名称" maxlength="100" clearable />
+            <el-input v-model="addForm.activityName" style="width: 12vw" placeholder="请输入活动名称" maxlength="200" clearable />
         </div>
         <div class="add-item">
             <el-text size="large">业绩归属：</el-text>
@@ -111,7 +111,7 @@
     <el-dialog v-model="showEdit" width="20vw" draggable align-center style="background-color: rgb(243,250,254);">
         <div class="edit-item">
             <el-text size="large">活动名称：</el-text>
-            <el-input v-model="editForm.activityName" style="width: 12vw" placeholder="请输入活动名称" maxlength="100" clearable />
+            <el-input v-model="editForm.activityName" style="width: 12vw" placeholder="请输入活动名称" maxlength="200" clearable />
         </div>
 
         <div class="edit-item">
@@ -157,8 +157,8 @@ const { adminData, menuTree } = storeToRefs(adminStore)
 import ConfirmDialog from '@/components/dialogs/ConfirmDialog.vue'
 import _ from 'lodash'
 // 活动名称正则表达式
-const activityNameReg = /^[-a-zA-Z0-9\u4e00-\u9fa5，。！？、；：“”‘’（）《》【】——～,.!?:;'"()\[\]_&+=]{0,100}$/;
-
+const activityNameReg = /^[-a-zA-Z0-9\u4e00-\u9fa5，。！？、；：“”‘’（）《》【】——~,.!?:;'"()\[\]_&+=]{0,100}$/;
+//const activityNameReg = /^[-a-zA-Z0-9\u4e00-\u9fa5，。！？、；：“”‘’（）《》【】——~,.!?:;'"()[]_-&+=]{0,200}$/;
 const tableData = ref([])
 const pagination = ref({
     pageNum: 1,
@@ -290,6 +290,7 @@ const handleEdit = async function () {
         ElMessage.error('请选择结束时间')
         return
     }
+
     if(editForm.value.businessBelong === '客户归属地'){
         editForm.value.area = []
     }
diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue
index dda4f9b..3b0e71e 100644
--- a/src/views/moneyManage/executor/executor.vue
+++ b/src/views/moneyManage/executor/executor.vue
@@ -123,6 +123,7 @@
       </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"
       layout="total, sizes, prev, pager, next, jumper" :total="pagination.total" style="margin-top: 1vh;" />
   </el-card>
 
@@ -166,7 +167,7 @@
         </div>
         <div class="dialog-item">
           <el-text style="width:4vw;">付款时间</el-text>
-          <el-date-picker v-model="editRow.payTime" type="datetime" style="width:10vw;" disabled />
+          <el-input v-model="editRow.payTime" style="width:10vw;" disabled />
         </div>
         <div class="dialog-item">
           <el-text style="width:4vw;">提交人</el-text>
@@ -342,7 +343,7 @@ const submitRefund = async function () {
       hideEditDialog()
       getRefund()
     } else {
-      ElMessage.error(result.data.msg || '提交失败')
+      ElMessage.error(result.msg || '提交失败')
     }
   } catch (error) {
     ElMessage.error(error.message || '提交失败')
@@ -379,6 +380,12 @@ const getMarket = async function () {
 }
 const showEditDialog = (row) => {
   editRow.value = row
+  editForm.value.refundCurrency = ''
+  editForm.value.refundAmount = ''
+  editForm.value.channels = []
+  editForm.value.refundTime = ''
+  editForm.value.refundRemark = ''
+  editForm.value.imageUrl = ''
   showEdit.value = true
 }
 const hideEditDialog = () => {
@@ -548,6 +555,14 @@ const reset = function () {
   dateRange.value = []
   getRefund()
 }
+const handlePageSizeChange = function (val) {
+    pagination.value.pageSize = val
+    getRefund()
+}
+const handleCurrentChange = function (val) {
+    pagination.value.pageNum = val
+    getRefund()
+}
 onMounted(() => {
   console.log('???????????????????', adminData.value)
   getRefund()
diff --git a/src/views/moneyManage/refundDetail/refundCharge.vue b/src/views/moneyManage/refundDetail/refundCharge.vue
index 1ef9c97..baa2aee 100644
--- a/src/views/moneyManage/refundDetail/refundCharge.vue
+++ b/src/views/moneyManage/refundDetail/refundCharge.vue
@@ -15,7 +15,7 @@
                 <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;"
                     placeholder="请选择产品名称" clearable />
             </div>
-            <div class="item1">
+            <div class="item1" v-if="adminData.markets === '总部'">
                 <el-text size="large" style="width:4vw;">所属地区</el-text>
                 <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" placeholder="请选择所属地区"
                     clearable @change="handleMarketChange" />
@@ -745,6 +745,14 @@ const disabledDate = (time) => {
     const limitDate = new Date(2025, 0, 1);
     return time.getTime() < limitDate.getTime();
 }
+const handlePageSizeChange = function (val) {
+    pagination.value.pageSize = val
+    getRefund()
+}
+const handleCurrentChange = function (val) {
+    pagination.value.pageNum = val
+    getRefund()
+}
 onMounted(() => {
     getRefund()
     getMarket()
diff --git a/src/views/moneyManage/refundDetail/refundFinance.vue b/src/views/moneyManage/refundDetail/refundFinance.vue
index cfdfc64..e7d4873 100644
--- a/src/views/moneyManage/refundDetail/refundFinance.vue
+++ b/src/views/moneyManage/refundDetail/refundFinance.vue
@@ -14,7 +14,7 @@
                 <el-text size="large" style="width:4vw;">产品名称</el-text>
                 <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" clearable />
             </div>
-            <div class="item1">
+            <div class="item1" v-if="adminData.markets === '总部'">
                 <el-text size="large" style="width:4vw;">所属地区</el-text>
                 <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" placeholder="请选择所属地区"
                     clearable @change="handleMarketChange" />
@@ -809,6 +809,14 @@ const disabledDate = (time) => {
     const limitDate = new Date(2025, 0, 1);
     return time.getTime() < limitDate.getTime();
 }
+const handlePageSizeChange = function (val) {
+    pagination.value.pageSize = val
+    getRefund()
+}
+const handleCurrentChange = function (val) {
+    pagination.value.pageNum = val
+    getRefund()
+}
 onMounted(() => {
     console.log('???????????????????', adminData.value)
     getRefund()
diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue
index 97bd360..916ff5a 100644
--- a/src/views/moneyManage/refundDetail/refundHeader.vue
+++ b/src/views/moneyManage/refundDetail/refundHeader.vue
@@ -15,7 +15,7 @@
                 <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;"
                     placeholder="请选择产品名称" clearable />
             </div>
-            <div class="item1">
+            <div class="item1" v-if="adminData.markets === '总部'">
                 <el-text size="large" style="width:4vw;">所属地区</el-text>
                 <el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" placeholder="请选择所属地区"
                     clearable @change="handleMarketChange" />
@@ -234,7 +234,7 @@
         <div class="steps">
             <div class="steps-content">
                 <el-steps :active="currentStep" align-center>
-                    <el-step>
+                    <el-step v-if="false">
                         <template #title>
                             <div>
                                 提交人<br>{{ submitter || '未知提交人' }}
@@ -352,6 +352,18 @@ import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menu
 import moment from 'moment'
 import { productList } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
 
+const startsWith1 = (mainStr, prefix) => {
+    // 处理前缀为空字符串的情况（空字符串是所有字符串的前缀）
+    if (prefix === '') {
+        return true;
+    }
+    // 处理主字符串长度小于前缀长度的情况
+    if (mainStr.length < prefix.length) {
+        return false;
+    }
+    // 比较主字符串开头与前缀相同长度的部分
+    return mainStr.substring(0, prefix.length) === prefix;
+}
 const currentStep = ref(0)// 进度图
 const searchForm = ref({
     jwcode: '',
@@ -798,6 +810,14 @@ const disabledDate = (time) => {
     const limitDate = new Date(2025, 0, 1);
     return time.getTime() < limitDate.getTime();
 }
+const handlePageSizeChange = function (val) {
+    pagination.value.pageSize = val
+    getRefund()
+}
+const handleCurrentChange = function (val) {
+    pagination.value.pageNum = val
+    getRefund()
+}
 onMounted(() => {
     console.log('???????????????????', adminData.value)
     getRefund()
diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue
index f28a8a2..a8410d5 100644
--- a/src/views/moneyManage/refundDetail/refundService.vue
+++ b/src/views/moneyManage/refundDetail/refundService.vue
@@ -14,7 +14,7 @@
                 <el-text size="large" style="width:4vw;">产品名称</el-text>
                 <el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" clearable />
             </div>
-            <div class="item1">
+            <div class="item1" v-if="adminData.markets === '总部'">
                 <el-text size="large" style="width:4vw;">所属地区</el-text>
                 <el-cascader style="width: 9vw;" v-model="searchForm.market" :options="market" placeholder="请选择所属地区"
                     clearable @change="handleMarketChange" />
@@ -199,7 +199,7 @@
                 </div>
                 <div>ps:请在退款理由表明用户的退款需求。</div>
                 <div style="display:flex;justify-content: center;margin-top: 5vh;">
-                    <el-button type="default" @click="resetEdit">重置</el-button>
+                    <el-button type="default" @click="cancelEdit">取消</el-button>
                     <el-button type="primary" @click="submitEdit">提交</el-button>
                 </div>
             </div>
@@ -434,9 +434,15 @@ const previewImage = (imageUrl) => {
         document.body.removeChild(viewer);
     });
 };
-
-
-
+const cancelEdit = function () {
+    editForm.value = {
+        refundModel: '',
+        refundReason: '',
+        partRefundGold: '',
+        partRefundFree: ''
+    }
+    showEdit.value = false
+}
 const currencies = ref([
     {
         value: '新币',