diff --git a/.env.development b/.env.development index 410ce99..6863c9d 100644 --- a/.env.development +++ b/.env.development @@ -11,6 +11,9 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload # zhangyong # VITE_API_BASE='http://192.168.3.83:8081/' # 本地 -#VITE_API_BASE='http://localhost:8081/' +VITE_API_BASE='http://localhost:8081/' # sunjiabei -#VITE_API_BASE='http://192.168.1.50:8081/' \ No newline at end of file +# VITE_API_BASE='http://192.168.1.70:8081/' + +# lijianlin +# VITE_API_BASE='http://192.168.9.41:8081/' \ No newline at end of file diff --git a/src/assets/images/已审核.png b/src/assets/images/已审核.png new file mode 100644 index 0000000..2472dce Binary files /dev/null and b/src/assets/images/已审核.png differ diff --git a/src/assets/images/待审核.png b/src/assets/images/待审核.png new file mode 100644 index 0000000..1c36063 Binary files /dev/null and b/src/assets/images/待审核.png differ diff --git a/src/assets/images/撤回.png b/src/assets/images/撤回.png new file mode 100644 index 0000000..c4d2999 Binary files /dev/null and b/src/assets/images/撤回.png differ diff --git a/src/assets/images/背景图.png b/src/assets/images/背景图.png new file mode 100644 index 0000000..6206dda Binary files /dev/null and b/src/assets/images/背景图.png differ diff --git a/src/assets/images/还没传到.png b/src/assets/images/还没传到.png new file mode 100644 index 0000000..ee5ff5d Binary files /dev/null and b/src/assets/images/还没传到.png differ diff --git a/src/components/MoneyManage/CurrencySelect.vue b/src/components/MoneyManage/CurrencySelect.vue new file mode 100644 index 0000000..056cde6 --- /dev/null +++ b/src/components/MoneyManage/CurrencySelect.vue @@ -0,0 +1,321 @@ + + + + \ No newline at end of file diff --git a/src/components/MoneyManage/ProductSelect.vue b/src/components/MoneyManage/ProductSelect.vue new file mode 100644 index 0000000..9564808 --- /dev/null +++ b/src/components/MoneyManage/ProductSelect.vue @@ -0,0 +1,436 @@ + + + \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 192dc9c..8fdbb28 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -308,15 +308,61 @@ const routes = [ { path: 'receiveDetail', name: "receiveDetail", - component: () => import("../views/moneyManage/receiveDetail/receiveDetail.vue"), - meta: { permissionId: 74 } + // component: () => import("../views/moneyManage/receiveDetail/receiveDetail.vue"), + meta: { permissionId: 74 }, + children:[ + // 客服页面 + { + path: 'receiveService', + name: "receiveService", + component: () => import("../views/moneyManage/receiveDetail/receiveDetail.vue"), + meta: { permissionId: 77 } + }, + // 地区财务及地区负责人页面 + { + path: 'receiveArea', + name: "receiveArea", + component: () => import("../views/moneyManage/receiveDetail/receiveDetail.vue"), + meta: { permissionId: 78 } + }, + //总部管理员及财务 + { + path: 'receiveHead', + name: "receiveHead", + component: () => import("../views/moneyManage/receiveDetail/receiveDetail.vue"), + meta: { permissionId: 79 } + }, + ] }, // 退款明细 { path: 'refundDetail', name: "refundDetail", - component: () => import("../views/moneyManage/refundDetail/refundDetail.vue"), - meta: { permissionId: 75 } + //component: () => import("../views/moneyManage/refundDetail/refundDetail.vue"), + meta: { permissionId: 75 }, + children:[ + // 客服页面 + { + path: 'service', + name: "refundService", + component: () => import("../views/moneyManage/refundDetail/refundService.vue"), + meta: { permissionId: 75 } + }, + // 地区财务及地区负责人页面 + { + path: 'refundArea', + name: "refundArea", + component: () => import("../views/moneyManage/refundDetail/refundArea.vue"), + meta: { permissionId: 75 } + }, + //总部管理员及财务 + { + path: 'refundHeader', + name: "refundHeader", + component: () => import("../views/moneyManage/refundDetail/refundHeader.vue"), + meta: { permissionId: 75 } + }, + ] }, // 执行明细 { diff --git a/src/util/request.js b/src/util/request.js index 913c4e0..516e1c8 100644 --- a/src/util/request.js +++ b/src/util/request.js @@ -26,11 +26,12 @@ export const uploadFile = (file) => { service.interceptors.request.use(config => { const token = localStorage.getItem('token') if (token) { - if (config.data) { - config.data.token = token; - } else { - config.data = { token }; - } + // 请求体里面为什么放token? + // if (config.data) { + // config.data.token = token; + // } else { + // config.data = { token }; + // } config.headers.token = `${token}` } return config diff --git a/src/utils/menuTreePermission.js b/src/utils/menuTreePermission.js index d345f62..ed0b860 100644 --- a/src/utils/menuTreePermission.js +++ b/src/utils/menuTreePermission.js @@ -16,6 +16,10 @@ export const permissionMapping = { permissionManage:11, // 权限管理 historyData:12, // 历史数据查询 + receiveDetail:74, // 收款明细 + refundDetail:75, // 退款明细 + executor:76, // 执行明细 + // 页面,3级 workbenchShow:13, // 工作台查看 coinAudit:14, // 金币审核 @@ -33,6 +37,14 @@ export const permissionMapping = { newCoinSelect:26, // 金币查询(新) oldCoinSelect:27, // 金币查询(旧) + receiveService:77, // 收款-地区客服 + receiveArea:78, // 收款-地区财务/负责人 + receiveHeader:79, // 收款-总部财务/管理员 + refundService:80, // 退款-地区客服 + refundFinance:81, // 退款-地区财务 + refundCharge:82, // 退款-地区负责人 + refundHeader:83, // 退款-总部财务/管理员 + // 功能,4级 rechargeAudit:28, // 充值审核 refundAudit:29, // 退款审核 @@ -89,9 +101,41 @@ export const permissionMapping = { addRoleInfo:71, // 新增角色信息 editRoleInfo:72, // 编辑角色信息 - receiveDetail:74, // 收款明细 - refundDetail:75, // 退款明细 - executor:76, // 执行人 + executeEdit:84, // 执行明细编辑 + executeSubmit:85, // 执行明细提交 + + receiveServiceShow:86, // 收款-客服展示 + receiveServiceAdd:87, // 收款-客服新增 + receiveServiceReturn:88, // 收款-客服撤回 + receiveServiceEdit:89, // 收款-客服编辑 + receiveServiceRefund:90, // 收款-客服退款 + receiveAreaWaiting:91, // 收款-地区财务/负责人待审核 + receiveAreaPass:92, // 收款-地区财务/负责人已通过 + receiveAreaReject:93, // 收款-地区财务/负责人已驳回 + receiveAreaWaitingShow:94, // 收款-地区财务/负责人待审核查看 + receiveAreaApproved:95, // 收款-地区财务/负责人通过 + receiveAreaRejected:96, // 收款-地区财务/负责人驳回 + receiveAreaPassShow:97, // 收款-地区财务/负责人已通过查看 + receiveAreaPassEdit:98, // 收款-地区财务/负责人已通过编辑 + receiveHeaderPassShow:99, // 收款-总部财务/管理员已通过 + receiveHeaderPassShow:100, // 收款-总部财务/管理员已通过查看 + receiveHeaderPassEdit:101, // 收款-总部财务/管理员已通过编辑 + + refundServiceShow:102, // 退款-客服查看 + refundServiceBack:103, // 退款-客服撤回 + refundServiceEdit:104, // 退款-客服编辑 + refundFinanceShow:105, // 退款-地区财务查看 + refundFinanceAudit:106, // 退款-地区财务审核 + refundFinanceProgShow:107, // 退款-地区财务进度查看 + refundChargeShow:108, // 退款-地区负责人查看 + refundChargeAudit:109, // 退款-地区负责人审核 + refundChargeProgShow:110, // 退款-地区负责人进度查看 + refundHeaderShow:111, // 退款-总部财务/管理员查看 + refundHeaderAudit:112, // 退款-总部财务/管理员审核 + refundHeaderProgShow:113, // 退款-总部财务/管理员进度查看 + + // 特殊,5级 + updateData:114, // 手动拉取数据 } // 递归查找菜单中是否存在目标id diff --git a/src/utils/menuUtils.js b/src/utils/menuUtils.js index b9007c5..0a0c808 100644 --- a/src/utils/menuUtils.js +++ b/src/utils/menuUtils.js @@ -80,8 +80,17 @@ export const getRoutePath = (menu) => { '角色管理': '/permissions/rolePermission', '收款明细': '/moneyManage/receiveDetail', + '收款-地区客服':'/moneyManage/receiveDetail/receiveService', + '收款-地区财务/负责人':'/moneyManage/receiveDetail/receiveArea', + '收款-总部财务/管理员':'/moneyManage/receiveDetail/receiveHead', + '退款明细': '/moneyManage/refundDetail', - '执行人': '/moneyManage/executor/executor', + '退款-地区客服':'/moneyManage/refundDetail/service', + '退款-地区财务':'/moneyManage/refundDetail/refundFinance', + '退款-地区负责人':'/moneyManage/refundDetail/refundCharge', + '退款-总部财务/管理员':'/moneyManage/refundDetail/refundHeader', + + '执行明细': '/moneyManage/executor', }; // 未匹配的菜单默认使用id作为路由(可根据实际需求调整) diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue index ce553c9..37bf450 100644 --- a/src/views/moneyManage/executor/executor.vue +++ b/src/views/moneyManage/executor/executor.vue @@ -1,2 +1,283 @@ - - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/views/moneyManage/receiveDetail/receiveDetail.vue b/src/views/moneyManage/receiveDetail/receiveDetail.vue index b750f27..4b6c348 100644 --- a/src/views/moneyManage/receiveDetail/receiveDetail.vue +++ b/src/views/moneyManage/receiveDetail/receiveDetail.vue @@ -5,33 +5,43 @@
精网号 - +
客户姓名 - +
所属地区 - + + +
订单状态 - + +
支付方式 - + + +
活动名称 - + + +
产品名称 - +
付款时间 @@ -43,12 +53,13 @@
- 查询 - 重置 + 查询 + 重置 导出excel 导出列表 - 切换客服 - 切换财务 + 切换客服 + 切换地区财务 + 切换总部财务
@@ -58,9 +69,9 @@
-
+
- 待审核 @@ -70,7 +81,7 @@ @click="navigateTo('pass')"> 已通过 - 已驳回 @@ -93,39 +104,41 @@ - + - - - + + + - + - - + - + - + - - + + - - - - + + + - + + + @@ -163,21 +187,32 @@
- + + - - + @@ -190,6 +225,7 @@
+
@@ -201,46 +237,82 @@
- +
+ +
+
+ +
+
+ {{ textContent }} +
+
+ +
+
+ +
+
+ - + - + - + - + - - - + + - +
- +
+
+
+ 永久金币: + +
+
+ 免费金币: + +
+
- - - + - + - + + + + + + - @@ -248,7 +320,7 @@ - @@ -257,15 +329,17 @@
- @@ -273,40 +347,41 @@ - + - + - + - - + + - - - - + + - + - - + + - +
- @@ -318,11 +393,11 @@
- + -
@@ -333,57 +408,61 @@ backgroundColor: isBtnDisabled ? '#E5E5E5FF' : '#2741DEFF', marginLeft: '60px', color: isBtnDisabled ? '#8A8A8A' : '#F3FAFE' - }" @click="handleReject" :disabled="isBtnDisabled">{{ btnText }} + }" @click="handelAudit" :disabled="isBtnDisabled">{{ btnText }} 取消 确定 + @click="handelAuditReject">确定
- +
- + - + - + - + - + - + - + - + - +
- - @@ -395,27 +474,32 @@
- +
- + - + - - - - + + - + + + + @@ -433,80 +517,366 @@
+ + +
+
+
+ 精网号 + +
+
+ 客户姓名 + +
+
+ 所属地区 + +
+
+ 活动名称 + +
+
+ 产品名称 + +
+
+ 产品数量 + +  个 +
+
+ 付款币种 + +
+
+ 付款金额 + +
+
+ 支付方式 + +
+
+ 付款时间 + +
+
+ 转账凭证 + + + + + +
+
+ 备注 + +
+
+
+
+ 退款模式 + + 全部退款 + 部分退款 + +
+
+ 退款理由 + +
+
ps:请在退款理由表明用户的退款需求。
+
+ 重置 + 提交 +
+
+
+
\ No newline at end of file diff --git a/src/views/moneyManage/refundDetail/refundArea.vue b/src/views/moneyManage/refundDetail/refundArea.vue new file mode 100644 index 0000000..30754c8 --- /dev/null +++ b/src/views/moneyManage/refundDetail/refundArea.vue @@ -0,0 +1,725 @@ + + + + \ No newline at end of file diff --git a/src/views/moneyManage/refundDetail/refundDetail.vue b/src/views/moneyManage/refundDetail/refundDetail.vue index 760ad4c..afd57f2 100644 --- a/src/views/moneyManage/refundDetail/refundDetail.vue +++ b/src/views/moneyManage/refundDetail/refundDetail.vue @@ -1,471 +1,71 @@ - - \ No newline at end of file + } +}) + \ No newline at end of file diff --git a/src/views/moneyManage/refundDetail/refundHeader.vue b/src/views/moneyManage/refundDetail/refundHeader.vue new file mode 100644 index 0000000..35aadba --- /dev/null +++ b/src/views/moneyManage/refundDetail/refundHeader.vue @@ -0,0 +1,762 @@ + + + + + \ No newline at end of file diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue new file mode 100644 index 0000000..8806fd2 --- /dev/null +++ b/src/views/moneyManage/refundDetail/refundService.vue @@ -0,0 +1,629 @@ + + + + \ No newline at end of file