From a7c71cf6ad69da0fc2ada301f32decc8e3cb8bde Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 15 四月 2025 11:15:40 +0800
Subject: [PATCH] fix: bug
---
src/views/MaterialReview/MaterialReviewDetail.vue | 121 ++++++++++++++++++++++++++++++++++++---
1 files changed, 110 insertions(+), 11 deletions(-)
diff --git a/src/views/MaterialReview/MaterialReviewDetail.vue b/src/views/MaterialReview/MaterialReviewDetail.vue
index ba85cbb..828a147 100644
--- a/src/views/MaterialReview/MaterialReviewDetail.vue
+++ b/src/views/MaterialReview/MaterialReviewDetail.vue
@@ -6,20 +6,37 @@
<div class="page-form-layout-title">
鐢虫姤璇︽儏
<span class="page-form-layout-title-item status">
- {{ `瀹℃牳鐘舵��:${form.categoryName}` }}
+ 瀹℃牳鐘舵��:<span :style="{ color: BountyCheckStatusEnumColor[form.outCheckStatus] }">{{
+ BountyCheckStatusEnumText[form.outCheckStatus]
+ }}</span>
</span>
<span class="page-form-layout-title-item remark">
- {{ `瀹℃牳鏈�氳繃鍘熷洜:${form.categoryName}` }}
+ <TextOverTooltip v-if="form.outCheckStatus === BountyCheckStatusEnum.CheckReject">
+ {{ `瀹℃牳鏈�氳繃鍘熷洜:${form.outCheckRemark ?? ''}` }}
+ </TextOverTooltip>
</span>
</div>
</template>
<DetailView :form="form">
<ChunkCellV2 title="鐢虫姤浼佷笟鍚嶅崟">
- <DeclareEnterpriseTableView ref="tableRef"></DeclareEnterpriseTableView>
+ <DeclareEnterpriseTableView
+ :getList="getList"
+ :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>
@@ -27,14 +44,33 @@
</template>
<script setup lang="ts">
-import { AppContainer, LoadingLayout, UploadUserFile, PageFormLayout } from '@bole-core/components';
+import {
+ AppContainer,
+ LoadingLayout,
+ 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 } from '@/utils';
+import { convertApi2FormUrlOnlyOne, setOSSLink } from '@/utils';
import { useRouteView } from '@/hooks';
+import { OrderInputType } from '@bole-core/core';
+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',
@@ -54,37 +90,100 @@
bountyAssignFileUlr: [] as UploadUserFile[],
bountyCollectFileUrl: [] as UploadUserFile[],
- categoryName: '',
+ outCheckStatus: '' as any as BountyCheckStatusEnum,
+ outCheckRemark: '',
});
const tableRef = ref<InstanceType<typeof DeclareEnterpriseTableView>>();
const { data: detail, isLoading } = useQuery({
- queryKey: ['parkBountyApplyServices/getParkBountyApplyDetail', id],
+ queryKey: ['parkBountyApplyServices/getOutCheckParkBountyApplyDetailBaseInfo', id],
queryFn: async () => {
- return await parkBountyApplyServices.getParkBountyApplyDetailBaseInfo(
+ return await parkBountyApplyServices.getOutCheckParkBountyApplyDetailBaseInfo(
{ parkBountyApplyId: id },
{
showLoading: false,
}
);
},
- placeholderData: () => ({} as API.ParkBountyApplyBaseInfo),
+ placeholderData: () => ({} as API.OutCheckParkBountyApplyBaseInfo),
onSuccess(data) {
form.batchNo = data.batchNo;
form.parkName = data.parkName;
form.parkTypeName = data.parkTypeName;
form.applyMonth = data.applyMonth;
form.applySumAmount = data.applySumAmount;
+ form.outCheckStatus = data.outCheckStatus;
+ form.outCheckRemark = data.outCheckRemark;
form.enterpriseTaxSubFileUrl = convertApi2FormUrlOnlyOne(data?.enterpriseTaxSubFileUrl);
form.enterpriseOperateFileUrl = convertApi2FormUrlOnlyOne(data?.enterpriseOperateFileUrl);
form.bountyAssignFileUlr = convertApi2FormUrlOnlyOne(data?.bountyAssignFileUlr);
form.bountyCollectFileUrl = convertApi2FormUrlOnlyOne(data?.bountyCollectFileUrl);
- tableRef.value?.getList();
+ getList();
},
});
+const {
+ getDataSource: getList,
+ proTableProps,
+ paginationState,
+ extraParamState,
+ reset,
+} = useTable(
+ async ({ pageIndex, pageSize }, extraParamState) => {
+ try {
+ let params: API.GetParkBountyApplyInfoInput = {
+ pageModel: {
+ rows: pageSize,
+ page: pageIndex,
+ orderInput: extraParamState.orderInput,
+ },
+ searchKeyWord: extraParamState.searchKeyWord,
+ parkBountyApplyId: id,
+ };
+ let res = await parkBountyApplyServices.getOutCheckParkBountyApplyDetailList(params);
+ return res;
+ } catch (error) {}
+ },
+ {
+ defaultExtraParams: {
+ orderInput: [{ property: 'parkBountyApplyId', order: OrderInputType.Desc }],
+ searchKeyWord: '',
+ },
+ columnsRenderProps: {
+ 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