From 5e407749fb0d08a75b5faecc6f14c71a7e406db1 Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Tue, 13 Jan 2026 11:49:20 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8A=A0=E7=AD=9B=E9=80=89=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 17 ++--------------- src/views/consume/gold/coinConsumeDetail.vue | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 03592ae..8b355dc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -116,7 +116,6 @@ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz", "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==", "dev": true, - "peer": true, "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.26.2", @@ -2020,7 +2019,6 @@ "version": "6.7.2", "resolved": "https://registry.npmmirror.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.7.2.tgz", "integrity": "sha512-yxtOBWDrdi5DD5o1pmVdq3WMCvnobT0LU6R8RyyVXPvFRd2o79/0NCuQoCjNTeZz9EzA9xS3JxNWfv54RIHFEA==", - "peer": true, "dependencies": { "@fortawesome/fontawesome-common-types": "6.7.2" }, @@ -2793,7 +2791,6 @@ "resolved": "https://mirrors.huaweicloud.com/repository/npm/@types/lodash-es/-/lodash-es-4.17.12.tgz", "integrity": "sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==", "license": "MIT", - "peer": true, "dependencies": { "@types/lodash": "*" } @@ -2804,7 +2801,6 @@ "integrity": "sha512-F8Q+SeGimwOo86fiovQh8qiXfFEh2/ocYv7tU5pJ3EXMSSxk1Joj5wefpFK2fHTf/N6HKGSxIDBT9f3gCxXPkQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "undici-types": "~6.20.0" } @@ -3341,7 +3337,6 @@ } ], "license": "MIT", - "peer": true, "dependencies": { "caniuse-lite": "^1.0.30001688", "electron-to-chromium": "^1.5.73", @@ -4246,15 +4241,13 @@ "version": "4.17.21", "resolved": "https://mirrors.huaweicloud.com/repository/npm/lodash/-/lodash-4.17.21.tgz", "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/lodash-es": { "version": "4.17.21", "resolved": "https://mirrors.huaweicloud.com/repository/npm/lodash-es/-/lodash-es-4.17.21.tgz", "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==", - "license": "MIT", - "peer": true + "license": "MIT" }, "node_modules/lodash-unified": { "version": "1.0.3", @@ -4724,7 +4717,6 @@ "integrity": "sha512-wc2cBWqJgkU3Iz5oztRkQbfVkbxoz5EhnCGOrnJvnLnQ7O0WhQUYyv18qQI79O8L7DdHrrlJNeCHd4VGpnaXKQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "@types/estree": "1.0.6" }, @@ -4802,7 +4794,6 @@ "resolved": "https://registry.npmmirror.com/sass/-/sass-1.86.3.tgz", "integrity": "sha512-iGtg8kus4GrsGLRDLRBRHY9dNVA78ZaS7xr01cWnS7PEMQyFtTqBiyCrfpTYTZXRWM94akzckYjh8oADfFNTzw==", "dev": true, - "peer": true, "dependencies": { "chokidar": "^4.0.0", "immutable": "^5.0.2", @@ -4949,7 +4940,6 @@ "integrity": "sha512-GWANVlPM/ZfYzuPHjq0nxT+EbOEDDN3Jwhwdg1D8TU8oSkktp8w64Uq4auuGLxFSoNTRDncTq2hQHX1Ld9KHkA==", "dev": true, "license": "BSD-2-Clause", - "peer": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", "acorn": "^8.8.2", @@ -5003,7 +4993,6 @@ "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", "devOptional": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -5096,7 +5085,6 @@ "integrity": "sha512-RjjMipCKVoR4hVfPY6GQTgveinjNuyLw+qruksLDvA5ktI1150VmcMBKmQaEWJhg/j6Uaf6dNCNA0AfdzUb/hQ==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { "esbuild": "^0.24.2", "postcss": "^8.5.1", @@ -5188,7 +5176,6 @@ "resolved": "https://mirrors.huaweicloud.com/repository/npm/vue/-/vue-3.5.13.tgz", "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==", "license": "MIT", - "peer": true, "dependencies": { "@vue/compiler-dom": "3.5.13", "@vue/compiler-sfc": "3.5.13", diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue index a8f29ad..afca100 100644 --- a/src/views/consume/gold/coinConsumeDetail.vue +++ b/src/views/consume/gold/coinConsumeDetail.vue @@ -103,6 +103,17 @@ const market = ref("") const sortField = ref('') const sortOrder = ref('') +// +const consumeStatus = [ + { + value: '1', + label: '正常' + }, + { + value: '2', + label: '已退款' + }, +] // 消费平台选项 const consumePlatform = [ { @@ -614,13 +625,18 @@ const getMarket = async function () {
+
+ 订单状态： + + + +
{{ $t('common.consumeTime') }}：
- 今 From 7cc71a517442bf6e6d267cb8ba4d09c4bec62919 Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Tue, 13 Jan 2026 18:06:43 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=82=AC=E6=B5=AE=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/SvgIcons/consume.svg | 1 + src/views/consume/gold/coinConsumeDetail.vue | 102 ++++++++++++++++++++++----- 2 files changed, 84 insertions(+), 19 deletions(-) create mode 100644 src/assets/SvgIcons/consume.svg diff --git a/src/assets/SvgIcons/consume.svg b/src/assets/SvgIcons/consume.svg new file mode 100644 index 0000000..dae9d39 --- /dev/null +++ b/src/assets/SvgIcons/consume.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue index afca100..6a5e223 100644 --- a/src/views/consume/gold/coinConsumeDetail.vue +++ b/src/views/consume/gold/coinConsumeDetail.vue @@ -103,17 +103,6 @@ const market = ref("") const sortField = ref('') const sortOrder = ref('') -// -const consumeStatus = [ - { - value: '1', - label: '正常' - }, - { - value: '2', - label: '已退款' - }, -] // 消费平台选项 const consumePlatform = [ { @@ -627,11 +616,12 @@ const getMarket = async function () {
订单状态： - - + + +
-
+
{{ $t('common.consumeTime') }}： -_list + + diff --git a/src/views/moneyManage/financialAccount/performanceAttribution.vue b/src/views/moneyManage/financialAccount/performanceAttribution.vue index 2273524..e8ba32a 100644 --- a/src/views/moneyManage/financialAccount/performanceAttribution.vue +++ b/src/views/moneyManage/financialAccount/performanceAttribution.vue @@ -1,5 +1,509 @@ + + \ No newline at end of file +
+ + +
+ +
+
+ 精网号： + +
+
+ 所属地区： + + +
+
+ 支付平台： + + + +
+
+ 状态： + + + +
+
+ + +
+
+ 订单号： + +
+
+ 付款时间： + +
+
+ {{ t('common.search') }} + {{ t('common.exportExcel') }} + {{ t('common.viewExportList') }} + {{ t('common.reset') }} +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + +
+ + + From de061e2a473fb240e2431be5250ebef2c6b6069c Mon Sep 17 00:00:00 2001 From: ZhangYong Date: Sun, 18 Jan 2026 09:32:48 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=B8=9A=E7=BB=A9=E5=BD=92=E5=B1=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/cash/financialAccount.js | 11 ++++++++++- .../moneyManage/financialAccount/performanceAttribution.vue | 8 ++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/src/api/cash/financialAccount.js b/src/api/cash/financialAccount.js index e01d5df..109259e 100644 --- a/src/api/cash/financialAccount.js +++ b/src/api/cash/financialAccount.js @@ -16,4 +16,13 @@ export const refundOnline = (data) => { url: '/Money/addOnline', data }) -} \ No newline at end of file +} + +// 查询业绩归属 +export const performanceSelect = (data) => { + return http({ + method: 'POST', + url: '/cashCollection/performanceSelect', + data + }) +} diff --git a/src/views/moneyManage/financialAccount/performanceAttribution.vue b/src/views/moneyManage/financialAccount/performanceAttribution.vue index e8ba32a..75c4ffb 100644 --- a/src/views/moneyManage/financialAccount/performanceAttribution.vue +++ b/src/views/moneyManage/financialAccount/performanceAttribution.vue @@ -4,7 +4,7 @@ import { ElMessage, ElMessageBox } from 'element-plus' import request from '@/util/http.js' import dayjs from 'dayjs' import { useI18n } from 'vue-i18n' -import { Moneyfunds,refundOnline } from '@/api/cash/financialAccount.js' +import { Moneyfunds,refundOnline,performanceSelect } from '@/api/cash/financialAccount.js' const { t } = useI18n() @@ -83,7 +83,7 @@ const fetchData = async () => { const params = { pageNum: queryParams.pageNum, pageSize: queryParams.pageSize, - fundsDTO:{ + performanceDTO:{ jwcode: queryParams.jwcode, markets: queryParams.markets, startTime: queryParams.timeRange?.[0] || '', @@ -95,7 +95,7 @@ const fetchData = async () => { } console.log('查询参数:', params) - const res = await Moneyfunds(params) + const res = await performanceSelect(params) if (res.code == 200) { tableData.value = res.data.list || [] total.value = res.data.total || 0 @@ -163,7 +163,7 @@ const handleExport = async () => { const params = { pageNum: queryParams.pageNum, pageSize: queryParams.pageSize, - fundsDTO:{ + performanceDTO:{ jwcode: queryParams.jwcode, markets: queryParams.markets, startTime: queryParams.timeRange?.[0] || '',