From e22c1e1191ef01c43932f26bbbccafca4505d39e Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 28 十一月 2025 13:45:45 +0800
Subject: [PATCH] Merge branch 'master' into dev-dataBoard
---
src/components/commonView/DetailView.vue | 2 +
src/components/commonView/BatchInfoView.vue | 6 +++
package.json | 4 +-
src/hooks/fourStreams.ts | 9 +++-
src/views/Reward/RewardDeclareDetail.vue | 6 +++
src/views/MaterialReview/MaterialReviewDetail.vue | 7 +++
pnpm-lock.yaml | 60 +++++++++++++++---------------
src/views/MaterialReview/components/MaterialReviewAuditView.vue | 6 +++
src/views/Reward/RewardGrantRegister.vue | 6 +++
9 files changed, 71 insertions(+), 35 deletions(-)
diff --git a/package.json b/package.json
index 09d360c..7680a7a 100644
--- a/package.json
+++ b/package.json
@@ -24,8 +24,8 @@
"dependencies": {
"@bole-12333/chat-kit": "latest",
"@bole-12333/customer-chat": "latest",
- "@bole-core/components": "^1.3.23",
- "@bole-core/core": "latest",
+ "@bole-core/components": "latest",
+ "@bole-core/core": "^1.0.11",
"@bole-core/pretty-layout": "latest",
"@bole-core/sass-utils": "latest",
"@bole-core/theme": "latest",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1aca4c1..cf96c5e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -20,14 +20,14 @@
specifier: latest
version: 1.0.3(@bole-12333/chat-kit@1.0.1)(@tiptap/core@2.11.7)(@tiptap/extension-document@2.11.7)(@tiptap/extension-image@2.11.7)(@tiptap/extension-mention@2.11.7)(@tiptap/extension-paragraph@2.11.7)(@tiptap/extension-placeholder@2.11.7)(@tiptap/extension-text@2.11.7)(@tiptap/pm@2.11.7)(@tiptap/suggestion@2.11.7)(dayjs@1.11.13)(vue@3.5.11)
'@bole-core/components':
- specifier: ^1.3.23
- version: 1.3.23(@bole-core/core@1.0.7)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@11.1.0)(dayjs@1.11.13)(element-plus@2.9.7)(lodash@4.17.21)(mitt@3.0.1)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.21.7)(vue-component-type-helpers@2.2.8)(vue@3.5.11)
- '@bole-core/core':
specifier: latest
- version: 1.0.7(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5)
+ version: 1.3.26(@bole-core/core@1.0.11)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@11.1.0)(dayjs@1.11.13)(element-plus@2.9.7)(lodash@4.17.21)(mitt@3.0.1)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.21.7)(vue-component-type-helpers@2.2.8)(vue@3.5.11)
+ '@bole-core/core':
+ specifier: ^1.0.11
+ version: 1.0.11(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5)
'@bole-core/pretty-layout':
specifier: latest
- version: 1.2.0(@bole-core/core@1.0.7)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@vueuse/core@11.1.0)(element-plus@2.9.7)(fuse.js@6.6.2)(lottie-web@5.12.2)(path-browserify@1.0.1)(path-to-regexp@6.3.0)(pinia@2.3.1)(vue-router@4.5.0)(vue@3.5.11)
+ version: 1.2.0(@bole-core/core@1.0.11)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@vueuse/core@11.1.0)(element-plus@2.9.7)(fuse.js@6.6.2)(lottie-web@5.12.2)(path-browserify@1.0.1)(path-to-regexp@6.3.0)(pinia@2.3.1)(vue-router@4.5.0)(vue@3.5.11)
'@bole-core/sass-utils':
specifier: latest
version: 0.0.1(element-plus@2.9.7)
@@ -1562,8 +1562,8 @@
vue: 3.5.11(typescript@4.9.5)
dev: false
- /@bole-core/components@1.3.23(@bole-core/core@1.0.7)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@11.1.0)(dayjs@1.11.13)(element-plus@2.9.7)(lodash@4.17.21)(mitt@3.0.1)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.21.7)(vue-component-type-helpers@2.2.8)(vue@3.5.11):
- resolution: {integrity: sha512-tjs8kKZd4x/h80KvtslnHuEU4NfVbqP4pZcJ9e+BcYmIh/UKulnz1VSmsM+vdz4DhdQ57oeZEP53xP6kWUaUfA==}
+ /@bole-core/components@1.3.26(@bole-core/core@1.0.11)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@tanstack/vue-query@4.37.1)(@videojs-player/vue@1.0.0)(@vueuse/core@11.1.0)(@vueuse/shared@11.1.0)(dayjs@1.11.13)(element-plus@2.9.7)(lodash@4.17.21)(mitt@3.0.1)(senin-help@1.0.5)(senin-vue@1.0.4)(video.js@7.21.7)(vue-component-type-helpers@2.2.8)(vue@3.5.11):
+ resolution: {integrity: sha512-R9W/0i7QujnJwsqegigM3fqVghiviEHhH9EYmKdeir5OUQWoUHpEOZ5X81QRWS/TrtZonnPWHGG17q+S9gmkKA==}
peerDependencies:
'@bole-core/core': '*'
'@bole-core/sass-utils': '*'
@@ -1582,7 +1582,7 @@
vue: 3.5.11
vue-component-type-helpers: ^2.1.6
dependencies:
- '@bole-core/core': 1.0.7(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5)
+ '@bole-core/core': 1.0.11(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5)
'@bole-core/sass-utils': 0.0.1(element-plus@2.9.7)
'@element-plus/icons-vue': 2.3.1(vue@3.5.11)
'@tanstack/vue-query': 4.37.1(vue@3.5.11)
@@ -1600,8 +1600,8 @@
vue-component-type-helpers: 2.2.8
dev: false
- /@bole-core/core@1.0.7(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5):
- resolution: {integrity: sha512-VICs9m+qAaMvORNcaKSP1Gkr4thhxvwooh2hd7fBmkIYqDitOYmcssBsPno7jjp+5fuZYQ3LwHQ9Vl/whbTpCw==}
+ /@bole-core/core@1.0.11(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5):
+ resolution: {integrity: sha512-LMcWwyxtULz0ty5I5buLsQK/ExiJsI/ldJLzCV44jQsJ1a7/BZMPSldIKVhNT+yjDaSzhQc7v8i5Ql+JzevvyA==}
peerDependencies:
'@ywwlmm/openapi': '*'
ali-oss: '*'
@@ -1632,7 +1632,7 @@
xlsx-style: 0.8.13(patch_hash=6ixwdxwh5a3amidwu6vee22jpi)
dev: false
- /@bole-core/pretty-layout@1.2.0(@bole-core/core@1.0.7)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@vueuse/core@11.1.0)(element-plus@2.9.7)(fuse.js@6.6.2)(lottie-web@5.12.2)(path-browserify@1.0.1)(path-to-regexp@6.3.0)(pinia@2.3.1)(vue-router@4.5.0)(vue@3.5.11):
+ /@bole-core/pretty-layout@1.2.0(@bole-core/core@1.0.11)(@bole-core/sass-utils@0.0.1)(@element-plus/icons-vue@2.3.1)(@vueuse/core@11.1.0)(element-plus@2.9.7)(fuse.js@6.6.2)(lottie-web@5.12.2)(path-browserify@1.0.1)(path-to-regexp@6.3.0)(pinia@2.3.1)(vue-router@4.5.0)(vue@3.5.11):
resolution: {integrity: sha512-LvneMdMfGj6dpFR7voQd2F+v02P4zYHGP3BAWKcrTj8BMeWXRt08Sz7qBrhq1F8lidjqi7TCttQbx2cEV1qBEA==}
peerDependencies:
'@bole-core/core': '*'
@@ -1648,7 +1648,7 @@
vue: 3.5.11
vue-router: '*'
dependencies:
- '@bole-core/core': 1.0.7(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5)
+ '@bole-core/core': 1.0.11(@ywwlmm/openapi@0.0.4)(ali-oss@6.22.0)(axios@1.7.7)(dayjs@1.11.13)(element-plus@2.9.7)(file-saver@2.0.5)(jszip@3.10.1)(lodash@4.17.21)(senior-request@1.0.4)(vue-router@4.5.0)(vue@3.5.11)(xlsx-style@0.8.13)(xlsx@0.18.5)
'@bole-core/sass-utils': 0.0.1(element-plus@2.9.7)
'@element-plus/icons-vue': 2.3.1(vue@3.5.11)
'@vueuse/core': 11.1.0(vue@3.5.11)
@@ -3680,7 +3680,7 @@
/@tencentcloud/call-engine-js@3.3.1:
resolution: {integrity: sha512-p24XmLmfV9B2BbRRD5S2eJFa0lN6kqNIgVGM4QxNew6DBiXpu4x18IdAWHIW8ff0nmMkRYvdlSPbCXA8RKHAgQ==}
dependencies:
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
core-js: 3.41.0
eventemitter3: 4.0.7
rtc-detect: 0.0.5
@@ -3691,7 +3691,7 @@
/@tencentcloud/call-uikit-vue2.6@3.3.9(vue@3.5.11):
resolution: {integrity: sha512-EWXc+wqGXlWSmkR/ucKdwPpe+tOXwtYDL2wUD3C/XW4pmKldtxRIIWIzDzo9upPTeojZMfIIoOC/che7wwE9KQ==}
dependencies:
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
'@tencentcloud/tui-core': 2.5.1
'@vue/composition-api': 1.7.2(vue@3.5.11)
tuicall-engine-webrtc: 3.1.7
@@ -3703,7 +3703,7 @@
resolution: {integrity: sha512-2f7raW37qG762pS8PQ+bobAjDy0dh6dIMCuyXcVIGJMAEpw9JkYdYYN/1J+I/hHqXboELhYTYBvxU4XvD0H7kw==}
dependencies:
'@tencentcloud/call-engine-js': 3.3.1
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
'@tencentcloud/tui-core': 2.5.1
'@vue/composition-api': 1.7.2(vue@3.5.11)
transitivePeerDependencies:
@@ -3713,7 +3713,7 @@
/@tencentcloud/call-uikit-vue2@3.3.9:
resolution: {integrity: sha512-xAa1eQGoYj6PKoaSLxNXHPXTO5A/ld8A5Oy9Ps3qjEQWaOIkei8cqJfRX5tUJiQSeNJAxME/GrqLueIARshnTg==}
dependencies:
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
'@tencentcloud/tui-core': 2.5.1
tuicall-engine-webrtc: 3.1.7
dev: false
@@ -3722,14 +3722,14 @@
resolution: {integrity: sha512-AlYdkzKDk5QMEAhZUR4MBnkD91Xou82KO/EZfO0fr5c2jrUKI9N0D8VpvMWWtPCGWO2hNrbeLAhdUxwcax++1g==}
dependencies:
'@tencentcloud/call-engine-js': 3.3.1
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
'@tencentcloud/tui-core': 2.5.1
dev: false
/@tencentcloud/call-uikit-vue@3.3.9:
resolution: {integrity: sha512-fFwQSAU+PVqantxbabRZa268BBBcv+hIX265Ag3ogYcrKq/hEo8XyH7nkjZL8wkQ2hFvnkwUgMMLXVeAgyMsng==}
dependencies:
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
'@tencentcloud/tui-core': 2.5.1
tuicall-engine-webrtc: 3.1.7
dev: false
@@ -3738,7 +3738,7 @@
resolution: {integrity: sha512-SeUPs5Ow/Y+spAlhzu7HeQY9Zjg4BWMl64JbLGrFv6M389hLOhL5ZFmHb9eqkUIggIQoY5Rrkn2A23CxMWUT/w==}
dependencies:
'@tencentcloud/call-engine-js': 3.3.1
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
'@tencentcloud/tui-core': 2.5.1
dev: false
@@ -3751,7 +3751,7 @@
/@tencentcloud/chat-uikit-engine@2.3.3:
resolution: {integrity: sha512-DHORxHgcyLstIYqMt09RzPjxAZ5N5p4fK7BYBDMEWsIQSXpcQJQKeGEu4eOZIaHtc9ih28EcPAdoZuvJoQiWlA==}
dependencies:
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
tim-profanity-filter-plugin: 1.1.0
tim-upload-plugin: 1.4.3
dev: false
@@ -3759,7 +3759,7 @@
/@tencentcloud/chat-uikit-engine@2.5.7:
resolution: {integrity: sha512-2C2x84k7D2cCvSQQlxo4Erw1EYrYf0BTz7IJuqkA99ac91ZwO8vNZEtQbd7wF1h7adNMXoxESCjaR24iDBTDhg==}
dependencies:
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
tim-profanity-filter-plugin: 1.1.0
tim-upload-plugin: 1.4.3
dev: false
@@ -3849,8 +3849,8 @@
- vue
dev: false
- /@tencentcloud/chat@3.6.0:
- resolution: {integrity: sha512-DzkIWpcLdQUHasTiTWymmMfE2k7rAQ5SCBJOtbfvTFAFsr59hGiEdBXHpej5V+kAwN/T8Cr5csCrVDOGvdG5wA==}
+ /@tencentcloud/chat@3.6.1:
+ resolution: {integrity: sha512-YKftPfO2Mzo/RhSmUq2806FrB2ZB9AiuVmhHupxXtG6g8RMHTJICQulp6z+3bBzU7qko9BancR8rtvfdpDTpmQ==}
dev: false
/@tencentcloud/lite-chat@1.5.2:
@@ -3863,7 +3863,7 @@
pinia: ^2.1.7
vue: 3.5.11
dependencies:
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
'@tencentcloud/chat-uikit-engine': 2.3.3
'@tencentcloud/chat-uikit-vue': 2.3.3(@tiptap/core@2.11.7)(@tiptap/extension-document@2.11.7)(@tiptap/extension-image@2.11.7)(@tiptap/extension-mention@2.11.7)(@tiptap/extension-paragraph@2.11.7)(@tiptap/extension-placeholder@2.11.7)(@tiptap/extension-text@2.11.7)(@tiptap/pm@2.11.7)(@tiptap/suggestion@2.11.7)(pinia@2.3.1)(typescript@4.9.5)(vue@3.5.11)
'@tencentcloud/tui-core': 2.5.1
@@ -3895,7 +3895,7 @@
pinia: ^2.1.7
vue: 3.5.11
dependencies:
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
'@tencentcloud/chat-uikit-engine': 2.3.3
'@tencentcloud/chat-uikit-vue': 2.3.3(@tiptap/core@2.11.7)(@tiptap/extension-document@2.11.7)(@tiptap/extension-image@2.11.7)(@tiptap/extension-mention@2.11.7)(@tiptap/extension-paragraph@2.11.7)(@tiptap/extension-placeholder@2.11.7)(@tiptap/extension-text@2.11.7)(@tiptap/pm@2.11.7)(@tiptap/suggestion@2.11.7)(pinia@2.3.1)(typescript@4.9.5)(vue@3.5.11)
'@tencentcloud/tui-core': 2.5.1
@@ -3931,7 +3931,7 @@
/@tencentcloud/tui-core@2.4.0:
resolution: {integrity: sha512-OFXHoi8CQlPtWvNRLApg0wonWbW79uoTgAqqffqWO1icx3xDYd2RZDHMzpBexOsE3CHpWokrfXrqiXkpOmYWew==}
dependencies:
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
tim-profanity-filter-plugin: 1.1.0
tim-upload-plugin: 1.4.3
dev: false
@@ -3939,7 +3939,7 @@
/@tencentcloud/tui-core@2.5.1:
resolution: {integrity: sha512-aXZG0INkV9WvFUHgmVQRibCs10r2u/oVb8qAEjW3maytBiLWOJQiK7dzshK9fnfadJAWQ027cpR8lCKz5r5Tlw==}
dependencies:
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
tim-profanity-filter-plugin: 1.1.0
tim-upload-plugin: 1.4.3
dev: false
@@ -3975,7 +3975,7 @@
/@tencentcloud/tuiroom-engine-js@2.9.1:
resolution: {integrity: sha512-8qJihr7BVjQ6pkuU1YUC9CHQ+8squg7pUcIjeu3NzMgfygiAXboeAfxUkmqiAvR7Cde2QUsG7OyUdXm/Gnl/NA==}
dependencies:
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
rtc-detect: 0.0.5
tcplayer.js: 4.9.1
trtc-cloud-js-sdk: 2.9.0
@@ -3984,7 +3984,7 @@
/@tencentcloud/tuiroom-engine-js@3.2.1:
resolution: {integrity: sha512-F3h6SkZkqZe9zW/EhxFnIPQQWoB+ljuljJCcvvjmKVct9RyNUBZFzeaQfGCyM/EYl53z3p6rbiyNbitdcfAiUQ==}
dependencies:
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
rtc-detect: 0.0.5
tcplayer.js: 5.3.4
trtc-cloud-js-sdk: 2.9.3
@@ -15504,7 +15504,7 @@
/tuicall-engine-webrtc@3.1.7:
resolution: {integrity: sha512-MRye9/x/8Gy5aRAfEACLtGhK5RcBLAev7cgCGi7OLNt0Uj28mEJkt1tHs4p7xTQiQj6vcB+7OVTdsxuSq7EmOA==}
dependencies:
- '@tencentcloud/chat': 3.6.0
+ '@tencentcloud/chat': 3.6.1
rtc-ai-denoiser: 1.1.7
trtc-cloud-js-sdk: 2.9.0
dev: false
diff --git a/src/components/commonView/BatchInfoView.vue b/src/components/commonView/BatchInfoView.vue
index 3433574..23be701 100644
--- a/src/components/commonView/BatchInfoView.vue
+++ b/src/components/commonView/BatchInfoView.vue
@@ -20,6 +20,11 @@
<ProFormText v-model.trim="form.parkTypeName" />
</ProFormItemV2>
</ProFormColItem>
+ <ProFormColItem :span="12">
+ <ProFormItemV2 label="鏉愭枡妯℃澘:" :mode="mode">
+ <ProFormText v-model.trim="form.bountyTemplateName" />
+ </ProFormItemV2>
+ </ProFormColItem>
</ProFormCol>
</template>
@@ -48,6 +53,7 @@
parkTypeName: string;
applyMonth: string;
applySumAmount: number;
+ bountyTemplateName: string;
};
};
diff --git a/src/components/commonView/DetailView.vue b/src/components/commonView/DetailView.vue
index 5e6c408..2698e40 100644
--- a/src/components/commonView/DetailView.vue
+++ b/src/components/commonView/DetailView.vue
@@ -55,6 +55,8 @@
extraListFiles: CustomerApplyFileTypeListItem[];
/** 鏄惁鏀寔骞冲彴鍏呭�� */
suportPlatRecharge?: boolean;
+
+ bountyTemplateName: string;
};
};
diff --git a/src/hooks/fourStreams.ts b/src/hooks/fourStreams.ts
index 0ea2acc..7464dda 100644
--- a/src/hooks/fourStreams.ts
+++ b/src/hooks/fourStreams.ts
@@ -91,10 +91,11 @@
id?: Ref<string>;
applyMonth?: Ref<string>;
enableUploadExtraFiles?: boolean;
+ bountyTemplateId?: Ref<string>;
};
export function useDeclareEnterpriseTable(options: UseDeclareEnterpriseTableOptions = {}) {
- const { id, applyMonth, enableUploadExtraFiles = false } = options;
+ const { id, applyMonth, enableUploadExtraFiles = false, bountyTemplateId } = options;
const {
getDataSource: getList,
@@ -158,14 +159,16 @@
try {
const applyFilesRes = await queryClient.ensureQueryData({
queryKey: [
- 'enterpriseApplyFileServices/getCustomerUploadApplyFiles',
+ 'enterpriseApplyFileServices/getCustomerUploadApplyFilesV2',
row.enterpriseId,
applyMonth.value,
+ bountyTemplateId.value,
],
queryFn: async () => {
- return await enterpriseApplyFileServices.getCustomerUploadApplyFiles({
+ return await enterpriseApplyFileServices.getCustomerUploadApplyFilesV2({
enterpriseId: row.enterpriseId,
withMonth: applyMonth.value,
+ bountyTemplateId: bountyTemplateId.value,
});
},
});
diff --git a/src/views/MaterialReview/MaterialReviewDetail.vue b/src/views/MaterialReview/MaterialReviewDetail.vue
index f893421..a1a27c7 100644
--- a/src/views/MaterialReview/MaterialReviewDetail.vue
+++ b/src/views/MaterialReview/MaterialReviewDetail.vue
@@ -122,6 +122,9 @@
suportPlatRecharge: false,
suportFinance: false,
+
+ bountyTemplateId: '',
+ bountyTemplateName: '',
});
const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
@@ -133,6 +136,7 @@
useDeclareEnterpriseTable({
id: ref(id),
applyMonth: toRef(form, 'applyMonth'),
+ bountyTemplateId: toRef(form, 'bountyTemplateId'),
});
const tableRef = ref<InstanceType<typeof DeclareEnterpriseTableView>>();
@@ -174,6 +178,9 @@
form.suportFinance = data.suportFinance;
form.reasonForWithdrawal = data.reasonForWithdrawal ?? '';
+ form.bountyTemplateId = data.bountyTemplateId ?? '';
+ form.bountyTemplateName = data.bountyTemplateName ?? '';
+
getList();
},
});
diff --git a/src/views/MaterialReview/components/MaterialReviewAuditView.vue b/src/views/MaterialReview/components/MaterialReviewAuditView.vue
index b60976d..b4e5678 100644
--- a/src/views/MaterialReview/components/MaterialReviewAuditView.vue
+++ b/src/views/MaterialReview/components/MaterialReviewAuditView.vue
@@ -126,6 +126,8 @@
suportPlatRecharge: false,
suportFinance: false,
+ bountyTemplateId: '',
+ bountyTemplateName: '',
});
const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
@@ -138,6 +140,7 @@
id: ref(id),
applyMonth: toRef(form, 'applyMonth'),
enableUploadExtraFiles: true,
+ bountyTemplateId: toRef(form, 'bountyTemplateId'),
});
const { data: detail, isLoading } = useQuery({
@@ -172,6 +175,9 @@
form.suportPlatRecharge = data.suportPlatRecharge;
form.suportFinance = data.suportFinance;
+ form.bountyTemplateId = data.bountyTemplateId;
+ form.bountyTemplateName = data.bountyTemplateName;
+
getList();
},
});
diff --git a/src/views/Reward/RewardDeclareDetail.vue b/src/views/Reward/RewardDeclareDetail.vue
index 28e9717..00011e7 100644
--- a/src/views/Reward/RewardDeclareDetail.vue
+++ b/src/views/Reward/RewardDeclareDetail.vue
@@ -63,6 +63,8 @@
extraListFiles: [] as CustomerApplyFileTypeListItem[],
suportPlatRecharge: false,
suportFinance: false,
+ bountyTemplateId: '',
+ bountyTemplateName: '',
});
const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
@@ -74,6 +76,7 @@
useDeclareEnterpriseTable({
id: ref(id),
applyMonth: toRef(form, 'applyMonth'),
+ bountyTemplateId: toRef(form, 'bountyTemplateId'),
});
const { data: detail, isLoading } = useQuery({
@@ -107,6 +110,9 @@
form.suportPlatRecharge = data.suportPlatRecharge;
form.suportFinance = data.suportFinance;
+ form.bountyTemplateId = data.bountyTemplateId;
+ form.bountyTemplateName = data.bountyTemplateName;
+
getList();
},
});
diff --git a/src/views/Reward/RewardGrantRegister.vue b/src/views/Reward/RewardGrantRegister.vue
index bd2dfa9..bb90dd6 100644
--- a/src/views/Reward/RewardGrantRegister.vue
+++ b/src/views/Reward/RewardGrantRegister.vue
@@ -101,6 +101,8 @@
suportPlatRecharge: false,
suportFinance: false,
+ bountyTemplateId: '',
+ bountyTemplateName: '',
});
const { rewardGrantRegisterColumns } = useRewardGrantRegisterColumns();
@@ -109,6 +111,7 @@
useDeclareEnterpriseTable({
id: ref(id),
applyMonth: toRef(form, 'applyMonth'),
+ bountyTemplateId: toRef(form, 'bountyTemplateId'),
});
const registerOperationBtns = defineOperationBtns([
@@ -170,6 +173,9 @@
form.suportPlatRecharge = data.suportPlatRecharge;
form.suportFinance = data.suportFinance;
+ form.bountyTemplateId = data.bountyTemplateId;
+ form.bountyTemplateName = data.bountyTemplateName;
+
getList();
},
});
--
Gitblit v1.9.1