From 66489ec66a50c5387c4d081fee1d9dbfddeb6c40 Mon Sep 17 00:00:00 2001 From: lihuilin Date: Tue, 23 Sep 2025 10:29:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=8E=B0=E9=87=91=E9=80=80=E6=AC=BE?= =?UTF-8?q?=E9=83=A8=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 187 +++++++- package.json | 2 +- src/router/index.js | 26 +- src/utils/menuTreePermission.js | 6 +- src/utils/menuUtils.js | 4 + src/views/moneyManage/executor/executor.vue | 2 + .../moneyManage/receiveDetail/receiveDetail.vue | 2 + .../moneyManage/refundDetail/refundDetail.vue | 471 +++++++++++++++++++++ 8 files changed, 680 insertions(+), 20 deletions(-) create mode 100644 src/views/moneyManage/executor/executor.vue create mode 100644 src/views/moneyManage/receiveDetail/receiveDetail.vue create mode 100644 src/views/moneyManage/refundDetail/refundDetail.vue diff --git a/package-lock.json b/package-lock.json index 57394a2..7661204 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "@fortawesome/free-solid-svg-icons": "^6.7.2", "@fortawesome/vue-fontawesome": "^3.0.8", "@tabler/icons-vue": "^3.34.0", - "axios": "^1.7.8", + "axios": "^1.12.2", "dayjs": "^1.11.13", "dayjs-plugin-utc": "^0.1.2", "echarts": "^5.5.1", @@ -3170,18 +3170,18 @@ }, "node_modules/asynckit": { "version": "0.4.0", - "resolved": "https://mirrors.huaweicloud.com/repository/npm/asynckit/-/asynckit-0.4.0.tgz", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", "license": "MIT" }, "node_modules/axios": { - "version": "1.7.8", - "resolved": "https://mirrors.huaweicloud.com/repository/npm/axios/-/axios-1.7.8.tgz", - "integrity": "sha512-Uu0wb7KNqK2t5K+YQyVCLM76prD5sRFjKHbJYCP1J7JFGEQ6nN7HWn9+04LAeiJ3ji54lgS/gZCH1oxyrf1SPw==", + "version": "1.12.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz", + "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==", "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", - "form-data": "^4.0.0", + "form-data": "^4.0.4", "proxy-from-env": "^1.1.0" } }, @@ -3330,6 +3330,19 @@ "dev": true, "license": "MIT" }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/caniuse-lite": { "version": "1.0.30001699", "resolved": "https://mirrors.huaweicloud.com/repository/npm/caniuse-lite/-/caniuse-lite-1.0.30001699.tgz", @@ -3422,7 +3435,7 @@ }, "node_modules/combined-stream": { "version": "1.0.8", - "resolved": "https://mirrors.huaweicloud.com/repository/npm/combined-stream/-/combined-stream-1.0.8.tgz", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "license": "MIT", "dependencies": { @@ -3567,7 +3580,7 @@ }, "node_modules/delayed-stream": { "version": "1.0.0", - "resolved": "https://mirrors.huaweicloud.com/repository/npm/delayed-stream/-/delayed-stream-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", "license": "MIT", "engines": { @@ -3599,6 +3612,20 @@ "integrity": "sha512-LN1gO7+u9xjU5oEScGFKvXhYf7Y/empUIIEAGBs1LzUq/rg5duiDrkuH5A2lQGd5jfMOb9X9usDa2oVXwJ0U/Q==", "license": "MIT" }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/echarts": { "version": "5.5.1", "resolved": "https://mirrors.huaweicloud.com/repository/npm/echarts/-/echarts-5.5.1.tgz", @@ -3660,6 +3687,24 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-module-lexer": { "version": "1.6.0", "resolved": "https://mirrors.huaweicloud.com/repository/npm/es-module-lexer/-/es-module-lexer-1.6.0.tgz", @@ -3667,6 +3712,33 @@ "dev": true, "license": "MIT" }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/esbuild": { "version": "0.24.2", "resolved": "https://mirrors.huaweicloud.com/repository/npm/esbuild/-/esbuild-0.24.2.tgz", @@ -3785,13 +3857,15 @@ } }, "node_modules/form-data": { - "version": "4.0.1", - "resolved": "https://mirrors.huaweicloud.com/repository/npm/form-data/-/form-data-4.0.1.tgz", - "integrity": "sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz", + "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==", "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", "mime-types": "^2.1.12" }, "engines": { @@ -3839,7 +3913,6 @@ "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -3862,6 +3935,43 @@ "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/globals": { "version": "11.12.0", "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", @@ -3871,11 +3981,49 @@ "node": ">=4" } }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/hasown": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "dev": true, "dependencies": { "function-bind": "^1.1.2" }, @@ -4090,6 +4238,15 @@ "@jridgewell/sourcemap-codec": "^1.5.0" } }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/mathjs": { "version": "14.0.1", "resolved": "https://mirrors.huaweicloud.com/repository/npm/mathjs/-/mathjs-14.0.1.tgz", @@ -4161,7 +4318,7 @@ }, "node_modules/mime-db": { "version": "1.52.0", - "resolved": "https://mirrors.huaweicloud.com/repository/npm/mime-db/-/mime-db-1.52.0.tgz", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "license": "MIT", "engines": { @@ -4170,7 +4327,7 @@ }, "node_modules/mime-types": { "version": "2.1.35", - "resolved": "https://mirrors.huaweicloud.com/repository/npm/mime-types/-/mime-types-2.1.35.tgz", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index a08640c..b9aeeb8 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@fortawesome/free-solid-svg-icons": "^6.7.2", "@fortawesome/vue-fontawesome": "^3.0.8", "@tabler/icons-vue": "^3.34.0", - "axios": "^1.7.8", + "axios": "^1.12.2", "dayjs": "^1.11.13", "dayjs-plugin-utc": "^0.1.2", "echarts": "^5.5.1", diff --git a/src/router/index.js b/src/router/index.js index 2b89dba..192dc9c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -300,13 +300,33 @@ const routes = [ ] }, { - path:'moneyManage', + path:'/moneyManage', name:'moneyManage', + meta:{permissionId:4}, children:[ - + // 收款明细 + { + path: 'receiveDetail', + name: "receiveDetail", + component: () => import("../views/moneyManage/receiveDetail/receiveDetail.vue"), + meta: { permissionId: 74 } + }, + // 退款明细 + { + path: 'refundDetail', + name: "refundDetail", + component: () => import("../views/moneyManage/refundDetail/refundDetail.vue"), + meta: { permissionId: 75 } + }, + // 执行明细 + { + path: 'executor', + name: "executor", + component: () => import("../views/moneyManage/executor/executor.vue"), + meta: { permissionId: 76 } + }, ] }, - // 没有权限 { path: '/noPermission', diff --git a/src/utils/menuTreePermission.js b/src/utils/menuTreePermission.js index 56899bd..f5afb52 100644 --- a/src/utils/menuTreePermission.js +++ b/src/utils/menuTreePermission.js @@ -50,7 +50,7 @@ export const permissionMapping = { refundWaitReject:41, // 退款审核驳回 beanWait:42, // 金豆审核待审核 - beanThrough:43, // 金豆审核已通过 + beanThrough:43, // 金豆审核已通过 beanReject:44, // 金豆审核已驳回 beanWaitShow:45, // 金豆审核待审核查看 beanWaitThough:46, // 金豆审核通过 @@ -88,6 +88,10 @@ export const permissionMapping = { roleManageShow:73, // 查看角色信息 addRoleInfo:71, // 新增角色信息 editRoleInfo:72, // 编辑角色信息 + + receiveDetail:74, // 收款明细 + refundDetail:75, // 退款明细 + executor:76, // 执行人 } // 递归查找菜单中是否存在目标id diff --git a/src/utils/menuUtils.js b/src/utils/menuUtils.js index 9db9be8..a0d87c3 100644 --- a/src/utils/menuUtils.js +++ b/src/utils/menuUtils.js @@ -78,6 +78,10 @@ export const getRoutePath = (menu) => { '用户管理': '/permissions/userPermission', '角色管理': '/permissions/rolePermission', + + '收款明细': '/receiveDetail/receiveDetail', + '退款明细': '/moneyManage/refundDetail', + '执行人': '/moneyManage/executor/executor', }; // 未匹配的菜单默认使用id作为路由（可根据实际需求调整） diff --git a/src/views/moneyManage/executor/executor.vue b/src/views/moneyManage/executor/executor.vue new file mode 100644 index 0000000..ce553c9 --- /dev/null +++ b/src/views/moneyManage/executor/executor.vue @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/views/moneyManage/receiveDetail/receiveDetail.vue b/src/views/moneyManage/receiveDetail/receiveDetail.vue new file mode 100644 index 0000000..ce553c9 --- /dev/null +++ b/src/views/moneyManage/receiveDetail/receiveDetail.vue @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/src/views/moneyManage/refundDetail/refundDetail.vue b/src/views/moneyManage/refundDetail/refundDetail.vue new file mode 100644 index 0000000..fca939c --- /dev/null +++ b/src/views/moneyManage/refundDetail/refundDetail.vue @@ -0,0 +1,471 @@ + + + \ No newline at end of file From edeb8c144de3ce63b377aabb510670108ba170a5 Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Tue, 23 Sep 2025 18:40:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=8E=B0=E9=87=91=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E6=94=B6=E6=AC=BE=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/menuUtils.js | 2 +- .../moneyManage/receiveDetail/receiveDetail.vue | 261 ++++++++++++++++++++- 2 files changed, 260 insertions(+), 3 deletions(-) diff --git a/src/utils/menuUtils.js b/src/utils/menuUtils.js index a0d87c3..b9007c5 100644 --- a/src/utils/menuUtils.js +++ b/src/utils/menuUtils.js @@ -79,7 +79,7 @@ export const getRoutePath = (menu) => { '用户管理': '/permissions/userPermission', '角色管理': '/permissions/rolePermission', - '收款明细': '/receiveDetail/receiveDetail', + '收款明细': '/moneyManage/receiveDetail', '退款明细': '/moneyManage/refundDetail', '执行人': '/moneyManage/executor/executor', }; diff --git a/src/views/moneyManage/receiveDetail/receiveDetail.vue b/src/views/moneyManage/receiveDetail/receiveDetail.vue index ce553c9..a6729f0 100644 --- a/src/views/moneyManage/receiveDetail/receiveDetail.vue +++ b/src/views/moneyManage/receiveDetail/receiveDetail.vue @@ -1,2 +1,259 @@ - - \ No newline at end of file + + + \ No newline at end of file