Merge branch 'zhangrenyuan/feature-20251209163007-多语言二期' into milestone-20251209-多语言二期

修复中文翻译文件中多余的括号和英文翻译文件中的格式问题
将退款服务页面中的客户名称文本引用从`elmessage.customerName`更正为`common.customerName`

src/views/moneyManage/refundDetail/refundCharge.vue

@@ -340,7 +340,7 @@
 import { ref, onMounted, computed } from 'vue'
 import { ElMessage } from 'element-plus'
 import API from '@/util/http.js'
-const uploadUrl = 'https://api.homilychart.com/hljw/api/aws/upload'
+const uploadUrl = 'https://api.homilychart.com/hljw/api/aws/upload  '
 import { useAdminStore } from "@/store/index.js"
 import { storeToRefs } from "pinia"
 import dayjs from 'dayjs'

src/views/moneyManage/refundDetail/refundFinance.vue

@@ -335,11 +335,12 @@
         </template>
     </el-dialog>
 </template>
+
 <script setup>
 import { ref, onMounted, computed } from 'vue'
 import { ElMessage } from 'element-plus'
 import API from '@/util/http.js'
-const uploadUrl = 'https://api.homilychart.com/hljw/api/aws/upload'
+const uploadUrl = 'https://api.homilychart.com/hljw/api/aws/upload  '
 import { useAdminStore } from "@/store/index.js"
 import { storeToRefs } from "pinia"
 import dayjs from 'dayjs'
@@ -470,16 +471,13 @@ const getRefund = async function () {
       pageNum: pagination.value.pageNum,
       pageSize: pagination.value.pageSize,
       cashRecordDTO: {
-                jwcode: searchForm.value.jwcode,//精网号
-                name: searchForm.value.name,//姓名
+        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]] : [],
-                goodsName: goodsName,//商品名
-                statuses: statusParam.value,//10：地区财务待审核；12：地区财务驳回；
-                // 20：地区负责人待审核；22：地区负责人驳回；
-                // 30：总部财务待审核；32：总部财务驳回；
-                // 40：执行人待处理；41：执行人已处理，退款完成；
-                paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),//付款币种
-                payType: searchForm.value.payType,//支付方式
+        goodsName: goodsName,
+        statuses: statusParam.value,
+        paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),
+        payType: searchForm.value.payType,
         startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
         endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
         adminId: adminData.value.id
@@ -498,6 +496,7 @@ const getRefund = async function () {
         ElMessage.error(error.message || t('elmessage.searchFailed'))
     }
 }
+
 // 审核通过
 const handlePass = async function () {
     if (!hasMenuPermission(menuTree.value, permissionMapping.audit_area_finance_refund)) {
@@ -525,6 +524,7 @@ const handlePass = async function () {
         ElMessage.error(error.message || t('elmessage.approveFailed'))
     }
 }
+
 // 审核驳回
 const handleReject = async function () {
     if (!hasMenuPermission(menuTree.value, permissionMapping.audit_area_finance_refund)) {
@@ -560,19 +560,14 @@ const handleReject = async function () {
 const getMarket = async function () {
   try {
     const result = await API({
-
       url: '/market/selectMarket',
     })
-        console.log('看看地区树', result)
-
     const transformTree = (nodes) => {
       const allChildren = nodes.flatMap(node => node.children || []);
-
       return allChildren.map(child => {
         const grandchildren = child.children && child.children.length
             ? transformTree([child])
             : null;
-
         return {
           value: child.id,
           label: child.name,
@@ -581,11 +576,11 @@ const getMarket = async function () {
       });
     };
     market.value = transformTree(result.data)
-        console.log('转换后的地区树==============', market.value)
   } catch (error) {
     console.log('请求失败', error)
   }
 }
+
 const showStep = function (row) {
     if (!hasMenuPermission(menuTree.value, permissionMapping.track_area_finance_refund_progress)) {
         ElMessage.error(t('elmessage.noPermission'))
@@ -607,9 +602,9 @@ const showStep = function (row) {
     isReject.value = reject
   }
 
-    console.log('步骤条状态', currentStep.value)
   showSteps.value = true
 }
+
 const exportExcel = async function () {
     const statusParam = ref([10, 20, 22, 30, 32, 40, 41])
     if (searchForm.value.statuses === t('cash.statusList.passed')) {
@@ -644,16 +639,13 @@ const exportExcel = async function () {
     pageNum: pagination.value.pageNum,
     pageSize: pagination.value.pageSize,
     cashRecordDTO: {
-            jwcode: searchForm.value.jwcode,//精网号
-            name: searchForm.value.name,//姓名
+      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]] : [],
-            goodsName: goodsName,//商品名
-            statuses: statusParam.value,//10：地区财务待审核；12：地区财务驳回；
-            // 20：地区负责人待审核；22：地区负责人驳回；
-            // 30：总部财务待审核；32：总部财务驳回；
-            // 40：执行人待处理；41：执行人已处理，退款完成；
-            paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),//付款币种
-            payType: searchForm.value.payType,//支付方式
+      goodsName: goodsName,
+      statuses: statusParam.value,
+      paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),
+      payType: searchForm.value.payType,
       startTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
       endTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
       adminId: adminData.value.id
@@ -667,10 +659,12 @@ const exportExcel = async function () {
         ElMessage.error(res.msg || t('elmessage.exportFailed'))
     }
 }
+
 const openExportList = () => {
   getExportList()
   exportListVisible.value = true
 }
+
 const getExportList = async () => {
     exportListLoading.value = true
     try {
@@ -690,6 +684,7 @@ const getExportList = async () => {
         exportListLoading.value = false
     }
 }
+
 const downloadExportFile = (item) => {
     if (item.state === 2) {
         const link = document.createElement('a')
@@ -700,22 +695,17 @@ const downloadExportFile = (item) => {
         ElMessage.warning(t('elmessage.exportingInProgress'))
     }
 }
-//根据状态返回对应的标签类型
+
 const getTagType = (state) => {
   switch (state) {
-        case 0:
-            return 'info';
-        case 1:
-            return 'primary';
-        case 2:
-            return 'success';
-        case 3:
-            return 'danger';
-        default:
-            return 'info';
+    case 0: return 'info';
+    case 1: return 'primary';
+    case 2: return 'success';
+    case 3: return 'danger';
+    default: return 'info';
   }
 }
-//根据状态返回对应的标签文案
+
 const getTagText = (state) => {
     switch (state) {
         case 0:
@@ -730,48 +720,60 @@ const getTagText = (state) => {
             return t('elmessage.unknownStatus');
     }
 }
+
 const showAudit2 = function (row) {
   auditRow.value = row
   showAudit.value = true
 }
+
 const reset = function () {
   searchForm.value = {
     jwcode: '',
     markets: [],
     statuses: []
   }
-    // 重置页码
   pagination.value.pageNum = 1
   dateRange.value = []
   getRefund()
 }
+
 const hideReject = function () {
   showReject.value = false
   addForm.value.remark = ''
 }
+
 const defaultTime = [
   new Date(2000, 1, 1, 0, 0, 0),
   new Date(2000, 2, 1, 23, 59, 59),
 ]
+
 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()
 }
+
+const handleDatePickerChange = () => {
+  // 可选：若需清除其他时间快捷按钮状态
+}
+
 onMounted(() => {
-    console.log('???????????????????', adminData.value)
   getRefund()
   getMarket()
 })
 </script>
+
 <style scoped lang="scss">
+/* 样式完全保留，仅注释微调 */
 :deep(.el-table__header-wrapper),
 :deep(.el-table__body-wrapper),
 :deep(.el-table__cell),

src/views/moneyManage/refundDetail/refundHeader.vue

@@ -352,7 +352,7 @@ import BackgroundSvg from '@/assets/images/refund-progress.png'
 import { ref, onMounted } from 'vue'
 import { ElMessage } from 'element-plus'
 import API from '@/util/http.js'
-const uploadUrl = 'https://api.homilychart.com/hljw/api/aws/upload'
+const uploadUrl = 'https://api.homilychart.com/hljw/api/aws/upload  '
 import { useAdminStore } from "@/store/index.js"
 import { storeToRefs } from "pinia"
 import dayjs from 'dayjs'

src/views/moneyManage/refundDetail/refundService.vue

@@ -219,11 +219,12 @@
         </div>
     </el-dialog>
 </template>
+
 <script setup>
 import { ref, onMounted, computed } from 'vue'
 import { ElMessage } from 'element-plus'
 import API from '@/util/http.js'
-const uploadUrl = 'https://api.homilychart.com/hljw/api/aws/upload'
+const uploadUrl = 'https://api.homilychart.com/hljw/api/aws/upload  '
 import { useAdminStore } from "@/store/index.js"
 import { storeToRefs } from "pinia"
 import dayjs from 'dayjs'
@@ -231,7 +232,6 @@ const adminStore = useAdminStore()
 const { adminData, menuTree } = storeToRefs(adminStore)
 import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
 import ConfirmDialog from '@/components/dialogs/ConfirmDialog.vue'
-import { pa } from 'element-plus/es/locales.mjs'
 import { productList, CurrencyForId } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
 import RefundRecallBackground from '@/assets/images/refund-recall.png'
 import { isNumber } from 'lodash'
@@ -580,6 +580,7 @@ onMounted(() => {
   console.log('???????????????????', adminData.value)
 })
 </script>
+
 <style scoped lang="scss">
 :deep(.el-table__header-wrapper),
 :deep(.el-table__body-wrapper),