diff --git a/.trae/.ignore b/.trae/.ignore
new file mode 100644
index 0000000..e69de29
diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js
index 92380e0..bf3cec9 100644
--- a/src/components/locales/lang/zh-CN.js
+++ b/src/components/locales/lang/zh-CN.js
@@ -1026,7 +1026,7 @@ export default {
cash: {
refundProgress: "退款进度",
progress: {
- areaFinance: "地区财务",
+ areaFinance: "收款处理",
areaCharge: "地区负责人",
headFinance: "总部财务",
executor: "指定执行人",
@@ -1162,7 +1162,7 @@ export default {
rejected: "已驳回",
inProgress: "进行中",
},
- // 执行明细
+ // 退款执行
pending: "待处理",
refundSuccess: "退款成功",
},
diff --git a/src/router/index.js b/src/router/index.js
index 6c7c276..d6bec63 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -309,33 +309,33 @@ const routes = [
name: "receiveDetail",
meta: {permissionId: 74},
children: [
- // 客服页面
+ // 收款提交
{
path: 'receiveService',
name: "receiveService",
component: () => import("../views/moneyManage/receiveDetail/receiveService.vue"),
meta: {permissionId: 60}
},
- // 地区负责人页面
+ // 收款处理
{
path: 'receiveManager',
name: "receiveManager",
component: () => import("../views/moneyManage/receiveDetail/receiveManage.vue"),
meta: {permissionId: [67, 79]}
},
- {//地区财务
+ {//收款处理 （负责人）
path: 'receiveFinance',
name: "receiveFinance",
component: () => import("../views/moneyManage/receiveDetail/receiveFinance.vue"),
meta: {permissionId: [67, 79]}
},
- //总部管理员及财务
- {
- path: 'receiveHeader',
- name: "receiveHeader",
- component: () => import("../views/moneyManage/receiveDetail/receiveHead.vue"),
- meta: {permissionId: 91}
- },
+ //总部管理员及财务（移除）
+ // {
+ // path: 'receiveHeader',
+ // name: "receiveHeader",
+ // component: () => import("../views/moneyManage/receiveDetail/receiveHead.vue"),
+ // meta: {permissionId: 91}
+ // },
]
},
// 退款明细
@@ -345,28 +345,28 @@ const routes = [
component: () => import("../views/moneyManage/refundDetail/refundDetail.vue"),
meta: {permissionId: 98},
children: [
- // 客服页面
+ // 退款提交
{
path: 'refundService',
name: "refundService",
component: () => import("../views/moneyManage/refundDetail/refundService.vue"),
meta: {permissionId: 99}
},
- // 地区财务页面
+ // 退款审批
{
path: 'refundFinance',
name: "refundFinance",
component: () => import("../views/moneyManage/refundDetail/refundFinance.vue"),
meta: {permissionId: 103}
},
- // 地区负责人页面
+ // 退款审批（负责人）
{
path: 'refundCharge',
name: "refundCharge",
component: () => import("../views/moneyManage/refundDetail/refundCharge.vue"),
meta: {permissionId: 107}
},
- //总部管理员及财务
+ // 退款审批（总部财务）
{
path: 'refundHeader',
name: "refundHeader",
@@ -375,13 +375,35 @@ const routes = [
},
]
},
- // 执行明细
+ // 退款执行
{
path: 'executor',
name: "executor",
component: () => import("../views/moneyManage/executor/executor.vue"),
meta: {permissionId: 115}
},
+ // 财务核算
+ {
+ path: 'financialAccount',
+ name: "financialAccount",
+ meta: {permissionId: 147},
+ children: [
+ // 资金流水
+ {
+ path: 'cashFlow',
+ name: "cashFlow",
+ component: () => import("../views/moneyManage/financialAccount/cashFlow.vue"),
+ meta: {permissionId: 148}
+ },
+ // 业绩归属
+ {
+ path: 'performanceAttribution',
+ name: "performanceAttribution",
+ component: () => import("../views/moneyManage/financialAccount/performanceAttribution.vue"),
+ meta: {permissionId: 149}
+ },
+ ]
+ }
]
},
// 频道管理
diff --git a/src/utils/menuTreePermission.js b/src/utils/menuTreePermission.js
index 67b0da6..f72027c 100644
--- a/src/utils/menuTreePermission.js
+++ b/src/utils/menuTreePermission.js
@@ -68,7 +68,7 @@ export const permissionMapping = {
cash_management: 58, // 现金管理
collection_details: 59, // 收款明细
- collection_area_customer_service: 60, // 收款 - 地区客服
+ collection_area_submit: 60, // 收款 - 地区客服--->收款提交
view_customer_service_collection: 61, // 客服收款查看
add_customer_service_collection: 62, // 客服添加收款
withdraw_customer_service_collection: 63, // 客服收款撤回
@@ -76,7 +76,7 @@ export const permissionMapping = {
refund_customer_service_collection: 65, // 客服收款退款
view_customer_service_refund_reason: 66, // 客服收款查看退款理由
- collection_area_finance: 67, // 收款 - 地区财务
+ collection_area_processing: 67, // 收款 - 地区财务--->收款处理
area_finance_collection_pending: 68, // 地区财务收款待审核
view_area_finance_pending: 69, // 地区财务收款待审核查看
pass_area_finance_collection: 70, // 地区财务收款通过
@@ -89,7 +89,7 @@ export const permissionMapping = {
view_area_finance_completed: 77, // 地区财务收款已完成查看
refund_area_finance_completed: 78, // 地区财务收款已完成退款
- collection_area_manager: 79, // 收款 - 地区负责人
+ collection_area_manager: 79, // 收款 - 地区负责人--->收款处理（负责人）
area_manager_collection_pending: 80, // 地区负责人收款待审核
view_area_manager_pending: 81, // 地区负责人收款待审核查看
pass_area_manager_collection: 82, // 地区负责人收款通过
@@ -102,36 +102,37 @@ export const permissionMapping = {
view_area_manager_completed: 89, // 地区负责人收款已完成查看
refund_area_manager_completed: 90, // 地区负责人收款已完成退款
- collection_headquarters_finance: 91, // 收款 - 总部财务
- headquarters_finance_approved: 92, // 总部财务收款已通过
- view_headquarters_approved: 93, // 总部财务收款已通过查看
- edit_headquarters_approved: 94, // 总部财务收款已通过编辑
- headquarters_finance_completed: 95, // 总部财务收款已完成
- view_headquarters_completed: 96, // 总部财务收款已完成查看
- refund_headquarters_completed: 97, // 总部财务收款已完成退款
+ // 移除总部财务
+ // collection_headquarters_finance: 91, // 收款 - 总部财务
+ // headquarters_finance_approved: 92, // 总部财务收款已通过
+ // view_headquarters_approved: 93, // 总部财务收款已通过查看
+ // edit_headquarters_approved: 94, // 总部财务收款已通过编辑
+ // headquarters_finance_completed: 95, // 总部财务收款已完成
+ // view_headquarters_completed: 96, // 总部财务收款已完成查看
+ // refund_headquarters_completed: 97, // 总部财务收款已完成退款
refund_details: 98, // 退款明细
- refund_area_customer_service: 99, // 退款 - 地区客服
+ refund_area_cash: 99, // 退款 - 地区客服--->退款提交
view_customer_service_refund_pending: 100, // 客服退款查看
withdraw_customer_service_refund: 101, // 客服退款撤回
edit_customer_service_refund: 102, // 客服退款编辑
- refund_area_finance: 103, // 退款 - 地区财务
+ refund_area_review: 103, // 退款 - 地区财务--->退款审批
view_area_finance_refund: 104, // 地区财务退款查看
audit_area_finance_refund: 105, // 地区财务退款审核
track_area_finance_refund_progress: 106, // 地区财务退款进度
- refund_area_manager: 107, // 退款 - 地区负责人
+ refund_area_manager: 107, // 退款 - 地区负责人--->退款审批（负责人）
view_area_manager_refund: 108, // 地区负责人退款查看
audit_area_manager_refund: 109, // 地区负责人退款审核
track_area_manager_refund_progress: 110, // 地区负责人退款进度
- refund_headquarters_finance: 111, // 退款 - 总部财务
+ refund_headquarters_finance: 111, // 退款 - 总部财务--->退款审批（总部财务）
view_headquarters_refund: 112, // 总部财务退款查看
audit_headquarters_refund: 113, // 总部财务退款审核
track_headquarters_refund_progress: 114, // 总部财务退款进度
- execution_details: 115, // 执行明细
+ execution_details_refund: 115, // 执行明细--->退款执行
view_execution_details: 116, // 查看执行明细
edit_execution_details: 117, // 编辑执行明细
submit_execution_details: 118, // 提交执行明细
@@ -166,9 +167,13 @@ export const permissionMapping = {
view_personal_information: 142, // 查看个人信息
change_password: 143, // 修改密码
logout_system: 144, // 退出登录
- message_push: 145, // 消息推送
+ message_push: 145, // 消息推送
mutiple_language: 146, // 多语言配置
+
+ financial_accounting: 147, // 财务核算
+ cash_flow_ledger: 148, // 资金流水账
+ performance_attribution_accounting: 149, // 业绩归属台账
}
// 递归查找菜单中是否存在目标id
diff --git a/src/utils/menuUtils.js b/src/utils/menuUtils.js
index df25b5d..919febc 100644
--- a/src/utils/menuUtils.js
+++ b/src/utils/menuUtils.js
@@ -71,16 +71,19 @@ export const getRoutePath = (menu) => {
"51": "/usergold", // 金币客户账户明细
"54": "/userbean", // 金豆客户账户明细
"59": "/moneyManage/receiveDetail", // 收款明细（现金管理子菜单）
- "60": "/moneyManage/receiveDetail/receiveService", // 收款-地区客服（收款明细子菜单）
- "67": "/moneyManage/receiveDetail/receiveFinance", // 收款-地区财务（收款明细子菜单）
- "79": "/moneyManage/receiveDetail/receiveManager", // 收款-地区负责人（收款明细子菜单）
- "91": "/moneyManage/receiveDetail/receiveHeader", // 收款-总部财务（收款明细子菜单）
+ "60": "/moneyManage/receiveDetail/receiveService", // 收款-收款提交（收款明细子菜单）
+ "67": "/moneyManage/receiveDetail/receiveFinance", // 收款-收款处理（收款明细子菜单）
+ "79": "/moneyManage/receiveDetail/receiveManager", // 收款-收款处理（负责人）（收款明细子菜单）
+ // "91": "/moneyManage/receiveDetail/receiveHeader", // 收款-总部财务（收款明细子菜单） 移除
"98": "/moneyManage/refundDetail", // 退款明细（现金管理子菜单）
- "99": "/moneyManage/refundDetail/refundService", // 退款-地区客服（退款明细子菜单）
- "103": "/moneyManage/refundDetail/refundFinance", // 退款-地区财务（退款明细子菜单）
- "107": "/moneyManage/refundDetail/refundCharge", // 退款-地区负责人（退款明细子菜单）
- "111": "/moneyManage/refundDetail/refundHeader", // 退款-总部财务（退款明细子菜单）
- "115": "/moneyManage/executor", // 执行明细（现金管理子菜单）
+ "99": "/moneyManage/refundDetail/refundService", // 退款-退款提交（退款明细子菜单）
+ "103": "/moneyManage/refundDetail/refundFinance", // 退款-退款审批（退款明细子菜单）
+ "107": "/moneyManage/refundDetail/refundCharge", // 退款-退款审批（负责人）（退款明细子菜单）
+ "111": "/moneyManage/refundDetail/refundHeader", // 退款-退款审批（总部财务）（退款明细子菜单）
+ "115": "/moneyManage/executor", // 退款执行（现金管理子菜单）
+ "147": "/moneyManage/financialAccount", // 财务核算（现金管理子菜单）
+ "148": "/moneyManage/financialAccount/cashFlow", // 资金流水账（财务核算子菜单）
+ "149": "/moneyManage/financialAccount/performanceAttribution", // 业绩归属账（财务核算子菜单）
"125": "/channelManage/reward", // 打赏管理（频道管理子菜单）
"126": "/channelManage/fans", // 铁粉管理（频道管理子菜单）
"127": "/channelManage/cart" // 小黄车管理（频道管理子菜单）
@@ -88,4 +91,4 @@ export const getRoutePath = (menu) => {
// 从映射表中匹配路由，无匹配时返回无权限页面路径
return routeMap[menu.id] || '/noPermission';
-}
\ No newline at end of file
+}
diff --git a/src/views/home.vue b/src/views/home.vue
index f322902..05cc496 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -159,7 +159,7 @@ const selectStatusById = () => {
}
//地区客服收款
- if (hasPermission(permissionMapping.collection_area_customer_service)) {
+ if (hasPermission(permissionMapping.collection_area_submit)) {
status.push(2);
}
// 地区负责人收款待审核
@@ -186,7 +186,7 @@ const selectStatusById = () => {
status.push(40);
}
//地区客服退款审核驳回
- if (hasPermission(permissionMapping.refund_area_customer_service)) {
+ if (hasPermission(permissionMapping.refund_area_cash)) {
status.push(12,22,32);
}
diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue
new file mode 100644
index 0000000..1f22dd2
--- /dev/null
+++ b/src/views/moneyManage/financialAccount/cashFlow.vue
@@ -0,0 +1,5 @@
+
+
+
资金流水
+
+
\ No newline at end of file
diff --git a/src/views/moneyManage/financialAccount/performanceAttribution.vue b/src/views/moneyManage/financialAccount/performanceAttribution.vue
new file mode 100644
index 0000000..2273524
--- /dev/null
+++ b/src/views/moneyManage/financialAccount/performanceAttribution.vue
@@ -0,0 +1,5 @@
+
+
+
业绩归属
+
+
\ No newline at end of file
diff --git a/src/views/moneyManage/refundDetail/refundDetail.vue b/src/views/moneyManage/refundDetail/refundDetail.vue
index 86e778c..3b044f9 100644
--- a/src/views/moneyManage/refundDetail/refundDetail.vue
+++ b/src/views/moneyManage/refundDetail/refundDetail.vue
@@ -27,8 +27,8 @@ const navigateTo = (name) => {
const initPermissions = () => {
if (!menuTree.value || !menuTree.value.length) return
- isService.value = hasMenuPermission(menuTree.value, permissionMapping.refund_area_customer_service)
- isFinance.value = hasMenuPermission(menuTree.value, permissionMapping.refund_area_finance)
+ isService.value = hasMenuPermission(menuTree.value, permissionMapping.refund_area_cash)
+ isFinance.value = hasMenuPermission(menuTree.value, permissionMapping.refund_area_review)
isCharge.value = hasMenuPermission(menuTree.value, permissionMapping.refund_area_manager)
isHeader.value = hasMenuPermission(menuTree.value, permissionMapping.refund_headquarters_finance)
console.log('====================================', isService.value, isFinance.value,isCharge.value,isHeader.value)