退款bug修改

src/components/locales/lang/en.js

@@ -10,6 +10,7 @@ export default {
     pleaseInputName: "Enter name",
     customerName: "Customer",
     customerNamePlaceholder: "Enter customer name",
+    customer: "Customer",
     jwcode: "Homily ID",
     jwcodePlaceholder: "Enter Homily ID",
     activityName: "Activity",
@@ -203,6 +204,7 @@ export default {
     refreshFailed: 'Refresh failed: {msg}',
     unknownError: 'Unknown error',
     refreshError: 'Refresh error, try again',
+    refundagain:'Refund submitted. Please do not submit again',
     logoutSuccess: 'Logged out',
     staffHidden: 'Staff data hidden',
     staffShown: 'Staff data shown',
@@ -1345,6 +1347,22 @@ export default {
       invalidFormat:"Invalid amount format. Maximum 2 decimal places allowed.",
       paymentMust:"Payment amount must be 0",
       remarksexceed:"Remarks cannot exceed 100 characters",
+       marketConsumption:"Market Consumption Gold Performance Adjustment",
+      time:"Select Time",
+      coefficient:"Coefficient Adjustment",
+      coefficientPlaceholder:"Please enter coefficient adjustment",
+      adjustment:"Transfer In",
+      adjustmentOut:"Transfer Out",
+      marketTeam:"Market Team",
+      total:"Total",
+      performanceAdjustment:"Performance Adjustment",
+      payTime:"Payment Time",
+      orderCode:"System Transaction No.",
+      receivedMarketName:"Received Market",
+      performanceMarket:"Performance Market",
+      goodsName:"Income Category",
+      goodNum:"Quantity",
+      payType:"Payment Method",
     }
   },
 

src/components/locales/lang/zh-CN.js

@@ -10,6 +10,7 @@ export default {
     pleaseInputName: "请输入姓名",
     customerName: "客户姓名",
     customerNamePlaceholder: "请输入客户姓名",
+    customer: "客户",
     jwcode: "精网号",
     jwcodePlaceholder: "请输入精网号",
     activityName: "活动名称",
@@ -107,7 +108,7 @@ export default {
     add: "添加",
     addUser: "新增用户",
     addRole: "新增角色",
-    addCashFlow:"新增流水",
+    addCashFlow: "新增流水",
     save: "保存",
     saving: "保存中...",
     addActivity: "新增活动",
@@ -173,7 +174,7 @@ export default {
     all: "全部",
     unknownSubmitter: "未知提交人",
     noAuditorRecorded: "未记录审核人",
-    noExecutorRecorded: "未记录执行人"
+    noExecutorRecorded: "未记录执行人",
   },
 
   // 权限模块
@@ -183,10 +184,11 @@ export default {
     changeRoleConfirmContent1: "确认修改权限角色？<br>您正在将【",
     changeRoleConfirmContent2: "】的权限角色从【",
     changeRoleConfirmContent3: "】修改为【",
-    changeRoleConfirmContent4: "】<br>变更后，该用户的可操作权限将同步更新为新角色配置，涉及数据访问、功能操作等权限变化，请谨慎确认。",
+    changeRoleConfirmContent4:
+      "】<br>变更后，该用户的可操作权限将同步更新为新角色配置，涉及数据访问、功能操作等权限变化，请谨慎确认。",
     changeRoleSuccessContent1: "用户",
     changeRoleSuccessContent2: "的权限角色已更改为【",
-    roleRegionNote: "此地区无实际意义，仅用于各分部负责人查看其地区角色"
+    roleRegionNote: "此地区无实际意义，仅用于各分部负责人查看其地区角色",
   },
   // 提示信息组
   elmessage: {
@@ -209,6 +211,7 @@ export default {
     jumpSuccess: "跳转成功",
     jumpFailed: "跳转失败",
     refundFailed: "退款失败",
+    refundagain:"已提交退款，请勿重复提交",
     oldPasswordError: "原密码错误，请重新输入",
     addSuccess: "添加成功", // 大写是添加成功，小写是新增
     addsuccess: "新增成功",
@@ -407,7 +410,7 @@ export default {
     activityLoadFailed: "活动列表加载失败，请稍后重试",
     activityDataLoadFailed: "活动数据加载异常，请稍后重试",
     getDataFailed: "获取数据失败",
-    networkError:"网络错误",
+    networkError: "网络错误",
     exportWalletDetailError: "导出钱包明细出错",
     selectCompanyWallet: "请选择公司钱包",
     // 权限
@@ -473,9 +476,9 @@ export default {
     activity: "活动名称",
     receiveArea: "到账地区",
     performanceMarket: "业绩归属地区",
-    receiveType:"收入类别",
-    paymentMethod:"付款方式",
-    nums:"个数",
+    receiveType: "收入类别",
+    paymentMethod: "付款方式",
+    nums: "个数",
     startTime: "开始时间",
     endTime: "结束时间",
     status: "状态",
@@ -549,7 +552,7 @@ export default {
     activityStatus: {
       notStarted: "未开始",
       inProgress: "进行中",
-      ended: "已结束"
+      ended: "已结束",
     },
     operation: "操作",
     configTime: "配置时间",
@@ -697,7 +700,7 @@ export default {
     similarCosumeRecords: "检测到该用户近期有相似消耗记录",
     rechargePermanentGold: "充值永久金币",
     buy: "购买",
-    orderStatus:'订单状态',
+    orderStatus: "订单状态",
     operator: "操作人",
     submitter: "提交人",
     continueOperation: "是否继续操作？",
@@ -1068,8 +1071,8 @@ export default {
       placeholder: "请选择语言",
       options: {
         zhCN: "中文(简体)",
-        en: "English"
-      }
+        en: "English",
+      },
     },
     showStaffData: "显示员工数据",
     hideStaffData: "隐藏员工数据",
@@ -1104,7 +1107,7 @@ export default {
       againPasswordPlaceholder: "请再次输入新密码",
       tips: {
         lengthAndChars: "密码由8-16位数字、字母或符号组成",
-        complexity: "至少含2种以上字符"
+        complexity: "至少含2种以上字符",
       },
       rules: {
         allowedChars: "密码只能包含数字、字母或符号",
@@ -1113,15 +1116,15 @@ export default {
         complexity: "密码至少包含两种类型（数字、字母或符号）",
         notMatch: "两次输入密码不一致",
         newPasswordRequired: "新密码不能为空",
-        againPasswordRequired: "请再次输入新密码"
+        againPasswordRequired: "请再次输入新密码",
       },
-      submitting: "修改中..."
+      submitting: "修改中...",
     },
     difftime: {
       minuteAgo: "分钟前",
       hourAgo: "小时前",
       yesterday: "昨天",
-    }
+    },
   },
 
   // 现金管理
@@ -1161,9 +1164,9 @@ export default {
       paymentAsia: "PaymentAsia",
       transfer: "E-Transfer",
       iotPay: "IOT Pay",
-      stripe3:'Stripe3',
-      paysolution:'paysolution',
-      stripe2:'Stripe2',
+      stripe3: "Stripe3",
+      paysolution: "paysolution",
+      stripe2: "Stripe2",
     },
     statusList: {
       submitted: "已提交",
@@ -1312,7 +1315,7 @@ export default {
     refundConfirmTitle: "退款确认",
     refundConfirmContent: "确定要对订单 {orderNo} 进行退款吗？",
     //钱包
-    wallet:{
+    wallet: {
       HongKongWallet: "香港钱包",
       MalaysiaWallet: "马来西亚钱包",
       CanadaWallet: "加拿大钱包",
@@ -1321,9 +1324,9 @@ export default {
       ThailandHAWallet: "泰国HA钱包",
       ThailandHSWallet: "泰国HS钱包",
       VietnamHCMWallet: "越南钱包",
-      BeijingWallet: "北京公司钱包"
+      BeijingWallet: "北京公司钱包",
     },
-    cashFlow:{
+    cashFlow: {
       otherIncome:"其他收入",
       addFee:"手续费补充",
       performanceMarket:"业绩归属地区",
@@ -1352,20 +1355,36 @@ export default {
       remarks:"备注",
       remarksPlaceholder:"请输入备注 (选填，限制100字)",
       remarkPlaceholderDate:"需填写手续费结算周期（如“2026年3月12日iPay88手续费”）",
-      cancel:"取消",
-      submit:"提交",
-      ipay88:"iPay88",
-      cardPayment:"刷卡",
-      fixedProcessingFee:"固定手续费",
-      settlementRegion:"到账地区",
-      Malaysia:"马来西亚",
-      processingFee:"手续费",
-      processingFeePlaceholder:"请输入手续费",
-      quantityMustBeNumber:"个数必须为数字",
-      invalidFormat:"金额格式不正确，最多两位小数",
-      paymentMust:"付款金额必须为0",
-      remarksexceed:"备注不能超过100字",
-    }
+      cancel: "取消",
+      submit: "提交",
+      ipay88: "iPay88",
+      cardPayment: "刷卡",
+      fixedProcessingFee: "固定手续费",
+      settlementRegion: "到账地区",
+      Malaysia: "马来西亚",
+      processingFee: "手续费",
+      processingFeePlaceholder: "请输入手续费",
+      quantityMustBeNumber: "个数必须为数字",
+      invalidFormat: "金额格式不正确，最多两位小数",
+      paymentMust: "付款金额必须为0",
+      remarksexceed: "备注不能超过100字",
+      marketConsumption: "市场消耗金币业绩调整",
+      time: "选择时间",
+      coefficient: "系数调整",
+      coefficientPlaceholder: "请输入系数调整",
+      adjustment: "调入",
+      adjustmentOut: "调出",
+      marketTeam: "市场团队",
+      total: "合计",
+      performanceAdjustment: "业绩调整",
+      payTime: "付款时间",
+      orderCode: "系统交易号",
+      receivedMarketName: "到账地区",
+      performanceMarket: "业绩归属地区",
+      goodsName: "收入类别",
+      goodNum: "个数",
+      payType: "付款方式",
+    },
   },
 
   // 消息

src/utils/menuTreePermission.js

@@ -175,6 +175,9 @@ export const permissionMapping = {
     financial_accounting: 147,                 // 财务核算
     cash_flow_ledger: 148,                     // 资金流水账
      performance_attribution_accounting: 149,  // 业绩归属台账
+
+     new_transaction_flow: 162,              // 新增流水
+     performance_adjustment: 163,              // 业绩调整
 }
 
 // 递归查找菜单中是否存在目标id

src/views/moneyManage/financialAccount/cashFlow.vue

@@ -13,9 +13,10 @@ import { normalizePayType,MarketNameForId, CurrencyForId, } from '@/views/moneyM
 import { isTemplate } from 'element-plus/es/utils/index.mjs'
 import { Row } from 'vxe-pc-ui'
 import CashManagement from '@/components/workspace/CashManagement.vue'
+import { permissionMapping, hasMenuPermission } from "@/utils/menuTreePermission.js"
 
 const adminStore = useAdminStore()
-const { adminData } = storeToRefs(adminStore)
+const { adminData, menuTree,flag } = storeToRefs(adminStore)
 
 const { t } = useI18n()
 const route = useRoute()
@@ -38,6 +39,16 @@ const paytypeList = [
   t('cash.payMethods.check'),        // 支票 
 ]
 
+// 新增流水权限
+const hasNewTransactionFlow = ref(false)
+
+// 初始化权限状态
+const initPermissions = async () => {
+  if (!menuTree.value || !menuTree.value.length) return;
+  // 新增流水权限
+  hasNewTransactionFlow.value = hasMenuPermission(menuTree.value, permissionMapping.new_transaction_flow);
+};
+
 const payPlatformOptions = ref([...paytypeList])
 
 const marketFilter = (value) => {
@@ -262,7 +273,6 @@ const openRefundConfirm = () => {
     permanentGold: null,
     freeGold: null,
   }
-  
 }
 const openRefundDialog = () => {
   refundDialog.value = true
@@ -286,6 +296,10 @@ const resetRefund = () => {
 }
 const handleRefund = async () => {
   try {
+    if(refundFormData.value.status == 6){
+      ElMessage.error(t('elmessage.refundagain'))
+        return
+    }
     if (refundFormData.value.refundModel == 1) {
       if (Number(refundFormData.value.permanentGold || 0) > Number(refundFormData.value.oldpermanentGold || 0)) {
         ElMessage.error(t('elmessage.limitRefundGoldNotExceedOriginal'))
@@ -665,6 +679,7 @@ const handlePreviewClick=()=>{
   }
 }
 onMounted(async () => {
+  await initPermissions()
   await getMarket()
   await getPayPlatformOptions() 
   // 处理从工作台跳转过来的地区参数
@@ -736,7 +751,7 @@ onMounted(async () => {
             <el-button type="success" @click="handleReset">{{ t('common.reset') }}</el-button>
           </div>
           <div class="newAdd">
-            <el-button class="newAdd_btn" @click="addCashFlow('other')">{{ t('common.addCashFlow') }}</el-button>
+            <el-button v-if="hasNewTransactionFlow" class="newAdd_btn" @click="addCashFlow('other')">{{ t('common.addCashFlow') }}</el-button>
           </div>
         </div>
       </div>
@@ -895,7 +910,7 @@ onMounted(async () => {
       </el-form>
       <div style="display:flex;justify-content: center;margin-top: 5vh;" class="btnDiv">
         <el-button type="default" style="background-color: #7E91FF;" @click="showDetail = false">{{t('common.cancel')}}</el-button>
-        <el-button type="primary" style="background-color: #2741DE; margin-left: 2.5vw;" @click="openRefundConfirm">{{ t('common.refund') }}</el-button>
+        <el-button v-show="formDataRow.orderCode.slice(0, 4) == 'GOLD' && formDataRow.status === 4 " type="primary" style="background-color: #2741DE; margin-left: 2.5vw;" @click="openRefundConfirm">{{ t('common.refund') }}</el-button>
       </div>
     </el-dialog>
 
@@ -1321,6 +1336,7 @@ onMounted(async () => {
 }
 
 .newAdd {
+  margin-left: auto;
   display: flex;
   width: 240px;
   justify-content: flex-end;

src/views/moneyManage/financialAccount/performanceAttribution.vue

@@ -4,31 +4,45 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import request from '@/util/http.js'
 import dayjs from 'dayjs'
 import { useI18n } from 'vue-i18n'
-import { refundOnline,performanceSelect,exportPerformance,adjustment } from '@/api/cash/financialAccount.js'
+import { refundOnline, performanceSelect, exportPerformance, adjustment } from '@/api/cash/financialAccount.js'
 import { getUserInfo } from '@/api/common/common.js'
+import { useAdminStore } from '@/store/index.js'
+import { permissionMapping, hasMenuPermission } from "@/utils/menuTreePermission.js"
+import { storeToRefs } from 'pinia'
 
-
+const adminStore = useAdminStore()
+const { menuTree, flag } = storeToRefs(adminStore)
 const adminData = ref({})
 
 
 const { t } = useI18n()
 
 const paytypeList = [
-    t('cash.payMethods.stripe'),
-    t('cash.payMethods.paymentAsia'),
-    t('cash.payMethods.ipay88'),
-    t('cash.payMethods.bankTransfer'),
-    t('cash.payMethods.card'),
-    t('cash.payMethods.cash'),
-    t('cash.payMethods.check'),
-    t('cash.payMethods.grabpay'),
-    t('cash.payMethods.nets'),
-    t('cash.payMethods.transfer'),
-    t('cash.payMethods.iotPay'),
-    t('cash.payMethods.stripe3'),
-    t('cash.payMethods.paypal'),
+  t('cash.payMethods.stripe'),
+  t('cash.payMethods.paymentAsia'),
+  t('cash.payMethods.ipay88'),
+  t('cash.payMethods.bankTransfer'),
+  t('cash.payMethods.card'),
+  t('cash.payMethods.cash'),
+  t('cash.payMethods.check'),
+  t('cash.payMethods.grabpay'),
+  t('cash.payMethods.nets'),
+  t('cash.payMethods.transfer'),
+  t('cash.payMethods.iotPay'),
+  t('cash.payMethods.stripe3'),
+  t('cash.payMethods.paypal'),
 ]
 
+const hasperformanceAdjustment = ref(false)
+// 初始化权限状态
+const initPermissions = async () => {
+  if (!menuTree.value || !menuTree.value.length) return;
+  // 业绩调整
+  hasperformanceAdjustment.value = hasMenuPermission(menuTree.value, permissionMapping.performance_adjustment);
+  console.log('业绩调整权限', hasperformanceAdjustment.value);
+
+};
+
 const payPlatformOptions = ref([...paytypeList])
 
 const statusOptions = [
@@ -94,7 +108,7 @@ const fetchData = async () => {
     const params = {
       pageNum: queryParams.pageNum,
       pageSize: queryParams.pageSize,
-      performanceDTO:{
+      performanceDTO: {
         jwcode: queryParams.jwcode,
         adminMarket: adminData.value.marketName.split(',').filter(item => item.trim() !== '') || [],
         customerMarket: queryParams.customerMarket,
@@ -102,7 +116,7 @@ const fetchData = async () => {
         endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '',
       }
     }
-    
+
     console.log('查询参数:', params)
     const res = await performanceSelect(params)
     if (res.code == 200) {
@@ -114,7 +128,7 @@ const fetchData = async () => {
     } else {
       ElMessage.error(res.msg || t('elmessage.getDataFailed'))
       loading.value = false
-    }   
+    }
   } catch (error) {
     console.error(error)
     loading.value = false
@@ -125,9 +139,9 @@ const fetchData = async () => {
 const handleAdminInfo = async () => {
   try {
     const res = await getUserInfo()
-      adminData.value = res || {}
-      console.log('adminData.value:', adminData.value);
-      
+    adminData.value = res || {}
+    console.log('adminData.value:', adminData.value);
+
   } catch (error) {
     console.error(error)
     ElMessage.error(t('elmessage.getDataFailed'))
@@ -168,7 +182,7 @@ const handleRefund = (row) => {
     ElMessage.success(t('elmessage.refundSubmitSuccess'))
     // 刷新列表
     fetchData()
-  }).catch(() => {})
+  }).catch(() => { })
 }
 
 // ==================== 导出相关逻辑 ====================
@@ -178,12 +192,12 @@ const exportList = ref([])
 const exportListLoading = ref(false)
 
 // 导出Excel
-const   handleExport = async () => {
+const handleExport = async () => {
   try {
-  const params = {
+    const params = {
       pageNum: queryParams.pageNum,
       pageSize: queryParams.pageSize,
-      performanceDTO:{
+      performanceDTO: {
         jwcode: queryParams.jwcode,
         adminMarket: adminData.value.marketName.split(',').filter(item => item.trim() !== '') || [],
         customerMarket: queryParams.customerMarket,
@@ -191,15 +205,15 @@ const   handleExport = async () => {
         endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '',
       }
     }
-    
+
     // TODO: 确认导出接口 URL
     const res = await exportPerformance(params)
-    if(res.code == 200){
+    if (res.code == 200) {
+
+      console.log('导出参数', params)
+      ElMessage.success(t('elmessage.exportSuccess'))
+    }
 
-        console.log('导出参数', params)
-        ElMessage.success(t('elmessage.exportSuccess'))
-    }                     
-    
   } catch (error) {
     console.error(error)
     ElMessage.error(t('elmessage.exportError'))
@@ -270,21 +284,21 @@ const adjustVisible = ref(false)
 const adjustTime = ref('')
 const adjustCoefficient = ref('')
 
-const matrixMarkets = [
-  { key: 'sg', label: '新加坡' },
-  { key: 'my', label: '马来西亚' },
-  { key: 'hk', label: '香港' },
-  { key: 'th', label: '泰国' },
-  { key: 'vn', label: '越南' },
-  { key: 'ca', label: '加拿大' }
-]
+const matrixMarkets = computed(() => [
+  { key: 'sg', label: t('cash.markets.Singapore') },
+  { key: 'my', label: t('cash.markets.Malaysia') },
+  { key: 'hk', label: t('cash.markets.HongKong') },
+  { key: 'th', label: t('cash.markets.Thailand') },
+  { key: 'vn', label: t('clientCount.market.vnGold') },
+  { key: 'ca', label: t('cash.markets.Canada') }
+])
 
 const adjustData = ref([])
 
 const initAdjustData = () => {
-  adjustData.value = matrixMarkets.map(rowMarket => {
-    const row = { inMarket: rowMarket.label + '客户' }
-    matrixMarkets.forEach(colMarket => {
+  adjustData.value = matrixMarkets.value.map(rowMarket => {
+    const row = { inMarket: rowMarket.label + t('common.customer') }
+    matrixMarkets.value.forEach(colMarket => {
       row[colMarket.key] = '' // 默认空
     })
     return row
@@ -300,9 +314,9 @@ const handleAdjustment = () => {
 
 const computedAdjustData = computed(() => {
   const data = [...adjustData.value]
-  const sumRow = { inMarket: '合计', isSum: true }
+  const sumRow = { inMarket: t('cash.cashFlow.total'), isSum: true }
   
-  matrixMarkets.forEach(colMarket => {
+  matrixMarkets.value.forEach(colMarket => {
     let colSum = 0
     adjustData.value.forEach(row => {
       const val = parseFloat(row[colMarket.key])
@@ -317,7 +331,7 @@ const computedAdjustData = computed(() => {
 
 const getRowTotal = (row) => {
   let sum = 0
-  matrixMarkets.forEach(colMarket => {
+  matrixMarkets.value.forEach(colMarket => {
     const val = parseFloat(row[colMarket.key])
     if (!isNaN(val)) sum += val
   })
@@ -335,18 +349,18 @@ const formatNumber = (val) => {
 
 const submitAdjustment = async () => {
   if (!adjustTime.value) {
-    ElMessage.warning('请选择时间')
+    ElMessage.warning(t('cash.cashFlow.time'))
     return
   }
   if (!adjustCoefficient.value) {
-    ElMessage.warning('请输入系数')
+    ElMessage.warning(t('cash.cashFlow.coefficientPlaceholder'))
     return
   }
-  
+
   // 组装矩阵数据 matrix (二维数组，6行6列)
   // 如果单元格为空或者非数字，默认为 0
   const matrix = adjustData.value.map(row => {
-    return matrixMarkets.map(colMarket => {
+    return matrixMarkets.value.map(colMarket => {
       const val = parseFloat(row[colMarket.key])
       return isNaN(val) ? 0 : val
     })
@@ -356,21 +370,22 @@ const submitAdjustment = async () => {
   const payload = {
     matrix: matrix,
     weight: parseFloat(adjustCoefficient.value), // 系数
-    createTime: adjustTime.value,
+    time: adjustTime.value,
     submitterId: adminData.value.id || 1000063, // 从全局 adminData 获取
     submitterMarket: adminData.value.marketName || '总部' // 如果为空默认传总部
   }
 
   console.log('提交的封装数据:', JSON.stringify(payload, null, 2))
-  
+
   await adjustment(payload)
-  ElMessage.success('提交成功')
+  ElMessage.success(t('common.submitSuccess'))
   adjustVisible.value = false
   fetchData()
 }
 
-onMounted( async() => {
-   await handleAdminInfo()
+onMounted(async () => {
+  await initPermissions()
+  await handleAdminInfo()
   getMarket()
   await fetchData()
 })
@@ -388,86 +403,66 @@ onMounted( async() => {
             <el-input v-model="queryParams.jwcode" :placeholder="t('common.jwcodePlaceholder')" clearable />
           </div>
           <div class="search-item">
-            <span class="label">{{ t('common.market') }}：</span>
+            <span class="label">{{ t('common_list.market') }}：</span>
             <!-- 下拉多选，使用 el-cascader 匹配地区树结构 -->
-            <el-cascader
-              v-model="queryParams.customerMarket"
-              :options="marketOptions"
-              :props="{ multiple: true, emitPath: false }"
-              collapse-tags
-              collapse-tags-tooltip
-              :placeholder="t('common.marketPlaceholder')"
-              clearable
-              style="width: 8vw;"
-            />
+            <el-cascader v-model="queryParams.customerMarket" :options="marketOptions"
+              :props="{ multiple: true, emitPath: false }" collapse-tags collapse-tags-tooltip
+              :placeholder="t('common_list.marketPlaceholder')" clearable style="width: 8vw;" />
           </div>
-          
-         <div class="search-item" style="width: auto;">
+
+          <div class="search-item" style="width: auto;">
             <span class="label">{{ t('common.payTime2') }}：</span>
-            <el-date-picker
-              v-model="queryParams.timeRange"
-              type="datetimerange"
-              :range-separator="t('common.to')"
-              :start-placeholder="t('common.startTime')"
-              :end-placeholder="t('common.endTime')"
-              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-              style="width: 18vw;"
-            />
+            <el-date-picker v-model="queryParams.timeRange" type="datetimerange" :range-separator="t('common.to')"
+              :start-placeholder="t('common.startTime')" :end-placeholder="t('common.endTime')"
+              :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]" style="width: 18vw;" />
           </div>
         </div>
 
-         <div class="search-row">
+        <div class="search-row">
           <el-button type="primary" @click="handleSearch">{{ t('common.search') }}</el-button>
-            <el-button type="primary" @click="handleExport">{{ t('common.exportExcel') }}</el-button>
-            <el-button type="primary" @click="openExportList">{{ t('common.viewExportList') }}</el-button>
-            <el-button type="success" @click="handleReset">{{ t('common.reset') }}</el-button>
-            <button class="adjust-btn" @click="handleAdjustment">业绩调整</button>
+          <el-button type="primary" @click="handleExport">{{ t('common.exportExcel') }}</el-button>
+          <el-button type="primary" @click="openExportList">{{ t('common.viewExportList') }}</el-button>
+          <el-button type="success" @click="handleReset">{{ t('common.reset') }}</el-button>
+          <button v-if="hasperformanceAdjustment" class="adjust-btn" @click="handleAdjustment">{{
+            t('cash.cashFlow.performanceAdjustment') }}</button>
         </div>
       </div>
     </el-card>
 
     <!-- 表格区域 -->
     <el-card class="table-card">
-      <el-table ref="tableRef" :data="tableData" v-loading="loading" style="width: 100%; flex: 1;" :cell-style="{ textAlign: 'center' }"  :header-cell-style="{ background: '#F3FAFE', color: '#333',textAlign: 'center' }">
-        <el-table-column type="index" :label="t('common_list.id')" min-width="60" align="center" fixed="left" >
+      <el-table ref="tableRef" :data="tableData" v-loading="loading" style="width: 100%; flex: 1;"
+        :cell-style="{ textAlign: 'center' }"
+        :header-cell-style="{ background: '#F3FAFE', color: '#333', textAlign: 'center' }">
+        <el-table-column type="index" :label="t('common_list.id')" min-width="60" align="center" fixed="left">
           <template #default="scope">
             <span>{{ scope.$index + 1 + (queryParams.pageNum - 1) * queryParams.pageSize }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="jwcode" :label="t('common_list.jwcode')" min-width="120" fixed="left" />
+        <el-table-column prop="payTime" :label="t('cash.cashFlow.payTime')" min-width="180" />
+        <el-table-column prop="orderCode" :label="t('cash.cashFlow.orderCode')" min-width="350" show-overflow-tooltip />
+        <el-table-column prop="receivedMarketName" :label="t('cash.cashFlow.receivedMarketName')" min-width="120"
+          show-overflow-tooltip />
+        <el-table-column prop="performanceMarketName" :label="t('cash.cashFlow.performanceMarket')" min-width="120"
+          show-overflow-tooltip />
         <el-table-column prop="name" :label="t('common_list.name')" min-width="150" show-overflow-tooltip />
-        <el-table-column prop="marketName" :label="t('common_list.market')" min-width="120" show-overflow-tooltip />
-        <el-table-column prop="orderCode" :label="t('common_list.orderCode')" min-width="280" show-overflow-tooltip />
-        
-        <el-table-column prop="paymentAmount" :label="t('common_list.payAmount')" min-width="150" align="right">
-          <!-- <template #default="{ row }">
-            {{ row.paymentAmount }} {{ row.paymentCurrency }}
-          </template> -->
-        </el-table-column>
-        <el-table-column prop="paymentCurrency" :label="t('common_list.payCurrency')" min-width="180" show-overflow-tooltip />
-        
-        <el-table-column prop="receivedAmount" :label="t('common_list.receiveAmount')" min-width="150" align="right">
-          <!-- <template #default="{ row }">
-            {{ row.receivedAmount }} {{ row.receivedCurrency }}
-          </template> -->
-        </el-table-column>
-        <el-table-column prop="receivedCurrency" :label="t('common_list.receiveCurrency')" min-width="180" show-overflow-tooltip />
-        
-        <el-table-column prop="handlingCharge" :label="t('common_list.fee')" min-width="100" align="right" />
+        <el-table-column prop="jwcode" :label="t('common_list.jwcode')" min-width="120" />
+        <el-table-column prop="goodsName" :label="t('cash.cashFlow.goodsName')" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="remark" :label="t('common_list.remark')" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="goodNum" :label="t('cash.cashFlow.goodNum')" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="payType" :label="t('cash.cashFlow.payType')" min-width="120" show-overflow-tooltip />
+        <el-table-column prop="receivedCurrency" :label="t('common_list.receiveCurrency')" min-width="180"
+          show-overflow-tooltip />
+        <el-table-column prop="paymentAmount" :label="t('common_list.payAmount')" min-width="150" />
+        <el-table-column prop="handlingCharge" :label="t('common_list.fee')" min-width="100" />
+        <el-table-column prop="receivedAmount" :label="t('common_list.receiveAmount')" min-width="150" />
       </el-table>
 
       <!-- 分页 -->
       <div class="pagination-container">
-        <el-pagination
-          background
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="total"
-          :current-page="queryParams.pageNum"
-          :page-size="queryParams.pageSize"
-          :page-sizes="[10, 20, 50, 100]"
-          @size-change="handlePageSizeChange"
-          @current-change="handleCurrentChange"
-        />
+        <el-pagination background layout="total, sizes, prev, pager, next, jumper" :total="total"
+          :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :page-sizes="[10, 20, 50, 100]"
+          @size-change="handlePageSizeChange" @current-change="handleCurrentChange" />
       </div>
     </el-card>
 
@@ -504,47 +499,49 @@ onMounted( async() => {
     </el-dialog>
 
     <!-- 业绩调整弹窗 -->
-    <el-dialog v-model="adjustVisible" title="市场消耗金币业绩调整" width="80%" top="5vh" align-center class="custom-adjust-dialog">
+    <el-dialog v-model="adjustVisible" :title="t('cash.cashFlow.marketConsumption')" width="80%" top="5vh" align-center
+      class="custom-adjust-dialog">
       <template #header="{ titleId, titleClass }">
-        <div style="text-align: center; font-weight: bold; font-size: 18px;" :id="titleId" :class="titleClass">市场消耗金币业绩调整</div>
+        <div style="text-align: center; font-weight: bold; font-size: 18px;" :id="titleId" :class="titleClass">{{
+          t('cash.cashFlow.marketConsumption') }}</div>
       </template>
       <div style="display: flex; gap: 40px; margin-bottom: 20px; align-items: center;">
         <div style="display: flex; align-items: center;">
-          <span style="margin-right: 10px; font-weight: bold;">选择时间</span>
-          <el-date-picker
-            v-model="adjustTime"
-            type="datetime"
-            placeholder="选择时间"
-            value-format="YYYY-MM-DD HH:mm:ss"
-          />
+          <span style="margin-right: 10px; font-weight: bold;">{{ t('cash.cashFlow.time') }}</span>
+          <el-date-picker v-model="adjustTime" type="datetime" :placeholder="t('cash.cashFlow.time')"
+            value-format="YYYY-MM-DD HH:mm:ss" />
         </div>
         <div style="display: flex; align-items: center;">
-          <span style="margin-right: 10px; font-weight: bold;">系数调整</span>
-          <el-input v-model="adjustCoefficient" placeholder="请输入系数调整" style="width: 200px;" @input="adjustCoefficient = formatNumber(adjustCoefficient)" />
+          <span style="margin-right: 10px; font-weight: bold;">{{ t('cash.cashFlow.coefficient') }}</span>
+          <el-input v-model="adjustCoefficient" :placeholder="t('cash.cashFlow.coefficientPlaceholder')"
+            style="width: 200px;" @input="adjustCoefficient = formatNumber(adjustCoefficient)" />
         </div>
       </div>
 
-      <el-table :data="computedAdjustData" border style="width: 100%" :cell-style="{ textAlign: 'center' }" :header-cell-style="{ background: '#F3FAFE', color: '#333', textAlign: 'center', padding: '0' }">
+      <el-table :data="computedAdjustData" border style="width: 100%" :cell-style="{ textAlign: 'center' }"
+        :header-cell-style="{ background: '#F3FAFE', color: '#333', textAlign: 'center', padding: '0' }">
         <el-table-column width="150" align="center" fixed="left">
           <template #header>
             <div class="diagonal-header">
-              <span class="top-right">调入</span>
-              <span class="bottom-left">调出</span>
+              <span class="top-right">{{ t('cash.cashFlow.adjustment') }}</span>
+              <span class="bottom-left">{{ t('cash.cashFlow.adjustmentOut') }}</span>
             </div>
           </template>
           <template #default="{ row }">
             <span style="font-weight: bold;">{{ row.inMarket }}</span>
           </template>
         </el-table-column>
-        
-        <el-table-column v-for="col in matrixMarkets" :key="col.key" :label="col.label + '市场团队'" min-width="120" align="center">
+
+        <el-table-column v-for="col in matrixMarkets" :key="col.key" :label="col.label + ' ' + t('cash.cashFlow.marketTeam')"
+          min-width="120" align="center">
           <template #default="{ row }">
             <span v-if="row.isSum">{{ row[col.key] }}</span>
-            <el-input v-else v-model="row[col.key]" @input="row[col.key] = formatNumber($event)" placeholder="" class="seamless-input" />
+            <el-input v-else v-model="row[col.key]" @input="row[col.key] = formatNumber($event)" placeholder=""
+              class="seamless-input" />
           </template>
         </el-table-column>
 
-        <el-table-column label="合计" min-width="120" align="center" fixed="right">
+        <el-table-column :label="t('cash.cashFlow.total')" min-width="120" align="center" fixed="right">
           <template #default="{ row }">
             {{ getRowTotal(row) }}
           </template>
@@ -553,8 +550,8 @@ onMounted( async() => {
 
       <template #footer>
         <div class="dialog-footer" style="text-align: center;">
-          <el-button type="primary" plain @click="adjustVisible = false" style="width: 100px;">取消</el-button>
-          <el-button type="primary" @click="submitAdjustment" style="width: 100px;">提交</el-button>
+          <el-button type="primary" plain @click="adjustVisible = false" style="width: 100px;">{{ t('common.cancel') }}</el-button>
+          <el-button type="primary" @click="submitAdjustment" style="width: 100px;">{{ t('common.submit') }}</el-button>
         </div>
       </template>
     </el-dialog>
@@ -563,16 +560,16 @@ onMounted( async() => {
 
 <style scoped lang="scss">
 .cash-flow-container {
-    display: flex;
-    flex-direction: column;
-    height: 100%;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
 }
 
 .search-card {
   margin-bottom: 10px;
   background: #F3FAFE; // 浅蓝背景
   border: none;
-  
+
   :deep(.el-card__body) {
     padding: 15px;
   }
@@ -604,13 +601,14 @@ onMounted( async() => {
     text-align: right;
   }
 
-  .el-input, .el-select {
+  .el-input,
+  .el-select {
     width: 8vw;
   }
 }
 
 .search-btn-group {
-  margin-left: 2vw; 
+  margin-left: 2vw;
   display: flex;
   gap: 10px;
 }
@@ -631,7 +629,7 @@ onMounted( async() => {
   border: none;
   display: flex;
   flex-direction: column;
-  
+
   :deep(.el-card__body) {
     padding: 20px;
     flex: 1;
@@ -662,15 +660,18 @@ onMounted( async() => {
 .diagonal-header {
   position: relative;
   width: 100%;
-  height: 50px; /* Set a fixed height to make diagonal line work well */
+  height: 50px;
+  /* Set a fixed height to make diagonal line work well */
   background: linear-gradient(to top right, transparent 49.5%, #dcdfe6 49.5%, #dcdfe6 50.5%, transparent 50.5%);
 }
+
 .diagonal-header .top-right {
   position: absolute;
   top: 5px;
   right: 15px;
   font-weight: bold;
 }
+
 .diagonal-header .bottom-left {
   position: absolute;
   bottom: 5px;
@@ -680,7 +681,8 @@ onMounted( async() => {
 
 /* 业绩调整弹窗全局样式 */
 :deep(.custom-adjust-dialog) {
-  background-color: #f3fafe !important; /* 统一淡蓝色背景 */
+  background-color: #f3fafe !important;
+  /* 统一淡蓝色背景 */
   border-radius: 8px;
 }
 
@@ -700,11 +702,13 @@ onMounted( async() => {
   background-color: transparent !important;
   padding: 0;
 }
+
 .seamless-input :deep(.el-input__inner) {
   text-align: center;
   font-size: 14px;
   height: 100%;
 }
+
 .seamless-input :deep(.el-input__inner:focus) {
   outline: none;
 }

src/views/walletManage/components/WalletDetailTemplate.vue

@@ -316,7 +316,7 @@ onMounted(() => {
       <div class="head-card">
         <div class="head-card-element">
           <el-text class="mx-1" size="large">{{ $t('common_list.jwcode') }}：</el-text>
-          <el-input v-model="selectData.jwcode" style="width: 12.5vw" placeholder="请输入精网号" clearable />
+          <el-input v-model="selectData.jwcode" style="width: 12.5vw" :placeholder="$t('common.jwcodePlaceholder')" clearable />
         </div>
         <div class="head-card-element">
           <el-text class="mx-1" size="large">{{ $t('common_list.market') }}：</el-text>