From cd816d096dad84a2bb514bdf931f7c084947fe59 Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 16 九月 2025 14:43:18 +0800
Subject: [PATCH] feat: 接口对接
---
src/views/ServiceChargeManage/ServiceChargeDetail.vue | 36 +++++++++++++++---
package.json | 2
src/views/ServiceChargeManage/ServiceChargeManage.vue | 2
pnpm-lock.yaml | 34 ++++++++--------
4 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/package.json b/package.json
index 47ccc4a..e8247b4 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
"dependencies": {
"@bole-12333/chat-kit": "latest",
"@bole-12333/customer-chat": "latest",
- "@bole-core/components": "^1.3.13",
+ "@bole-core/components": "^1.3.17",
"@bole-core/core": "^1.0.7",
"@bole-core/pretty-layout": "latest",
"@bole-core/sass-utils": "latest",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5c985d8..b73f1e7 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -23,8 +23,8 @@
specifier: latest
version: 1.0.3(@bole-12333/chat-kit@1.0.1(@tencentcloud/chat-uikit-engine@2.5.5)(lodash@4.17.21)(vue@3.5.11(typescript@4.9.5)))(@tiptap/core@2.26.1(@tiptap/pm@2.26.1))(@tiptap/extension-document@2.26.1(@tiptap/core@2.26.1(@tiptap/pm@2.26.1)))(@tiptap/extension-image@2.26.1(@tiptap/core@2.26.1(@tiptap/pm@2.26.1)))(@tiptap/extension-mention@2.26.1(@tiptap/core@2.26.1(@tiptap/pm@2.26.1))(@tiptap/pm@2.26.1)(@tiptap/suggestion@2.26.1(@tiptap/core@2.26.1(@tiptap/pm@2.26.1))(@tiptap/pm@2.26.1)))(@tiptap/extension-paragraph@2.26.1(@tiptap/core@2.26.1(@tiptap/pm@2.26.1)))(@tiptap/extension-placeholder@2.26.1(@tiptap/core@2.26.1(@tiptap/pm@2.26.1))(@tiptap/pm@2.26.1))(@tiptap/extension-text@2.26.1(@tiptap/core@2.26.1(@tiptap/pm@2.26.1)))(@tiptap/pm@2.26.1)(@tiptap/suggestion@2.26.1(@tiptap/core@2.26.1(@tiptap/pm@2.26.1))(@tiptap/pm@2.26.1))(dayjs@1.11.18)(vue@3.5.11(typescript@4.9.5))
'@bole-core/components':
- specifier: ^1.3.13
- version: 1.3.16(00c6fcd8b1cab53f2c87a245ddcd5cdd)
+ specifier: ^1.3.17
+ version: 1.3.17(00c6fcd8b1cab53f2c87a245ddcd5cdd)
'@bole-core/core':
specifier: ^1.0.7
version: 1.0.8(@ywwlmm/openapi@0.0.6)(ali-oss@6.23.0)(axios@1.7.7)(dayjs@1.11.18)(element-plus@2.11.2(@vue/composition-api@1.7.2(vue@3.5.11(typescript@4.9.5)))(vue@3.5.11(typescript@4.9.5)))(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.5(axios@1.7.7))(vue-router@4.5.1(vue@3.5.11(typescript@4.9.5)))(vue@3.5.11(typescript@4.9.5))(xlsx-style@0.8.13(patch_hash=9527f8203b1d3e36224bff6046d4739af324cbcd24b458ce8fb8cdefa8bf4dbb))(xlsx@0.18.5)
@@ -985,8 +985,8 @@
dayjs: '*'
vue: 3.5.11
- '@bole-core/components@1.3.16':
- resolution: {integrity: sha512-FGr0Z9xxyD9c21JLbvtCgXne+0mbiX29+CjCG9ameFGyoQzHDn0tbpCyjdrtsMnqerhvX9/HpivpTDm4dREoBg==}
+ '@bole-core/components@1.3.17':
+ resolution: {integrity: sha512-LNA8MDqa0hE6y4GG2YEn/F9Aj6kG2NfbE33/QJKrD+KhJULtt6v5bdsSTu10nUQFCqFwZtngYkMAcmDvU98bqw==}
peerDependencies:
'@bole-core/core': '*'
'@bole-core/sass-utils': '*'
@@ -9838,7 +9838,7 @@
dayjs: 1.11.18
vue: 3.5.11(typescript@4.9.5)
- '@bole-core/components@1.3.16(00c6fcd8b1cab53f2c87a245ddcd5cdd)':
+ '@bole-core/components@1.3.17(00c6fcd8b1cab53f2c87a245ddcd5cdd)':
dependencies:
'@bole-core/core': 1.0.8(@ywwlmm/openapi@0.0.6)(ali-oss@6.23.0)(axios@1.7.7)(dayjs@1.11.18)(element-plus@2.11.2(@vue/composition-api@1.7.2(vue@3.5.11(typescript@4.9.5)))(vue@3.5.11(typescript@4.9.5)))(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.5(axios@1.7.7))(vue-router@4.5.1(vue@3.5.11(typescript@4.9.5)))(vue@3.5.11(typescript@4.9.5))(xlsx-style@0.8.13(patch_hash=9527f8203b1d3e36224bff6046d4739af324cbcd24b458ce8fb8cdefa8bf4dbb))(xlsx@0.18.5)
'@bole-core/sass-utils': 0.0.1(element-plus@2.11.2(@vue/composition-api@1.7.2(vue@3.5.11(typescript@4.9.5)))(vue@3.5.11(typescript@4.9.5)))
@@ -11242,7 +11242,7 @@
'@types/vfile@3.0.2':
dependencies:
'@types/node': 18.7.18
- '@types/unist': 2.0.11
+ '@types/unist': 3.0.3
'@types/vfile-message': 2.0.0
'@types/video.js@7.3.58': {}
@@ -14496,7 +14496,7 @@
array-union: 1.0.2
dir-glob: 2.2.2
fast-glob: 2.2.7
- glob: 7.1.6
+ glob: 7.2.3
ignore: 4.0.6
pify: 4.0.1
slash: 2.0.0
@@ -16425,7 +16425,7 @@
read-cache: 1.0.0
resolve: 1.22.10
- postcss-jsx@0.36.4(postcss-syntax@0.36.2)(postcss@7.0.39):
+ postcss-jsx@0.36.4(postcss-syntax@0.36.2(postcss-html@0.36.0)(postcss-less@3.1.4)(postcss-scss@2.1.1)(postcss@7.0.39))(postcss@7.0.39):
dependencies:
'@babel/core': 7.28.4
postcss: 7.0.39
@@ -16451,7 +16451,7 @@
postcss: 8.5.6
postcss-value-parser: 4.2.0
- postcss-markdown@0.36.0(postcss-syntax@0.36.2)(postcss@7.0.39):
+ postcss-markdown@0.36.0(postcss-syntax@0.36.2(postcss-html@0.36.0)(postcss-less@3.1.4)(postcss-scss@2.1.1)(postcss@7.0.39))(postcss@7.0.39):
dependencies:
postcss: 7.0.39
postcss-syntax: 0.36.2(postcss-html@1.8.0)(postcss-scss@4.0.9(postcss@8.5.6))(postcss@8.5.6)
@@ -16648,9 +16648,9 @@
postcss: 7.0.39
optionalDependencies:
postcss-html: 0.36.0(postcss-syntax@0.36.2)(postcss@7.0.39)
- postcss-jsx: 0.36.4(postcss-syntax@0.36.2)(postcss@7.0.39)
+ postcss-jsx: 0.36.4(postcss-syntax@0.36.2(postcss-html@0.36.0)(postcss-less@3.1.4)(postcss-scss@2.1.1)(postcss@7.0.39))(postcss@7.0.39)
postcss-less: 3.1.4
- postcss-markdown: 0.36.0(postcss-syntax@0.36.2)(postcss@7.0.39)
+ postcss-markdown: 0.36.0(postcss-syntax@0.36.2(postcss-html@0.36.0)(postcss-less@3.1.4)(postcss-scss@2.1.1)(postcss@7.0.39))(postcss@7.0.39)
postcss-scss: 2.1.1
postcss-syntax@0.36.2(postcss-html@1.8.0)(postcss-scss@4.0.9(postcss@8.5.6))(postcss@8.5.6):
@@ -17255,7 +17255,7 @@
rimraf@2.6.3:
dependencies:
- glob: 7.1.6
+ glob: 7.2.3
rimraf@3.0.2:
dependencies:
@@ -17996,7 +17996,7 @@
postcss-sass: 0.4.4
postcss-scss: 2.1.1
postcss-selector-parser: 6.1.2
- postcss-syntax: 0.36.2(postcss-html@0.36.0(postcss-syntax@0.36.2)(postcss@7.0.39))(postcss-jsx@0.36.4)(postcss-less@3.1.4)(postcss-markdown@0.36.0)(postcss-scss@2.1.1)(postcss@7.0.39)
+ postcss-syntax: 0.36.2(postcss-html@1.8.0)(postcss-scss@4.0.9(postcss@8.5.6))(postcss@8.5.6)
postcss-value-parser: 4.2.0
resolve-from: 5.0.0
slash: 3.0.0
@@ -18085,9 +18085,9 @@
pify: 4.0.1
postcss: 7.0.39
postcss-html: 0.36.0(postcss-syntax@0.36.2)(postcss@7.0.39)
- postcss-jsx: 0.36.4(postcss-syntax@0.36.2)(postcss@7.0.39)
+ postcss-jsx: 0.36.4(postcss-syntax@0.36.2(postcss-html@0.36.0)(postcss-less@3.1.4)(postcss-scss@2.1.1)(postcss@7.0.39))(postcss@7.0.39)
postcss-less: 3.1.4
- postcss-markdown: 0.36.0(postcss-syntax@0.36.2)(postcss@7.0.39)
+ postcss-markdown: 0.36.0(postcss-syntax@0.36.2(postcss-html@0.36.0)(postcss-less@3.1.4)(postcss-scss@2.1.1)(postcss@7.0.39))(postcss@7.0.39)
postcss-media-query-parser: 0.2.3
postcss-reporter: 6.0.1
postcss-resolve-nested-selector: 0.1.6
@@ -18095,7 +18095,7 @@
postcss-sass: 0.3.5
postcss-scss: 2.1.1
postcss-selector-parser: 3.1.2
- postcss-syntax: 0.36.2(postcss-html@1.8.0)(postcss-scss@4.0.9(postcss@8.5.6))(postcss@8.5.6)
+ postcss-syntax: 0.36.2(postcss-html@0.36.0(postcss-syntax@0.36.2)(postcss@7.0.39))(postcss-jsx@0.36.4)(postcss-less@3.1.4)(postcss-markdown@0.36.0)(postcss-scss@2.1.1)(postcss@7.0.39)
postcss-value-parser: 3.3.1
resolve-from: 4.0.0
signal-exit: 3.0.7
@@ -18849,7 +18849,7 @@
videojs-vtt.js@0.12.4:
dependencies:
- global: 4.3.2
+ global: 4.4.0
videojs-vtt.js@0.15.5:
dependencies:
diff --git a/src/views/ServiceChargeManage/ServiceChargeDetail.vue b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
index bbaaa59..dd0843d 100644
--- a/src/views/ServiceChargeManage/ServiceChargeDetail.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeDetail.vue
@@ -328,8 +328,30 @@
if (res) {
Message.successMessage('鎿嶄綔鎴愬姛');
getList(paginationState.pageIndex);
+ if (res?.errors?.length > 0) {
+ Message.tipMessage('瀛樺湪瀵煎叆閿欒鐨勬暟鎹紝鏄惁瀵煎嚭锛�').then(() => {
+ XLSXUtils.exportToXLSX({
+ workbookDataList: res.errors,
+ fileName: '缁撶畻瀵煎叆-閿欒鏁版嵁',
+ workbookHeaderMap: {
+ name: '濮撳悕',
+ identity: '韬唤璇佸彿',
+ taskName: '浠诲姟鍚嶇О',
+ settlementAmount: '缁撶畻閲戦',
+ actualSettlementAmount: '瀹炲彂閲戦',
+ receiveAccount: '鏀舵璐︽埛',
+ bank: '鎵�灞為摱琛�',
+ bankBranch: '寮�鎴锋敮琛屽悕绉�',
+ errorMessage: '閿欒淇℃伅',
+ },
+ });
+ });
+ }
}
- } catch (error) {}
+ } catch (error) {
+ } finally {
+ form.settlementUrl = [] as UploadUserFile[];
+ }
}
function handleSubmit() {
@@ -377,10 +399,10 @@
const handleExport = _.debounce(
async () => {
- if (paginationState.total === 0) {
- Message.warnMessage('娌℃湁鏁版嵁鍙互瀵煎嚭鍝');
- return;
- }
+ // if (paginationState.total === 0) {
+ // Message.warnMessage('娌℃湁鏁版嵁鍙互瀵煎嚭鍝');
+ // return;
+ // }
try {
let params: API.ExportTaskSettlementOrderRostersCommand = {
id: id,
@@ -390,7 +412,9 @@
getResponse: true,
});
if (res) {
- downloadFile(res, `${form.name}-${form.code}`, 'xlsx');
+ console.log('res: ', res);
+ //@ts-ignore
+ downloadFile(res?.data, `${form.name}-${form.code}`, 'xlsx');
}
} catch (error) {}
},
diff --git a/src/views/ServiceChargeManage/ServiceChargeManage.vue b/src/views/ServiceChargeManage/ServiceChargeManage.vue
index 7a9edd5..affb651 100644
--- a/src/views/ServiceChargeManage/ServiceChargeManage.vue
+++ b/src/views/ServiceChargeManage/ServiceChargeManage.vue
@@ -38,7 +38,7 @@
v-model="extraParamState.keywords"
style="width: 250px"
placeholder="浠诲姟鍚嶇О"
- @on-click-search="getList"
+ @on-click-search="getList()"
@keyup.enter="getList()"
>
</SearchInput>
--
Gitblit v1.9.1