Merge branch 'master' into dev-dataBoard

wupengfei

8 天以前 e22c1e1191ef01c43932f26bbbccafca4505d39e

 src/hooks/fourStreams.ts

@@ -91,10 +91,11 @@
  id?: Ref<string>;
  applyMonth?: Ref<string>;
  enableUploadExtraFiles?: boolean;
  bountyTemplateId?: Ref<string>;
};

export function useDeclareEnterpriseTable(options: UseDeclareEnterpriseTableOptions = {}) {
  const { id, applyMonth, enableUploadExtraFiles = false } = options;
  const { id, applyMonth, enableUploadExtraFiles = false, bountyTemplateId } = options;

  const {
    getDataSource: getList,
@@ -158,14 +159,16 @@
    try {
      const applyFilesRes = await queryClient.ensureQueryData({
        queryKey: [
          'enterpriseApplyFileServices/getCustomerUploadApplyFiles',
          'enterpriseApplyFileServices/getCustomerUploadApplyFilesV2',
          row.enterpriseId,
          applyMonth.value,
          bountyTemplateId.value,
        ],
        queryFn: async () => {
          return await enterpriseApplyFileServices.getCustomerUploadApplyFiles({
          return await enterpriseApplyFileServices.getCustomerUploadApplyFilesV2({
            enterpriseId: row.enterpriseId,
            withMonth: applyMonth.value,
            bountyTemplateId: bountyTemplateId.value,
          });
        },
      });