From 21500e653aa625c4bfdcf1e637dde2f38ebf840f Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期二, 15 四月 2025 13:36:20 +0800 Subject: [PATCH] fix: bug --- package.json | 2 +- pnpm-lock.yaml | 2 +- src/views/MaterialReview/MaterialReviewAudit.vue | 30 ++++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 0613b16..6a6f138 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.8", + "@bole-core/components": "latest", "@bole-core/core": "latest", "@bole-core/pretty-layout": "latest", "@bole-core/sass-utils": "latest", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e6973ab..df3211d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,7 +20,7 @@ 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.8 + specifier: latest version: 1.3.9(@bole-core/core@1.0.3)(@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@13.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 diff --git a/src/views/MaterialReview/MaterialReviewAudit.vue b/src/views/MaterialReview/MaterialReviewAudit.vue index a48ba49..6b1ef82 100644 --- a/src/views/MaterialReview/MaterialReviewAudit.vue +++ b/src/views/MaterialReview/MaterialReviewAudit.vue @@ -9,7 +9,15 @@ :extra-param-state="extraParamState" :pro-table-props="proTableProps" :reset="reset" + :open-dialog="openDialog" ></DeclareEnterpriseTableView> + <MateriaDetailDialog + v-bind="dialogProps" + :show-upload-btn="false" + :show-delete-btn="false" + :show-check-btn="false" + downloadBtnText="鏌ョ湅" + /> </ChunkCellV2> <ChunkCell> <ProForm :model="form" ref="formRef" label-width="120px"> @@ -69,6 +77,7 @@ UploadUserFile, PageFormLayout, useTable, + useFormDialog, } from '@bole-core/components'; import { EnterpriseTypeText, @@ -78,12 +87,16 @@ import ChunkCellV2 from '@/components/Layout/ChunkCellV2.vue'; import DetailView from '@/components/commonView/DetailView.vue'; import DeclareEnterpriseTableView from '@/components/commonView/DeclareEnterpriseTableView.vue'; +import MateriaDetailDialog from '@/components/commonView/MateriaDetailDialog.vue'; import { useQuery, useQueryClient } from '@tanstack/vue-query'; import * as parkBountyApplyServices from '@/services/api/ParkBountyApply'; import { convertApi2FormUrlOnlyOne, setOSSLink } from '@/utils'; import { useGlobalEventContext, useRouteView } from '@/hooks'; import { FormInstance } from 'element-plus'; import { Message, OrderInputType } from '@bole-core/core'; +import { FourStreamsMaterialFileTableItem } from '@/components/commonView/types'; +import { useIndustrialParkDropDownList } from '@/hooks/industrialPark'; +import { FourStreamsMaterialUtils } from '@/components/commonView/utils'; defineOptions({ name: 'MaterialReviewAudit', @@ -208,6 +221,23 @@ } } catch (error) {} } + +const { dialogProps, handleAdd, editForm } = useFormDialog({ + defaultFormParams: { + list: [] as FourStreamsMaterialFileTableItem[], + companyId: '', + }, +}); +const { getIndustrialParkTypeNameById } = useIndustrialParkDropDownList(); +function openDialog(row: API.ParkBountyApplyDetailInfo) { + handleAdd({ + list: FourStreamsMaterialUtils.initFourStreamsMaterialFileList( + row, + getIndustrialParkTypeNameById(detail.value?.parkId) + ), + companyId: row.enterpriseId, + }); +} </script> <style lang="scss" scoped> -- Gitblit v1.9.1