From 53b0a0b7b5594e1e4ff6036703fa00af84c5ea9f Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期一, 16 六月 2025 19:24:03 +0800
Subject: [PATCH] fix: bug
---
src/constants/fourStreams.ts | 65 +++++++++++++++++++++
src/components/commonView/DeclareEnterpriseTableView.vue | 44 +-------------
src/services/api/typings.d.ts | 5 +
src/views/Reward/RewardDeclareDetail.vue | 14 +++-
src/views/MaterialReview/MaterialReviewDetail.vue | 11 +++
5 files changed, 97 insertions(+), 42 deletions(-)
diff --git a/src/components/commonView/DeclareEnterpriseTableView.vue b/src/components/commonView/DeclareEnterpriseTableView.vue
index 7a404b3..8fdd4d1 100644
--- a/src/components/commonView/DeclareEnterpriseTableView.vue
+++ b/src/components/commonView/DeclareEnterpriseTableView.vue
@@ -38,6 +38,7 @@
PreviewBtnV2,
} from '@bole-core/components';
import { setOSSLink } from '@/utils';
+import { BaseDeclareEnterpriseTableViewColumns } from '@/constants';
defineOptions({
name: 'DeclareEnterpriseTableView',
@@ -51,47 +52,12 @@
searchKeyWord: string;
};
openDialog?: (row) => void;
+ column?: API.ModuleColumnDto[];
};
-const props = withDefaults(defineProps<Props>(), {});
-
-const column = defineColumns([
- {
- id: '1',
- enCode: 'userName',
- name: '甯愬彿',
- },
- {
- id: '2',
- enCode: 'enterpriseName',
- name: '浼佷笟鍚嶇О',
- },
- {
- id: '3',
- enCode: 'societyCreditCode',
- name: '淇＄敤浠ｇ爜',
- },
- {
- id: '4',
- enCode: 'contactPhone',
- name: '鐢佃瘽',
- },
- {
- id: '5',
- enCode: 'authType',
- name: '浼佷笟绫诲瀷',
- },
- {
- id: '6',
- enCode: 'licenseUrl',
- name: '钀ヤ笟鎵х収',
- },
- {
- id: '7',
- enCode: 'bankAccountInfo',
- name: '鍩烘湰鎴蜂俊鎭�',
- },
-]);
+const props = withDefaults(defineProps<Props>(), {
+ column: () => BaseDeclareEnterpriseTableViewColumns,
+});
const operationBtns = defineOperationBtns([
{
diff --git a/src/constants/fourStreams.ts b/src/constants/fourStreams.ts
index e59f920..69f654b 100644
--- a/src/constants/fourStreams.ts
+++ b/src/constants/fourStreams.ts
@@ -1,3 +1,5 @@
+import { defineColumns } from '@bole-core/components';
+
export enum FourStreamsMaterialFileBusinessTypeEnum {
/** 鍥尯鍏ラ┗鍗忚 */
ParkEnterPactUrl = 10,
@@ -71,3 +73,66 @@
[TransferFileEnumInRewardGrand.FinanceFileUrl]: 'financeFileUrl',
[TransferFileEnumInRewardGrand.SettleFileUrl]: 'settleFileUrl',
} as const;
+
+export const BaseDeclareEnterpriseTableViewColumns = defineColumns([
+ {
+ id: '1',
+ enCode: 'userName',
+ name: '甯愬彿',
+ },
+ {
+ id: '2',
+ enCode: 'enterpriseName',
+ name: '浼佷笟鍚嶇О',
+ },
+ {
+ id: '3',
+ enCode: 'societyCreditCode',
+ name: '淇＄敤浠ｇ爜',
+ },
+ {
+ id: '4',
+ enCode: 'contactPhone',
+ name: '鐢佃瘽',
+ },
+ {
+ id: '5',
+ enCode: 'authType',
+ name: '浼佷笟绫诲瀷',
+ },
+ {
+ id: '6',
+ enCode: 'licenseUrl',
+ name: '钀ヤ笟鎵х収',
+ },
+ {
+ id: '7',
+ enCode: 'bankAccountInfo',
+ name: '鍩烘湰鎴蜂俊鎭�',
+ },
+]);
+
+type UseAddRewardApplyStep3ColumnsOptions = {
+ suportEnterpriseUpload: Ref<boolean>;
+ baseColumns?: API.ModuleColumnDto[];
+};
+
+export function useAddRewardApplyStep3Columns({
+ suportEnterpriseUpload,
+ baseColumns = BaseDeclareEnterpriseTableViewColumns,
+}: UseAddRewardApplyStep3ColumnsOptions) {
+ const addRewardApplyStep3Columns = computed(() =>
+ defineColumns(
+ [
+ ...baseColumns,
+ suportEnterpriseUpload.value && {
+ id: '9',
+ enCode: 'applyAmount',
+ name: '鐢虫姤閲戦',
+ },
+ ].filter(Boolean)
+ )
+ );
+
+ return { addRewardApplyStep3Columns };
+}
diff --git a/src/services/api/typings.d.ts b/src/services/api/typings.d.ts
index 17f2d1d..289d356 100644
--- a/src/services/api/typings.d.ts
+++ b/src/services/api/typings.d.ts
@@ -14944,6 +14944,8 @@
parkId?: string;
/** 鐢宠鍥尯 */
parkName?: string;
+ /** 鏄惁鏀寔浼佷笟鑷富涓婁紶 */
+ suportEnterpriseUpload?: boolean;
/** 鐢宠鍥尯绫诲瀷 */
parkTypeName?: string;
/** 鐢宠濂栧姳閲戞湀浠� */
@@ -15102,6 +15104,8 @@
/** 鍏ヨ处鏃堕棿 */
transferToTime?: string;
parkBountyApplyDetailId?: string;
+ /** 鐢虫姤閲戦 */
+ applyAmount?: number;
/** 鍏ヨ处鍑瘉 */
transferToFileUrl?: string;
financeToStatus?: FinanceStatusEnum;
@@ -21637,6 +21641,7 @@
suportPlatRecharge?: boolean;
rewardEnable?: boolean;
suportWithDraw?: boolean;
+ industrialParkStatus?: IndustrialParkStatusEnum;
isHasBountyApply?: boolean;
/** 鏄惁鍙互鐧诲綍鐢靛瓙绛� */
canLoginUserSign?: boolean;
diff --git a/src/views/MaterialReview/MaterialReviewDetail.vue b/src/views/MaterialReview/MaterialReviewDetail.vue
index 9e02b32..3a27e09 100644
--- a/src/views/MaterialReview/MaterialReviewDetail.vue
+++ b/src/views/MaterialReview/MaterialReviewDetail.vue
@@ -25,6 +25,7 @@
:pro-table-props="proTableProps"
:reset="reset"
:open-dialog="openDialog"
+ :column="addRewardApplyStep3Columns"
></DeclareEnterpriseTableView>
<MateriaDetailDialog
v-bind="dialogProps"
@@ -67,6 +68,7 @@
BountyCheckStatusEnum,
BountyCheckStatusEnumText,
BountyCheckStatusEnumColor,
+ useAddRewardApplyStep3Columns,
} from '@/constants';
import { FourStreamsMaterialFileTableItem } from '@/components/commonView/types';
import {
@@ -99,6 +101,12 @@
outCheckStatus: '' as any as BountyCheckStatusEnum,
outCheckRemark: '',
+
+ suportEnterpriseUpload: false,
+});
+
+const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
+ suportEnterpriseUpload: toRef(form, 'suportEnterpriseUpload'),
});
const tableRef = ref<InstanceType<typeof DeclareEnterpriseTableView>>();
@@ -140,6 +148,8 @@
data.collectCountListFiles
);
+ form.suportEnterpriseUpload = data.suportEnterpriseUpload;
+
getList();
},
});
@@ -173,6 +183,7 @@
},
columnsRenderProps: {
authType: { type: 'enum', valueEnum: EnterpriseTypeText },
+ applyAmount: { type: 'money' },
},
}
);
diff --git a/src/views/Reward/RewardDeclareDetail.vue b/src/views/Reward/RewardDeclareDetail.vue
index 3d07b5a..1bf9d08 100644
--- a/src/views/Reward/RewardDeclareDetail.vue
+++ b/src/views/Reward/RewardDeclareDetail.vue
@@ -10,6 +10,7 @@
:pro-table-props="proTableProps"
:reset="reset"
:open-dialog="openDialog"
+ :column="addRewardApplyStep3Columns"
></DeclareEnterpriseTableView>
<MateriaDetailDialog
v-bind="dialogProps"
@@ -46,7 +47,7 @@
import { convertApi2FormUrlObjectBySeparator, setOSSLink } from '@/utils';
import { useRouteView } from '@/hooks';
import { OrderInputType } from '@bole-core/core';
-import { EnterpriseTypeText } from '@/constants';
+import { EnterpriseTypeText, useAddRewardApplyStep3Columns } from '@/constants';
import { FourStreamsMaterialFileTableItem } from '@/components/commonView/types';
import { useIndustrialParkDropDownList } from '@/hooks/industrialPark';
import {
@@ -75,10 +76,15 @@
calculationFileList: [] as CustomerApplyFileTypeListItem[],
// bountyAssignFileUlr: [] as UploadUserFile[],
// bountyCollectFileUrl: [] as UploadUserFile[],
+ suportEnterpriseUpload: false,
+});
+
+const { addRewardApplyStep3Columns } = useAddRewardApplyStep3Columns({
+ suportEnterpriseUpload: toRef(form, 'suportEnterpriseUpload'),
});
const { data: detail, isLoading } = useQuery({
- queryKey: ['parkBountyApplyServices/getParkBountyApplyDetail', id],
+ queryKey: ['parkBountyApplyServices/getParkBountyApplyDetailBaseInfo', id],
queryFn: async () => {
return await parkBountyApplyServices.getParkBountyApplyDetailBaseInfo(
{ parkBountyApplyId: id },
@@ -87,7 +93,7 @@
}
);
},
- placeholderData: () => ({} as API.OutCheckParkBountyApplyBaseInfo),
+ placeholderData: () => ({} as API.ParkBountyApplyBaseInfo),
onSuccess(data) {
form.batchNo = data.batchNo;
form.parkName = data.parkName;
@@ -111,6 +117,7 @@
// form.enterpriseRelateFileUrl = convertApi2FormUrlObjectBySeparator(
// data?.enterpriseRelateFileUrl
// );
+ form.suportEnterpriseUpload = data.suportEnterpriseUpload;
getList();
},
@@ -149,6 +156,7 @@
type: 'urlV2',
formatter: (row: API.UserCertificationAuditListDto) => setOSSLink(row.licenseUrl),
},
+ applyAmount: { type: 'money' },
},
}
);
--
Gitblit v1.9.1