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

src/views/home.vue

@@ -142,10 +142,15 @@ const selectStatusById = () => {
   if (hasPermission(permissionMapping.area_finance_collection_pending)) {
     status.push(0);
   }
-  // 地区负责人收款待审核
-  else if (hasPermission(permissionMapping.area_manager_collection_pending)) {
-    status.push(0);
+
+  //地区客服收款
+   if (hasPermission(permissionMapping.collection_area_customer_service)) {
+    status.push(2);
   }
+  // 地区负责人收款待审核
+  // else if (hasPermission(permissionMapping.area_manager_collection_pending)) {
+  //   status.push(0);
+  // }
 
  
   // ===== 退款流程状态 =====
@@ -154,17 +159,21 @@ const selectStatusById = () => {
     status.push(10);
   }
   // 地区负责人退款审核
-  else if (hasPermission(permissionMapping.audit_area_manager_refund)) {
+   if (hasPermission(permissionMapping.audit_area_manager_refund)) {
     status.push(20);
   }
   // 总部财务退款审核
-  else if (hasPermission(permissionMapping.audit_headquarters_refund)) {
+   if (hasPermission(permissionMapping.audit_headquarters_refund)) {
     status.push(30);
   }
   // 执行人待处理
-  else if (hasPermission(permissionMapping.view_execution_details)) {
+   if (hasPermission(permissionMapping.view_execution_details)) {
     status.push(40);
   }
+  //地区客服退款审核驳回
+   if (hasPermission(permissionMapping.refund_area_customer_service)) {
+    status.push(12,22,32);
+  }
 
   // 去重并返回结果（单一角色下实际不会有重复）
   return [...new Set(status)];

src/views/moneyManage/receiveDetail/receiveFinance.vue

@@ -209,7 +209,7 @@
                                     @click="openAuditForm(scope.row)">审核
                                 </el-link>
                                 <el-link
-                                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4) && scope.row.receivedMarket == scope.row.submitterMarket"
+                                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4) && scope.row.receivedMarket == adminData.markets"
                                     style="color: #2741DE;" @click="openEditForm(scope.row)">编辑
                                 </el-link>
                                 <el-link
@@ -907,6 +907,11 @@ const getlist = async () => {
                 ElMessage.error('请输入正确的精网号')
                 return;
             }
+            // 增加精网号长度限制，防止后端400错误
+            if (searchData.value.jwcode.length > 8) {
+                ElMessage.error('精网号长度不能超过8位')
+                return;
+            }
         }
         const result = await request({
             url: '/cashCollection/selectCollection',
@@ -956,6 +961,16 @@ const submitRefund = async () => {
         if (!refundFormData.value.refundReason) {
             return ElMessage.error('请输入退款原因');
         }
+        // 验证精网号格式和长度
+        if (refundFormData.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(refundFormData.value.jwcode);
+            if (!isPositiveInteger) {
+                return ElMessage.error('请输入正确的精网号');
+            }
+            if (refundFormData.value.jwcode.length > 8) {
+                return ElMessage.error('精网号长度不能超过8位');
+            }
+        }
         if (refundFormData.value.refundModel == 0) {
             refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
                 refundFormData.value.partRefundFree = refundFormData.value.freeGold

src/views/moneyManage/receiveDetail/receiveHead.vue

@@ -783,6 +783,11 @@ const getlist = async () => {
                 ElMessage.error('请输入正确的精网号')
                 return;
             }
+            // 添加长度验证，超过8位提示错误
+            if (searchData.value.jwcode.length > 8) {
+                ElMessage.error('精网号长度不能超过8位')
+                return;
+            }
         }
 
         // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
@@ -829,7 +834,6 @@ const resetRefund = () => {
 const submitRefund = async () => {
     try {
         if (refundFormData.value.goodsName != '金币充值') {
-
             return ElMessage.error('线上数据仅支持金币充值退款');
         }
         if (!refundFormData.value.refundModel) {
@@ -838,6 +842,16 @@ const submitRefund = async () => {
         if (!refundFormData.value.refundReason) {
             return ElMessage.error('请输入退款原因');
         }
+        // 添加精网号验证
+        if (refundFormData.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(refundFormData.value.jwcode);
+            if (!isPositiveInteger) {
+                return ElMessage.error('精网号格式不正确，必须为正整数');
+            }
+            if (refundFormData.value.jwcode.length > 20) {
+                return ElMessage.error('精网号长度不能超过20位');
+            }
+        }
         if (refundFormData.value.refundModel == 0) {
             refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
                 refundFormData.value.partRefundFree = refundFormData.value.freeGold

src/views/moneyManage/receiveDetail/receiveManage.vue

@@ -209,7 +209,7 @@
                                     @click="openAuditForm(scope.row)">审核
                                 </el-link>
                                 <el-link
-                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4) && scope.row.receivedMarket == scope.row.submitterMarket"
+                                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4) && scope.row.receivedMarket == adminData.markets"
                                     style="color: #2741DE;" @click="openEditForm(scope.row)">编辑
                                 </el-link>
                                 <el-link
@@ -907,6 +907,11 @@ const getlist = async () => {
                 ElMessage.error('请输入正确的精网号')
                 return;
             }
+            // 添加长度验证，超过8位提示错误
+            if (searchData.value.jwcode.length > 8) {
+                ElMessage.error('精网号长度不能超过8位')
+                return;
+            }
         }
         const result = await request({
             url: '/cashCollection/selectCollection',
@@ -1016,7 +1021,7 @@ const navigateTo = async (tab) => {
 // 2.4 审核功能
 // 打开审核弹窗
 const openAuditForm = (row) => {
-  auditFormData.value = {...row, market: row.marketName};
+    auditFormData.value = { ...row, market: row.marketName };
     ifGold(auditFormData.value)
     console.log('isGold', isGold.value);
 
@@ -1122,7 +1127,7 @@ watch(auditFormisible, (val) => {
 const openEditForm = (row) => {
     console.log('row.aaa', row.handlingCharge);
 
-  editFormData.value = {...row};
+    editFormData.value = { ...row };
     // 区分金币产品与普通产品
     if (row.goodsName === '金币充值') isEditGold.value = true;
     else isEditGold.value = false;
@@ -1234,7 +1239,7 @@ const handleMouseMove = (e) => {
 // 获取管理员信息
 const getAdminData = async () => {
     try {
-    const result = await API({url: '/admin/userinfo', data: {}});
+        const result = await API({ url: '/admin/userinfo', data: {} });
         adminData.value = result;
 
         // 超级管理员判断（仅用于角色切换权限）
@@ -1258,7 +1263,7 @@ const getAdminData = async () => {
 // 获取活动列表
 const getActivitys = async () => {
     try {
-    const result = await API({url: '/cashCollection/getActivityList', data: {}});
+        const result = await API({ url: '/cashCollection/getActivityList', data: {} });
         if (result.code === 200) {
             activityList.value = result.data;
         } else {
@@ -1271,8 +1276,8 @@ const getActivitys = async () => {
 };
 
 // 2.8 节流函数（防止重复提交）
-const throttledhandelAuditReject = _.throttle(handelAuditReject, 3000, {trailing: false});
-const throttledsubmitEditForm = _.throttle(submitEditForm, 3000, {trailing: false});
+const throttledhandelAuditReject = _.throttle(handelAuditReject, 3000, { trailing: false });
+const throttledsubmitEditForm = _.throttle(submitEditForm, 3000, { trailing: false });
 const throttledsubmitRefund = _.throttle(submitRefund, 5000, {
     trailing: false
 })
@@ -1299,20 +1304,14 @@ onMounted(async () => {
 });
 
 // 2.10 未使用函数占位（避免报错）
-const handleCurrencyChange = () => {
-};
+const handleCurrencyChange = () => { };
 const beforeUpload = () => true;
-const handelImgErr = () => {
-};
-const handleImageChange = () => {
-};
-const customUpload = () => {
-};
-const handleDatePickerChange = () => {
-};
+const handelImgErr = () => { };
+const handleImageChange = () => { };
+const customUpload = () => { };
+const handleDatePickerChange = () => { };
 const disabledDate = () => false;
-const handleSortChange = () => {
-};
+const handleSortChange = () => { };
 const getMarket = async function () {
     try {
         const result = await API({

src/views/moneyManage/receiveDetail/receiveService.vue

@@ -525,6 +525,11 @@ const getlist = async () => {
                 ElMessage.error('请输入正确的精网号')
                 return;
             }
+            // 添加精网号长度验证
+            if (searchData.value.jwcode.length > 8) {
+                ElMessage.error('精网号长度不能超过8位')
+                return;
+            }
         }
 
         // if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
@@ -984,6 +989,19 @@ const submitRefund = async () => {
                 return
             }
         }
+        
+        // 添加精网号验证
+        if (refundFormData.value.jwcode) {
+            const isPositiveInteger = /^[1-9]\d*$/.test(refundFormData.value.jwcode);
+            if (!isPositiveInteger) {
+                ElMessage.error('请输入正确的精网号')
+                return;
+            }
+            if (refundFormData.value.jwcode.length > 8) {
+                ElMessage.error('精网号长度不能超过8位')
+                return;
+            }
+        }
         const result = await request({
             url: '/Money/add',
             data: {