From 782da0949237a872d285368f2e93f0bcd5aa64ef Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期四, 24 四月 2025 16:36:14 +0800
Subject: [PATCH] fix: bug
---
src/views/MaterialReview/MaterialReviewDetail.vue | 67 +++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 16 deletions(-)
diff --git a/src/views/MaterialReview/MaterialReviewDetail.vue b/src/views/MaterialReview/MaterialReviewDetail.vue
index cc0fb29..764a70b 100644
--- a/src/views/MaterialReview/MaterialReviewDetail.vue
+++ b/src/views/MaterialReview/MaterialReviewDetail.vue
@@ -6,13 +6,14 @@
<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 class="page-form-layout-title-item remark">
+ <TextOverTooltip v-if="form.outCheckStatus === BountyCheckStatusEnum.CheckReject">
+ {{ `瀹℃牳鏈�氳繃鍘熷洜:${form.outCheckRemark ?? ''}` }}
+ </TextOverTooltip>
</span>
</div>
</template>
@@ -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',
@@ -69,6 +89,7 @@
enterpriseOperateFileUrl: [] as UploadUserFile[],
bountyAssignFileUlr: [] as UploadUserFile[],
bountyCollectFileUrl: [] as UploadUserFile[],
+ enterpriseRelateFileUrl: [] as UploadUserFile[],
outCheckStatus: '' as any as BountyCheckStatusEnum,
outCheckRemark: '',
@@ -99,6 +120,7 @@
form.enterpriseOperateFileUrl = convertApi2FormUrlOnlyOne(data?.enterpriseOperateFileUrl);
form.bountyAssignFileUlr = convertApi2FormUrlOnlyOne(data?.bountyAssignFileUlr);
form.bountyCollectFileUrl = convertApi2FormUrlOnlyOne(data?.bountyCollectFileUrl);
+ form.enterpriseRelateFileUrl = convertApi2FormUrlOnlyOne(data?.enterpriseRelateFileUrl);
getList();
},
@@ -128,21 +150,34 @@
},
{
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 },
},
}
);
+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.10.0