diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js
index aab1c9b..2b5f0fc 100644
--- a/src/components/locales/lang/en.js
+++ b/src/components/locales/lang/en.js
@@ -23,8 +23,8 @@ export default {
     payModelPlaceholder: "Select payment method",
     refundType: "Refund Type",
     refundTypePlaceholder: "Select refund type",
-    market: "Region",
-    marketPlaceholder: "Select region",
+    performanceByRegion: "Performance By Region",
+    performanceByRegionPlaceholder: "Select Performance By Region",
     position: "Position",
     positionPlaceholder: "Select position",
     roleName: "Role",
@@ -107,6 +107,7 @@ export default {
     add: "Add",
     addUser: "Add User",
     addRole: "Add Role",
+    addCashFlow:"Add Cash Flow",
     save: "Save",
     saving: "Saving...",
     addActivity: "Add Activity",
@@ -405,6 +406,7 @@ export default {
     activityLoadFailed: "Activity load failed",
     activityDataLoadFailed: "Activity data error",
     getDataFailed: "Get data failed",
+    networkError:"Network Error",
     exportWalletDetailError: "Export wallet detail error",
     selectCompanyWallet: "Please select company wallet",
     getDetailFailed: "Get detail failed",
@@ -467,7 +469,11 @@ export default {
     refundSuccess: "Refund Success",
     refundReason: "Refund Reason",
     activity: "Activity",
-    businessBelong: "Region",
+    performanceMarket: "Performance by region",
+    receiveArea: "Receive Area",
+    receiveType:"Receive Type",
+    paymentMethod:"Payment Method",
+    nums:"Number",
     startTime: "Start Time",
     endTime: "End Time",
     status: "Status",
@@ -534,6 +540,7 @@ export default {
     pending: "Pending",
     fee: "Fee",
     transferVoucher: "Transfer IMG",
+    noTransferVoucher: "No Voucher",
     payVoucher: "Payment IMG",
     refund: "Refund",
     normal: "Normal",
@@ -1292,6 +1299,48 @@ export default {
       ThailandHSWallet: "Thailand HS Wallet",
       VietnamHCMWallet: "VietnamHCM Wallet",
       BeijingWallet: "Beijing Company Wallet"
+    },
+    cashFlow:{
+      otherIncome:"Other Income",
+      addFee:"Add Fee",
+      performanceMarket: "Performance Market",
+      performanceMarketPlaceholder: "Please select performance market",
+      incomeCategory: "Income Category",
+      incomeCategoryPlaceholder: "Please select income category",
+      investmentIncome:"Investment Income",
+      taxRefund:"Tax Refund",
+      governmentSubsidy:"Government Subsidy",
+      localIntercompany:"Local Intercompany",
+      corporateIntercompany:"Corporate Intercompany",
+      otherIncomeNon:"Other Income-Nonperformance ",
+      otherIncomeYes:"Other Income-Performance",
+      quantity: "Quantity",
+      quantityPlaceholder: "Please enter quantity",
+      payType: "Payment Method",
+      payTypePlaceholder: "Please select payment method",
+      paymentCurrency: "Payment Currency",
+      paymentCurrencyPlaceholder: "Please select payment currency",
+      paymentAmount: "Payment Amount",
+      paymentAmountPlaceholder: "Please enter payment amount",
+      paymentTime: "Payment Time",
+      paymentTimePlaceholder: "Select payment time",
+      bankHandlingFee: "Bank Handling Fee",
+      bankHandlingFeePlaceholder: "Please enter bank handling fee",
+      remarks: "Remarks",
+      remarksPlaceholder: "Please enter remarks (optional, limit 100 characters)",
+      cancel: "Cancel",
+      submit: "Submit",
+      ipay88:"iPay88",
+      cardPayment:"Card Payment",
+      fixedProcessingFee:"Fixed Processing Fee",
+      settlementRegion:"Settlement Region",
+      Malaysia:"Malaysia",
+      processingFee:"Processing Fee",
+      processingFeePlaceholder:"Processing Fee Placeholder",
+      quantityMustBeNumber:"Quantity Must Be Number",
+      invalidFormat:"Invalid amount format. Maximum 2 decimal places allowed.",
+      paymentMust:"Payment amount must be 0",
+      remarksexceed:"Remarks cannot exceed 100 characters",
     }
   },
 
diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js
index 827b0c0..16675e3 100644
--- a/src/components/locales/lang/zh-CN.js
+++ b/src/components/locales/lang/zh-CN.js
@@ -23,8 +23,8 @@ export default {
     payModelPlaceholder: "请选择支付方式",
     refundType: "退款类型",
     refundTypePlaceholder: "请选择退款类型",
-    market: "所属地区",
-    marketPlaceholder: "请选择所属地区",
+    performanceByRegion: "业绩归属地区",
+    performanceByRegionPlaceholder: "请选择业绩归属地区",
     position: "职位名称",
     positionPlaceholder: "请选择职位名称",
     roleName: "角色名称",
@@ -107,6 +107,7 @@ export default {
     add: "添加",
     addUser: "新增用户",
     addRole: "新增角色",
+    addCashFlow:"新增流水",
     save: "保存",
     saving: "保存中...",
     addActivity: "新增活动",
@@ -406,6 +407,7 @@ export default {
     activityLoadFailed: "活动列表加载失败，请稍后重试",
     activityDataLoadFailed: "活动数据加载异常，请稍后重试",
     getDataFailed: "获取数据失败",
+    networkError:"网络错误",
     exportWalletDetailError: "导出钱包明细出错",
     selectCompanyWallet: "请选择公司钱包",
     // 权限
@@ -467,7 +469,11 @@ export default {
     refundSuccess: "退款成功",
     refundReason: "退款理由",
     activity: "活动名称",
-    businessBelong: "业绩归属地",
+    receiveArea: "到账地区",
+    performanceMarket: "业绩归属地区",
+    receiveType:"收入类别",
+    paymentMethod:"付款方式",
+    nums:"个数",
     startTime: "开始时间",
     endTime: "结束时间",
     status: "状态",
@@ -534,6 +540,7 @@ export default {
     pending: "待处理",
     fee: "手续费",
     transferVoucher: "转账凭证",
+    noTransferVoucher: "无转账凭证",
     payVoucher: "支付凭证",
     refund: "退款",
     normal: "正常",
@@ -1312,6 +1319,48 @@ export default {
       ThailandHSWallet: "泰国HS钱包",
       VietnamHCMWallet: "越南钱包",
       BeijingWallet: "北京公司钱包"
+    },
+    cashFlow:{
+      otherIncome:"其他收入",
+      addFee:"手续费补充",
+      performanceMarket:"业绩归属地区",
+      performanceMarketPlaceholder:"请选择业绩归属地区",
+      incomeCategory:"收入类别",
+      incomeCategoryPlaceholder:"请选择收入类别",
+      investmentIncome:"理财收入",
+      taxRefund:"退税",
+      governmentSubsidy:"政府补贴",
+      localIntercompany:"本地往来",
+      corporateIntercompany:"公司往来",
+      otherIncomeNon:"其他收入-非业绩",
+      otherIncomeYes:"其他收入-算业绩",
+      quantity:"个数",
+      quantityPlaceholder:"请输入个数",
+      payType:"支付方式",
+      payTypePlaceholder:"请选择支付方式",
+      paymentCurrency:"付款币种",
+      paymentCurrencyPlaceholder:"请选择付款币种",
+      paymentAmount:"付款金额",
+      paymentAmountPlaceholder:"请输入付款金额",
+      paymentTime:"付款时间",
+      paymentTimePlaceholder:"选择付款时间",
+      bankHandlingFee:"银行手续费",
+      bankHandlingFeePlaceholder:"请输入银行手续费",
+      remarks:"备注",
+      remarksPlaceholder:"请输入备注 (选填，限制100字)",
+      cancel:"取消",
+      submit:"提交",
+      ipay88:"iPay88",
+      cardPayment:"刷卡",
+      fixedProcessingFee:"固定手续费",
+      settlementRegion:"到账地区",
+      Malaysia:"马来西亚",
+      processingFee:"手续费",
+      processingFeePlaceholder:"请输入手续费",
+      quantityMustBeNumber:"个数必须为数字",
+      invalidFormat:"金额格式不正确，最多两位小数",
+      paymentMust:"付款金额必须为0",
+      remarksexceed:"备注不能超过100字",
     }
   },
 
diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue
index dc59718..1ea0cf4 100644
--- a/src/views/moneyManage/financialAccount/cashFlow.vue
+++ b/src/views/moneyManage/financialAccount/cashFlow.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, reactive, onMounted, nextTick } from 'vue'
+import { ref, reactive, onMounted, nextTick, toRaw } from 'vue'
 import { useRoute } from 'vue-router'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import request from '@/util/http.js'
@@ -9,7 +9,10 @@ import { Moneyfunds, refundOnline, exportFunds } from '@/api/cash/financialAccou
 import { useAdminStore } from '@/store/index.js'
 import { storeToRefs } from 'pinia'
 import _ from 'lodash';
-import { normalizePayType } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
+import { normalizePayType,MarketNameForId, CurrencyForId, } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
+import { isTemplate } from 'element-plus/es/utils/index.mjs'
+import { Row } from 'vxe-pc-ui'
+import CashManagement from '@/components/workspace/CashManagement.vue'
 
 const adminStore = useAdminStore()
 const { adminData } = storeToRefs(adminStore)
@@ -37,10 +40,18 @@ const paytypeList = [
 
 const payPlatformOptions = ref([...paytypeList])
 
-const statusOptions = [
-  { label: t('common_list.received'), value: 4 },
-  { label: t('common_list.refunded'), value: 6 }
-]
+const marketFilter = (value) => {
+  const map = { 
+    4: t('cash.markets.Singapore'), 
+    5: t('cash.markets.Malaysia'), 
+    13:t('cash.markets.HongKong'),
+    24016: t('cash.markets.Canada'),
+    24018:t('cash.markets.Thailand'),
+    24022:t('cash.markets.VietnamHCM'),
+    24033:t('cash.markets.Beijing'),
+  };
+  return map[value] || '-';
+};
 
 // 地区树
 const marketOptions = ref([])
@@ -49,12 +60,13 @@ const marketOptions = ref([])
 const queryParams = reactive({
   jwcode: '',
   markets: [], // 下拉多选
+  performanceMarkets:[],
   timeRange: [], // [startTime, endTime]
   payType: '',
   orderCode: '',
-  statuses: [],
   pageNum: 1,
-  pageSize: 20
+  pageSize: 20,
+  platformSelection: []
 })
 
 const total = ref(0)
@@ -104,28 +116,96 @@ const formatStatuses = (statuses) => {
   // 情况3：正常数组 → 返回原数组
   return statuses;
 };
+const performanceMarket = ref([
+    t('cash.markets.Malaysia'),   // 马来西亚
+    t('cash.markets.HongKong'),   // 香港
+    t('cash.markets.Singapore'),  // 新加坡
+    t('cash.markets.Thailand'),   // 泰国
+    t('cash.markets.VietnamHCM'), // 越南HCM
+    t('cash.markets.Canada'),      // 加拿大
+    t('cash.markets.Beijing')      // 北京
+])
+const getPayPlatformOptions = async () => {
+  try {
+    const res = await request({
+      url: '/market/getAreaPayTypeTree', 
+      method: 'POST' 
+    })
+    if (res.code === 200) {
+      payPlatformOptionsList.value = res.data
+      console.log('支付平台数据加载成功:', payPlatformOptionsList.value)
+    } else {
+      ElMessage.error(res.msg || t('elmessage.getDataFailed'))
+    }
+  } catch (error) {
+    console.error('请求支付平台数据出错:', error)
+    ElMessage.error(t('elmessage.networkError'))
+  }
+}
 // 查询列表
 const fetchData = async () => {
   loading.value = true
   try {
-    // 构建请求参数
+    //转换areaPayTypeList参数结构
+    const areaPayTypeList = [];
+    const options = toRaw(payPlatformOptionsList.value);
+    const selectedPaths = queryParams.platformSelection; 
+    if (selectedPaths.length > 0 && options.length > 0) {
+      selectedPaths.forEach(path => {
+        const areaId = path[0];
+        const payMethodId = path[path.length - 1]; 
+        if (path.length === 1) {
+           const countryNode = options.find(c => c.id === areaId);
+           if (countryNode && countryNode.children) {
+             countryNode.children.forEach(child => {
+               areaPayTypeList.push({
+                 areaId: areaId,
+                 payType: child.name 
+               });
+             });
+           }
+        } 
+        else {
+           const countryNode = options.find(c => c.id === areaId);
+           if (countryNode && countryNode.children) {
+             const methodNode = countryNode.children.find(m => m.id === payMethodId);
+             if (methodNode) {
+               areaPayTypeList.push({
+                 areaId: areaId,
+                 payType: methodNode.name
+               });
+             }
+           }
+        }
+      });
+    }
+    //转换performanceMarket参数结构
+    let performanceMarkets = [];
+    const selectedNames = queryParams.performanceMarket;
+    if (Array.isArray(selectedNames) && selectedNames.length > 0) {
+      performanceMarkets = selectedNames
+        .map(name => {
+          if (!name) return null;
+          const id = MarketNameForId(name); 
+          return id; 
+        })
+        .filter(id => id !== null && id !== 'null'); // 过滤无效值
+    }
     const params = {
       pageNum: queryParams.pageNum,
       pageSize: queryParams.pageSize,
       fundsDTO: {
         jwcode: queryParams.jwcode,
         localMarket: queryParams.markets,
+        performanceMarkets:performanceMarkets,  
+        areaPayTypeList: areaPayTypeList,
         startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '',
         endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '',
         payType: normalizePayType(queryParams.payType || ''),
         orderCode: queryParams.orderCode,
-        statuses: formatStatuses(queryParams.statuses),
         markets: [],
       }
     }
-
-
-
     console.log('查询参数:', params)
     const res = await Moneyfunds(params)
     if (res.code == 200) {
@@ -152,11 +232,11 @@ const handleSearch = () => {
 
 const handleReset = () => {
   queryParams.jwcode = ''
-  queryParams.markets = []
+  queryParams.performanceMarket = ''
   queryParams.timeRange = null
   queryParams.payType = ''
   queryParams.orderCode = ''
-  queryParams.statuses = []
+  queryParams.platformSelection=[]
   handleSearch()
 }
 
@@ -171,22 +251,22 @@ const handleCurrentChange = (val) => {
 }
 
 // 退款操作
-const openRefundConfirm = (row) => {
+const openRefundConfirm = () => {
+  showDetail.value=false
   textContent.value = t('common.willRefundOrder') + '?'
   refundConfirmDialog.value = true
   refundFormData.value = {
-    ...row,
-    oldpermanentGold: row.permanentGold || row.gold || 0,//退款永久金币
-    oldfreeGold: row.freeGold || row.free || 0,//退款免费金币
+    ...formDataRow.value,
+    oldpermanentGold: formDataRow.value.permanentGold || formDataRow.value.gold || 0,//退款永久金币
+    oldfreeGold: formDataRow.value.freeGold || formDataRow.value.free || 0,//退款免费金币
     permanentGold: null,
     freeGold: null,
   }
-  console.log(row);
+  
 }
 const openRefundDialog = () => {
   refundDialog.value = true
   closeConfirmRefund()
-
 }
 
 const closeConfirmRefund = () => {
@@ -197,8 +277,6 @@ const refundConfirmDialog = ref(false)
 const textContent = ref('')
 const refundDialog = ref(false)
 const refundFormData = ref({})
-
-
 const resetRefund = () => {
   refundFormData.value.refundModel = ''
   refundFormData.value.refundReason = ''
@@ -244,6 +322,7 @@ const handleRefund = async () => {
 
     const res = await refundOnline(params)
     if (res.code == 200) {
+      ElMessage.success(t('elmessage.submitSuccess'))
       refundDialog.value = false
       fetchData()
     } else {
@@ -254,6 +333,10 @@ const handleRefund = async () => {
   }
 }
 
+const payPlatformOptionsList = ref([])
+
+
+
 // ==================== 导出相关逻辑 ====================
 
 const exportListVisible = ref(false)
@@ -290,7 +373,6 @@ const handleExport = async () => {
         markets: [],
       }
     }
-
     // TODO: 确认导出接口 URL
     const res = await exportFunds(params)
     if (res.code == 200) {
@@ -390,9 +472,211 @@ const findValueByLabel = (options, label) => {
   return null
 }
 
+//记录详情表单
+const formDataRow = ref({
+  jwcode:'',
+  marketName:'',
+  goodsName:'',
+  paymentCurrencyName:'',
+  paymentAmount:'',
+  payTime:'',
+  voucher:'',
+  name:'',
+  activity:'',
+  payType:'',
+  receivedCurrencyName:'',
+  receivedAmount:'',
+  receivedTime:'',
+  handlingCharge:'',
+  remark:'',
+});
+//记录点击函数
+const showDetail=ref(false)
+const showRecordDetail = async (row) => {
+  showDetail.value=true
+  formDataRow.value=row
+}
+const paymentCurrency = ref([
+    t('cash.currency.usd'),   // 美元(USD)
+    t('cash.currency.hkd'),   // 港币(HKD)
+    t('cash.currency.sgd'),   // 新币(SGD)
+    t('cash.currency.myr'),   // 马币(MYR)
+    t('cash.currency.thb'),   // 泰铢(THB)
+    t('cash.currency.cad'),   // 加币(CAD)
+    t('cash.currency.vnd'),   // 越南盾(VND)
+    t('cash.currency.krw'),    // 韩元(KRW)
+    t('cash.currency.rmb'),    // 人民币(CNY)
+])
+
+//新增流水
+const showAddDetail=ref(false)
+const type = ref('other')
+const addCashFlow=(s)=>{
+  showAddDetail.value=true
+  type.value=s
+}
+const selectAddType= (s) => {
+  otherFormRef.value?.resetFields?.();
+  ipay88FormRef.value?.resetFields?.();
+  type.value=s
+}
+const otherFormRef = ref(null); 
+const addOtherForm=ref({
+ performanceMarket:"",        //业绩归属地
+ goodsName:"",                //收入类别
+ goodNum:"",                  //个数
+ payType:"",                  //支付方式
+ paymentCurrency:"",          //付款币种
+ paymentAmount:"",            //付款金额
+ payTime:"",                  //支付时间
+ handlingCharge:"",            //手续费
+ remark:"",                   //备注 
+ isPerformance:'',  
+ submitterId: adminData.value?.id || '', // 直接初始化为用户ID
+ submitterMarket: adminData.value?.markets || [] // 直接初始化为用户地区（通常是数组）
+})
+const otherRules = {
+  performanceMarket: [
+  { required: true, message: t('common.performanceByRegionPlaceholder'), trigger: 'change' }
+    ],
+    goodsName: [
+      { required: true, message: t('cash.cashFlow.incomeCategoryPlaceholder'), trigger: 'change' }
+    ],
+    goodNum: [
+      { type: 'number', message: t('cash.cashFlow.quantityMustBeNumber'), trigger: 'blur' }
+    ],
+    payType: [
+      { required: true, message: t('elmessage.checkPayModel'), trigger: 'change' }
+    ],
+    paymentCurrency: [
+      { required: true, message: t('common.payCurrencyPlaceholder'), trigger: 'change' }
+    ],
+      paymentAmount: [
+      { required: true, message: t('common_add.payAmountPlaceholder'), trigger: 'blur' },
+      { pattern: /^[0-9]+(\.[0-9]{1,2})?$/, message: t('cash.cashFlow.invalidFormat'), trigger: 'blur' }
+    ],
+      payTime: [
+      { required: true, message: t('common_add.payTimePlaceholder'), trigger: 'change' }
+    ],
+      handlingCharge: [
+      { pattern: /^[0-9]+(\.[0-9]{1,2})?$/, message: t('cash.cashFlow.invalidFormat'), trigger: 'blur' }
+    ]
+  };
+const handleOther=async ()=>{
+  if (!otherFormRef.value) return;
+    try {
+      await otherFormRef.value.validate();
+      if(addOtherForm.value.goodsName=== t('cash.cashFlow.localIntercompany') || 
+      addOtherForm.value.goodsName=== t('cash.cashFlow.corporateIntercompany') || 
+      addOtherForm.value.goodsName=== t('cash.cashFlow.otherIncomeNon') ){
+        addOtherForm.value.isPerformance='0'
+      }else{
+        addOtherForm.value.isPerformance='1'
+      }
+      const submitData={
+        performanceMarket:String(MarketNameForId(addOtherForm.value.performanceMarket)),        
+        goodsName:addOtherForm.value.goodsName,                
+        goodNum:String(addOtherForm.value.goodNum),                  
+        payType:addOtherForm.value.payType,                  
+        paymentCurrency:String(CurrencyForId(addOtherForm.value.paymentCurrency)),        
+        paymentAmount:addOtherForm.value.paymentAmount,            
+        payTime:addOtherForm.value.payTime,                  
+        handlingCharge:addOtherForm.value.handlingCharge,            
+        remark:addOtherForm.value.remark,  
+        isPerformance:addOtherForm.value.isPerformance,
+        submitterId: addOtherForm.value.submitterId,
+        submitterMarket: addOtherForm.value.submitterMarket, 
+      }
+      const handle =await request({
+        url:'/cashCollection/addExFund',
+        data:submitData
+      })
+      console.log('提交的数据:', submitData);
+      if (handle.code == 200 || handle.status == 200) { 
+        ElMessage.success(t('elmessage.submitSuccess'));
+        otherFormRef.value?.resetFields?.();
+        showAddDetail.value = false;
+      }
+    } catch (error) {
+      console.log('校验失败', error);
+  }
+};
+const ipay88FormRef = ref(null); 
+const addIpay88Form=ref({
+ performanceMarket:"",        //业绩归属地
+ payType:"",                  //支付方式
+ paymentCurrency:"",          //付款币种
+ handlingCharge:"",            //手续费
+ remark:"",                   //备注 
+ submitterId: adminData.value?.id || '', // 直接初始化为用户ID
+ submitterMarket: adminData.value?.markets || [] // 直接初始化为用户地区（通常是数组）
+})
+const ipay88Rules = {
+  performanceMarket: [{ required: true, message: t('common.performanceByRegionPlaceholder'), trigger: 'change' } ],
+  goodsName: [{ required: true, message: t('cash.cashFlow.incomeCategoryPlaceholder'), trigger: 'change' }],
+  // 付款金额固定为0（根据表格要求）
+  paymentAmount: [
+    { required: true, message: t('cash.cashFlow.paymentMust'), trigger: 'change',
+      validator: (rule, value, callback) => {
+        const numValue = Number(value);
+        if (numValue !== 0 && numValue !== 0.0) {
+          callback(new Error(t('cash.cashFlow.paymentMust')));
+        } else {
+          callback();
+        }
+      }
+    }
+  ],
+  payType: [ { required: true, message: t('common.payModelPlaceholder'), trigger: 'change' } ],
+  paymentCurrency: [{ required: true, message: t('common.payCurrencyPlaceholder'), trigger: 'change' }],
+  payTime: [{ required: true, message: t('common_add.payTimePlaceholder'), trigger: 'change' }],
+  handlingCharge: [
+    { required: true, message: t("common_add.feePlaceholder"),trigger: 'change'},
+    { pattern: /^[0-9]+(\.[0-9]{1,2})?$/, message: t('cash.cashFlow.invalidFormat'),trigger: 'change' } ],
+  remark: [{ max: 100, message: t('cash.cashFlow.remarksexceed'), trigger: 'change' }]
+  };
+const handleIpay88 =async () =>{
+  if (!ipay88FormRef.value) return;
+  try {
+    await ipay88FormRef.value.validate();
+    const Data={
+      performanceMarket:String(MarketNameForId(addIpay88Form.value.performanceMarket)),        
+      payType:addIpay88Form.value.payType,   
+      paymentCurrency:String(CurrencyForId(addIpay88Form.value.paymentCurrency)),        
+      handlingCharge:addIpay88Form.value.handlingCharge,
+      remark:addIpay88Form.value.remark,  
+      submitterId: addIpay88Form.value.submitterId,
+      submitterMarket: addIpay88Form.value.submitterMarket, 
+    }
+    const handle =await request({
+      url:'/cashCollection/addiPay88Fee',
+      data:Data
+    })
+    console.log('提交的数据:', Data);
+    if (handle.code == 200 || handle.status == 200) { 
+      ElMessage.success(t('elmessage.submitSuccess'));
+      ipay88FormRef.value?.resetFields?.();
+      showAddDetail.value = false;
+    }
+  } catch (error) {
+    console.log('校验失败', error);
+  }
+}
+// 修改 handleCancel 方法
+const handleCancel = () => {
+  otherFormRef.value?.resetFields?.();
+  ipay88FormRef.value?.resetFields?.();
+  showAddDetail.value = false;
+};
+const previewVisible=ref(false)
+const handlePreviewClick=()=>{
+  if(previewVisible.value){
+    previewVisible.value=false
+  }
+}
 onMounted(async () => {
   await getMarket()
-
+  await getPayPlatformOptions() 
   // 处理从工作台跳转过来的地区参数
   // 如果出现URL中的?region=a&region=b 这种重复key，router会解析为['a','b'], 取第一个地区ID
   const regionName = Array.isArray(route.query.region) ? route.query.region[0] : route.query.region
@@ -420,29 +704,35 @@ 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('cash.cashFlow.performanceMarket') }}</span>
+            <el-select v-model="queryParams.performanceMarket" 
+            :placeholder="t('cash.cashFlow.performanceMarketPlaceholder')" 
+            clearable :multiple="true"
+            style="width: 220px;"
+            :prop="performanceMarket"
+            collapse-tags >
+              <el-option v-for="item in performanceMarket" :key="item" :label="item" :value="item" />
+            </el-select>
+            <!-- <span class="label">{{ t('common.performanceByRegion') }}：</span> -->
             <!-- 下拉多选，使用 el-cascader 匹配地区树结构 -->
-            <el-cascader v-model="queryParams.markets" :options="marketOptions"
+            <!-- <el-cascader v-model="queryParams.markets" :options="marketOptions"
               :props="{ multiple: true, emitPath: false }" collapse-tags collapse-tags-tooltip
-              :placeholder="t('common.marketPlaceholder')" clearable style="width: 220px;" />
+              :placeholder="t('common.performanceByRegionPlaceholder')" clearable style="width: 240px;" /> -->
           </div>
+
+          <!-- 选择平台二级表单 -->
           <div class="search-item">
             <span class="label">{{ t('common.payPlatform1') }}：</span>
-            <el-select v-model="queryParams.payType" :placeholder="t('common.payPlatformPlaceholder1')" clearable>
-              <el-option v-for="item in payPlatformOptions" :key="item" :label="item" :value="item" />
-            </el-select>
-          </div>
-          <div class="search-item">
-            <span class="label">{{ t('common.status') }}：</span>
-            <el-select v-model="queryParams.statuses[0]" :placeholder="t('common.statusPlaceholder')" clearable>
-              <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
-            </el-select>
+            <el-cascader v-model="queryParams.platformSelection" :options="payPlatformOptionsList" 
+              :props="{ multiple: true ,value:'id',label:'name'}"
+              collapse-tags collapse-tags-tooltip :placeholder="t('common.payPlatformPlaceholder1')" clearable 
+              style="width: 220px;" 
+              />
           </div>
           <div class="search-item">
             <span class="label">{{ t('common.orderNo') }}：</span>
             <el-input v-model="queryParams.orderCode" :placeholder="t('common.orderNoPlaceholder')" clearable />
           </div>
-
           <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')"
@@ -455,82 +745,55 @@ onMounted(async () => {
             <el-button type="primary" @click="openExportList">{{ t('common.viewExportList') }}</el-button>
             <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>
+          </div>
         </div>
       </div>
-
     </el-card>
-
     <!-- 表格区域 -->
-    <el-card class="table-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' }">
+        :header-cell-style="{ background: '#F3FAFE', color: '#333', textAlign: 'center' }"
+        @row-click="showRecordDetail" >
         <el-table-column type="index" :label="t('common_list.id')" 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')" width="120" fixed="left" />
-        <el-table-column prop="name" :label="t('common_list.name')" width="150" show-overflow-tooltip />
-        <el-table-column prop="marketName" :label="t('common_list.market')" width="120" show-overflow-tooltip />
+        <el-table-column prop="payTime" :label="t('common_list.payTime2')" width="180" align="center" />
         <el-table-column prop="orderCode" :label="t('common_list.orderCode')" width="280" show-overflow-tooltip />
-
-        <el-table-column prop="paymentAmount" :label="t('common_list.payAmount')" width="150" align="right">
-          <!-- <template #default="{ row }">
-            {{ row.paymentAmount }} {{ row.paymentCurrency }}
-          </template> -->
-        </el-table-column>
-        <el-table-column prop="paymentCurrencyName" :label="t('common_list.payCurrency')" width="120"
-          show-overflow-tooltip />
-
-        <el-table-column prop="receivedAmount" :label="t('common_list.receiveAmount')" width="150" align="right">
-          <!-- <template #default="{ row }">
-            {{ row.receivedAmount }} {{ row.receivedCurrency }}
-          </template> -->
-        </el-table-column>
+        <el-table-column prop="receivedMarket" :label="t('common_list.receiveArea')" width="280" show-overflow-tooltip >
+          <template #default="{ row }">
+              {{ marketFilter(row.receivedMarket) }}
+          </template>
+          </el-table-column>
+        <el-table-column prop="performanceMarket" :label="t('common_list.performanceMarket')" width="120" show-overflow-tooltip >
+          <template #default="{ row }">
+              {{ marketFilter(row.performanceMarket) }}
+          </template></el-table-column>
+        <el-table-column prop="name" :label="t('common_list.name')" width="150" show-overflow-tooltip />
+        <el-table-column prop="jwcode" :label="t('common_list.jwcode')" width="120"  />
+        <el-table-column prop="goodsName" :label="t('common_list.receiveType')" width="120"  />
+        <el-table-column prop="remark" :label="t('common_list.remark')" width="120"  />
+        <el-table-column prop="goodNum" :label="t('common_list.nums')" width="120"  />
+        <el-table-column prop="payType" :label="t('common_list.paymentMethod')" width="120"  />
         <el-table-column prop="receivedCurrencyName" :label="t('common_list.receiveCurrency')" width="120"
           show-overflow-tooltip />
-
+        <el-table-column prop="paymentAmount" :label="t('common_list.payAmount')" width="150" align="right">
+        </el-table-column>
         <el-table-column prop="handlingCharge" :label="t('common_list.fee')" width="100" align="right" />
-        <el-table-column prop="payType" :label="t('common_list.payModel')" width="120" align="center" />
-        <el-table-column prop="payTime" :label="t('common_list.payTime2')" width="180" align="center" />
-
-        <el-table-column prop="status" :label="t('common_list.status')" width="120" align="center" fixed="right">
-          <template #default="{ row }">
-            <div style="display: flex;  align-items: center;">
-              <el-tag :type="row.status === 4 ? 'success' : 'warning'" effect="plain">
-                {{ row.status === 4 ? t('common_list.received') : t('common_list.refunded') }}
-              </el-tag>
-              <el-popover trigger="hover" placement="top" popper-class="refund-popover" width="auto"
-                v-if="row.status === 6">
-                <div class="popover-content">
-                  <div class="popover-title">{{ t('common_list.refundDetail') }}</div>
-                  <div class="popover-item">
-                    <span class="label">{{ t('common_list.refundAmount') }}：</span>
-                    <span class="value">{{ row.refundAmount || '-' }}</span>
-                  </div>
-                  <div class="popover-item">
-                    <span class="label">{{ t('common_list.refundCurrency') }}：</span>
-                    <span class="value">{{ row.refundCurrency || '-' }}</span>
-                  </div>
-                </div>
-                <template #reference>
-                  <img @click.stop src="@/assets/SvgIcons/consume.svg"
-                    style="width: 15px; height: 15px; margin-left: 5px; cursor: pointer; display: inline-block;">
-                </template>
-              </el-popover>
-            </div>
-          </template>
+        <el-table-column prop="receivedAmount" :label="t('common_list.receiveAmount')" width="150" align="right">
         </el-table-column>
-
-        <el-table-column :label="t('common_list.operation')" width="100" fixed="right" align="center">
+        <!-- <el-table-column :label="t('common_list.operation')" width="100" fixed="right" align="center">
           <template #default="{ row }">
             <el-button v-if="row.orderCode.slice(0, 4) == 'GOLD' && row.status === 4" type="danger" link size="small"
               @click="openRefundConfirm(row)">
               {{ t('common_list.refund') }}
             </el-button>
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
 
       <!-- 分页 -->
@@ -541,6 +804,211 @@ onMounted(async () => {
       </div>
     </el-card>
 
+    <!-- 详情显示页 -->
+    <el-dialog class="detailDialog" v-model="showDetail" :title="t('common_add.originalOrderInfo')" width="700px" destroy-on-close>
+      <el-form :model="formDataRow" label-width="100px" class="detail-form" disabled>
+        <div style="display: flex;">
+          <div class="left">
+            <div class="add-item">
+              <el-form-item :label="t('common_list.jwcode')">
+              <el-input v-model="formDataRow.jwcode" />
+              </el-form-item>
+            </div>
+            <div class="add-item">
+          <el-form-item :label="t('common_list.market')">
+            <el-input v-model="formDataRow.marketName" />
+          </el-form-item>
+        </div>
+            <div class="add-item">
+          <el-form-item :label="t('common_list.productName')">
+            <el-input v-model="formDataRow.goodsName" />
+          </el-form-item>
+        </div>
+            <div class="add-item">
+          <el-form-item :label="t('common_list.payCurrency')">
+            <el-input v-model="formDataRow.paymentCurrencyName" />
+          </el-form-item>
+        </div>
+            <div class="add-item">
+          <el-form-item :label="t('common_list.payAmount')">
+            <el-input v-model="formDataRow.paymentAmount" />
+          </el-form-item>
+        </div>
+            <div class="add-item">
+          <el-form-item :label="t('common_list.payTime2')">
+            <el-input v-model="formDataRow.payTime" />
+          </el-form-item>
+        </div>
+          <div class="add-item">
+          <el-form-item :label="t('common_list.transferVoucher')">
+          <div v-if="formDataRow.voucher" class="voucher-container">
+          <el-image :src="formDataRow.voucher" :preview-src-list="[formDataRow.voucher]" 
+          fit="cover" class="voucher-img" v-model:preview-visible="previewVisible"
+          @click="handlePreviewClick"/>
+          </div>
+          <div v-else class="no-voucher">{{ t('common_list.noTransferVoucher') }}</div>
+          </el-form-item>
+        </div>
+          </div>
+          <div class="right">
+            <div class="add-item">
+          <el-form-item :label="t('common_list.customerName')">
+            <el-input v-model="formDataRow.name" />
+          </el-form-item>
+          </div>
+          <div class="add-item">
+          <el-form-item :label="t('common_list.activity')">
+            <el-input v-model="formDataRow.activityName" />
+          </el-form-item>
+          </div>
+          <div class="add-item">
+          <el-form-item :label="t('common_list.payModel')">
+            <el-input v-model="formDataRow.payType" />
+          </el-form-item>
+          </div>
+          <div class="add-item">
+          <el-form-item :label="t('common_list.receiveCurrency')">
+            <el-input v-model="formDataRow.receiveCurrency" />
+          </el-form-item>
+          </div>
+          <div class="add-item">
+          <el-form-item :label="t('common_list.receiveAmount')">
+            <el-input v-model="formDataRow.receivedAmount" />
+          </el-form-item>
+          </div>
+          <div class="add-item">
+          <el-form-item :label="t('common_list.receiveTime')">
+            <el-input v-model="formDataRow.receivedTime" />
+          </el-form-item>
+          </div>
+          <div class="add-item">
+          <el-form-item :label="t('common_list.fee')">
+            <el-input v-model="formDataRow.handlingCharge" />
+          </el-form-item>
+        </div>
+          <div class="add-item">
+          <el-form-item :label="t('common_list.submitter')">
+            <el-input v-model="adminData.adminName" />
+          </el-form-item>
+          </div>
+          <div class="add-item">
+          <el-form-item :label="t('common_list.remark')">
+            <el-input v-model="formDataRow.remark" type="textarea" :rows="2" />
+          </el-form-item>
+          </div>
+        </div>
+        </div>
+      </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>
+      </div>
+    </el-dialog>
+
+    <!-- 新增流水页面 -->
+    <el-dialog class="adddialog" v-model="showAddDetail" style="width: 400px;">
+      <div style="width: fit-content; height: fit-content;margin-bottom: 20px; ">
+        <el-button 
+        class="btnItem"
+        :style="{backgroundColor: type === 'other' ? '#2741DE' : '#E5EBFE', color: type === 'other' ? 'white' : '#666' }" 
+        @click="selectAddType('other')" >{{ t('cash.cashFlow.otherIncome') }}</el-button>
+        <el-button 
+        class="btnItem"
+        :style="{ backgroundColor: type === 'ipay88' ? '#2741DE' : '#E5EBFE', color: type === 'ipay88' ? 'white' : '#666' }" 
+        @click="selectAddType('ipay88')" >{{ t('cash.cashFlow.addFee') }}</el-button>
+      </div>
+      <!-- 其他收入填写表单 -->
+      <div v-if="type === 'other'" >
+        <el-form :model="addOtherForm" :rules="otherRules" ref="otherFormRef" label-width="120px" label-position="left">
+          <el-form-item :label=" t('cash.cashFlow.performanceMarket')" prop="performanceMarket">
+            <el-select v-model="addOtherForm.performanceMarket" :placeholder="t('cash.cashFlow.performanceMarketPlaceholder')" >
+              <el-option v-for="item in performanceMarket" :key="item" :label="item" :value="item" />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.incomeCategory')" prop="goodsName">
+            <el-select v-model="addOtherForm.goodsName" :placeholder="t('cash.cashFlow.incomeCategoryPlaceholder')" >
+              <el-option :value="t('cash.cashFlow.investmentIncome')" />
+              <el-option :value="t('cash.cashFlow.taxRefund')" />
+              <el-option :value="t('cash.cashFlow.governmentSubsidy')" />
+              <el-option :value="t('cash.cashFlow.localIntercompany')" />
+              <el-option :value="t('cash.cashFlow.corporateIntercompany')" />
+              <el-option :value="t('cash.cashFlow.otherIncomeNon')" />
+              <el-option :value="t('cash.cashFlow.otherIncomeYes')" />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.quantity')" prop="goodNum">
+            <el-input v-model.number="addOtherForm.goodNum" :placeholder="t('cash.cashFlow.quantityPlaceholder')" />
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.payType')" prop="payType">
+            <el-select v-model="addOtherForm.payType" :placeholder="t('cash.cashFlow.payTypePlaceholder')" >
+              <el-option v-for="item in paytypeList" :key="item" :value="item" :label="item"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.paymentCurrency')" prop="paymentCurrency">
+            <el-select v-model="addOtherForm.paymentCurrency" :placeholder="t('cash.cashFlow.paymentCurrencyPlaceholder')" >
+              <el-option v-for="item in paymentCurrency" :key="item" :label="item" :value="item"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.paymentAmount')" prop="paymentAmount">
+            <el-input v-model="addOtherForm.paymentAmount" :placeholder="t('cash.cashFlow.paymentAmountPlaceholder')" />
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.paymentTime')" prop="payTime">
+            <el-date-picker v-model="addOtherForm.payTime" type="datetime" :placeholder="t('cash.cashFlow.paymentTimePlaceholder')"  value-format="YYYY-MM-DD HH:mm:ss"/>
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.bankHandlingFee')" prop="handlingCharge">
+            <el-input v-model="addOtherForm.handlingCharge" :placeholder="t('cash.cashFlow.bankHandlingFeePlaceholder')" />
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.remarks')" prop="remark">
+            <el-input v-model="addOtherForm.remark" type="textarea" :rows="3" :placeholder="t('cash.cashFlow.remarksPlaceholder')" :maxlength="100" show-word-limit />
+          </el-form-item>
+        </el-form>
+        <div class="btnDiv" >
+        <el-button type="default" style="background-color: #7E91FF;" @click="handleCancel">{{t('cash.cashFlow.cancel')}}</el-button>
+        <el-button type="primary" style="background-color: #2741DE; margin-left: 2.5vw;" @click="handleOther">{{t('cash.cashFlow.submit')}}</el-button>
+        </div>
+      </div> 
+      <!-- ipay88手续费填写表单 -->
+      <div v-if="type === 'ipay88'" >
+        <el-form :model="addIpay88Form" :rules="ipay88Rules" ref="ipay88FormRef"  label-width="120px" label-position="left">
+          <el-form-item :label="t('cash.cashFlow.payType')" prop="payType">
+            <el-select v-model="addIpay88Form.payType" :placeholder="t('cash.cashFlow.payTypePlaceholder')" >
+              <el-option :value="t('cash.cashFlow.ipay88')" :label="t('cash.cashFlow.ipay88')"/>
+              <el-option :value="t('cash.cashFlow.cardPayment')" :label="t('cash.cashFlow.cardPayment')"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.performanceMarket')" prop="performanceMarket">
+            <el-select v-model="addIpay88Form.performanceMarket" :placeholder="t('cash.cashFlow.performanceMarketPlaceholder')" >
+              <el-option v-for="item in performanceMarket" :key="item" :label="item" :value="item" />
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.incomeCategory')">
+            <el-input disabled :value="t('cash.cashFlow.fixedProcessingFee')"></el-input>
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.settlementRegion')">
+            <el-input disabled :value="t('cash.cashFlow.Malaysia')"></el-input>
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.paymentCurrency')" prop="paymentCurrency">
+            <el-select v-model="addIpay88Form.paymentCurrency" :placeholder="t('cash.cashFlow.paymentCurrencyPlaceholder')">
+              <el-option v-for="item in paymentCurrency" :key="item" :label="item" :value="item"/>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.paymentAmount')" prop="paymentAmount">
+            <el-input v-model="addIpay88Form.paymentAmount" :placeholder="t('cash.cashFlow.paymentAmountPlaceholder')"/>
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.processingFee')" prop="handlingCharge">
+            <el-input v-model="addIpay88Form.handlingCharge" :placeholder="t('cash.cashFlow.processingFeePlaceholder')" />
+          </el-form-item>
+          <el-form-item :label="t('cash.cashFlow.remarks')" prop="remark">
+            <el-input v-model="addIpay88Form.remark" type="textarea" :rows="3" :placeholder="t('cash.cashFlow.remarksPlaceholder')" :maxlength="100" show-word-limit/>
+          </el-form-item>
+        </el-form>
+        <div class="btnDiv">
+        <el-button type="default" style="background-color: #7E91FF;" @click="handleCancel">{{t('cash.cashFlow.cancel')}}</el-button>
+        <el-button type="primary" style="background-color: #2741DE; margin-left: 2.5vw;" @click="handleIpay88">{{t('cash.cashFlow.submit')}}</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
     <!-- 导出列表弹窗 -->
     <el-dialog v-model="exportListVisible" :title="t('common_export.exportList')" width="80%">
       <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
@@ -606,7 +1074,7 @@ onMounted(async () => {
           </div>
           <div class="add-item">
             <el-text style="width:4vw;">{{ t('common_add.activity') }}</el-text>
-            <el-input v-model="refundFormData.activity" style="width:10vw;" disabled />
+            <el-input v-model="refundFormData.activityName" style="width:10vw;" disabled />
           </div>
           <div class="add-item">
             <el-text style="width:4vw;">{{ t('common_add.productName') }}</el-text>
@@ -697,8 +1165,6 @@ onMounted(async () => {
   </div>
 </template>
 
-
-
 <style lang="scss">
 .refund-popover {
   background-color: #EEF5FE !important;
@@ -715,6 +1181,68 @@ onMounted(async () => {
 }
 </style>
 <style scoped lang="scss">
+:deep(.detailDialog) {
+        background: #F3FAFE !important;
+        .left {
+            width: 50%;
+            height: 60vh;
+            min-height: 400px;
+
+            .add-item {
+                display: flex;
+                align-items: center;
+                margin-bottom: 1vh;
+            }
+
+            .image {
+                width: 4vw !important;
+                height: 4vw !important;
+            }
+        }
+
+        .right {
+            width: 50%;
+            height: 60vh;
+
+            .add-item {
+                display: flex;
+                align-items: center;
+                margin-bottom: 1vh;
+            }
+        }
+        .voucher-img {
+        width: 100px;  /* 限制宽度 */
+        height: 100px; /* 限制高度 */
+        border-radius: 4px;
+        cursor: pointer; /* 鼠标放上去显示手型，提示可点击预览 */
+      }
+        .no-voucher {
+        color: #909399;
+        font-size: 14px;
+      }
+    }
+
+    :deep(.adddialog .el-form-item__label) {
+        min-width: 120px;
+        width: auto;
+        font-weight: 800;
+        padding-bottom: 15px;
+    }
+  
+.btnItem {
+  margin-left: 10px;
+  border-radius: 5px;
+}
+.btnDiv{
+  text-align: center; 
+  margin-top: 30px;
+}
+:deep(.adddialog) {
+  min-width: 400px;
+  background-color: #F3FAFE !important;
+  margin-top: 8vh;
+  border-radius: 8px;
+}
 .popover-content {
   .popover-title {
     color: #409EFF;
@@ -798,6 +1326,16 @@ onMounted(async () => {
   gap: 10px;
 }
 
+.newAdd {
+  display: flex;
+  width: 240px;
+  justify-content: flex-end;
+}
+.newAdd_btn{
+  background-color: blueviolet;
+  color: white;
+}
+
 .table-card {
   background: #E7F4FD;
   flex: 1;