From 04b6295eec5740e1ac93de6f246dca937ad2f444 Mon Sep 17 00:00:00 2001 From: wupengfei <834520024@qq.com> Date: 星期一, 14 四月 2025 17:34:03 +0800 Subject: [PATCH] fix: bug --- src/views/MaterialReview/MaterialReviewDetail.vue | 75 +++++++++++++++++++++++++++++-------- 1 files changed, 58 insertions(+), 17 deletions(-) diff --git a/src/views/MaterialReview/MaterialReviewDetail.vue b/src/views/MaterialReview/MaterialReviewDetail.vue index cc0fb29..3869c8a 100644 --- a/src/views/MaterialReview/MaterialReviewDetail.vue +++ b/src/views/MaterialReview/MaterialReviewDetail.vue @@ -6,14 +6,15 @@ <div class="page-form-layout-title"> 鐢虫姤璇︽儏 <span class="page-form-layout-title-item status"> - {{ `瀹℃牳鐘舵��:${BountyCheckStatusEnumText[form.outCheckStatus]}` }} + 瀹℃牳鐘舵��:<span :style="{ color: BountyCheckStatusEnumColor[form.outCheckStatus] }">{{ + BountyCheckStatusEnumText[form.outCheckStatus] + }}</span> </span> - <span - v-if="form.outCheckStatus === BountyCheckStatusEnum.CheckReject" - class="page-form-layout-title-item remark" - > - {{ `瀹℃牳鏈�氳繃鍘熷洜:${form.outCheckRemark ?? ''}` }} - </span> + <TextOverTooltip v-if="form.outCheckStatus === BountyCheckStatusEnum.CheckReject"> + <span class="page-form-layout-title-item remark"> + {{ `瀹℃牳鏈�氳繃鍘熷洜:${form.outCheckRemark ?? ''}` }} + </span> + </TextOverTooltip> </div> </template> <DetailView :form="form"> @@ -23,11 +24,19 @@ :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> </DetailView> <template #footer> - <el-button @click="handleBack">鍏抽棴</el-button> + <el-button @click="handleBack" type="primary">纭</el-button> </template> </PageFormLayout> </AppContainer> @@ -41,16 +50,27 @@ UploadUserFile, PageFormLayout, useTable, + useFormDialog, + TextOverTooltip, } from '@bole-core/components'; import ChunkCellV2 from '@/components/Layout/ChunkCellV2.vue'; import DetailView from '@/components/commonView/DetailView.vue'; +import MateriaDetailDialog from '@/components/commonView/MateriaDetailDialog.vue'; import DeclareEnterpriseTableView from '@/components/commonView/DeclareEnterpriseTableView.vue'; import { useQuery } from '@tanstack/vue-query'; import * as parkBountyApplyServices from '@/services/api/ParkBountyApply'; import { convertApi2FormUrlOnlyOne, setOSSLink } from '@/utils'; import { useRouteView } from '@/hooks'; import { OrderInputType } from '@bole-core/core'; -import { AuthTypeText, BountyCheckStatusEnum, BountyCheckStatusEnumText } from '@/constants'; +import { + EnterpriseTypeText, + BountyCheckStatusEnum, + BountyCheckStatusEnumText, + BountyCheckStatusEnumColor, +} from '@/constants'; +import { FourStreamsMaterialFileTableItem } from '@/components/commonView/types'; +import { FourStreamsMaterialUtils } from '@/components/commonView/utils'; +import { useIndustrialParkDropDownList } from '@/hooks/industrialPark'; defineOptions({ name: 'MaterialReviewDetail', @@ -128,21 +148,42 @@ }, { defaultExtraParams: { - orderInput: [{ property: 'enterpriseId', order: OrderInputType.Desc }], + orderInput: [{ property: 'parkBountyApplyId', order: OrderInputType.Desc }], searchKeyWord: '', }, columnsRenderProps: { - authType: { type: 'enum', valueEnum: AuthTypeText }, - licenseUrl: { - type: 'url', - formatter: (row: API.UserCertificationAuditListDto) => setOSSLink(row.licenseUrl), - modal: true, - showDownloadBtn: false, - }, + authType: { type: 'enum', valueEnum: EnterpriseTypeText }, + // licenseUrl: { + // type: 'url', + // formatter: (row: API.UserCertificationAuditListDto) => setOSSLink(row.licenseUrl), + // modal: true, + // showDownloadBtn: true, + // showPreviewBtn: false, + // downloadBtnText: '鏌ョ湅', + // }, }, } ); +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, + }); +} + function handleBack() { closeViewPush(route, { name: 'MaterialReviewList', -- Gitblit v1.9.1