Sfoglia il codice sorgente

update

tags/Baseline_30082024_FRONTEND_UAT
MSI\derek 1 anno fa
parent
commit
aa5eda2c9a
2 ha cambiato i file con 11 aggiunte e 12 eliminazioni
  1. +2
    -2
      src/app/api/reports/index.ts
  2. +9
    -10
      src/components/CostAndExpenseReport/CostAndExpenseReport.tsx

+ 2
- 2
src/app/api/reports/index.ts Vedi File

@@ -91,11 +91,11 @@ export interface ProjectCompletionReportRequest {
export interface CostAndExpenseReportFilter {
team: string[];
customer: string[];
budgetPercentage: String[];
budgetPercentage: number;
}

export interface CostAndExpenseReportRequest {
teamId: number | null;
clientId: number | null;
budgetPercentage: string;
budgetPercentage: number;
}

+ 9
- 10
src/components/CostAndExpenseReport/CostAndExpenseReport.tsx Vedi File

@@ -41,9 +41,7 @@ const CostAndExpenseReport: React.FC<Props> = ({ team, customer }) => {
{
label: t("Remaining Percentage"),
paramName: "budgetPercentage",
type: "select",
options: percentList,
needAll: true,
type: "number",
},
],
[t]
@@ -58,8 +56,9 @@ const CostAndExpenseReport: React.FC<Props> = ({ team, customer }) => {
let postData: CostAndExpenseReportRequest = {
teamId: null,
clientId: null,
budgetPercentage: ">50%"
budgetPercentage: 0.5
}
console.log(query.budgetPercentage)
if (query.team.length > 0 && query.team.toLocaleLowerCase() !== "all") {
index = teamCombo.findIndex(team => team === query.team)
postData.teamId = team[index].id
@@ -68,14 +67,14 @@ const CostAndExpenseReport: React.FC<Props> = ({ team, customer }) => {
index = custCombo.findIndex(customer => customer === query.customer)
postData.clientId = customer[index].id
}
if (query.budgetPercentage.length > 0 && query.budgetPercentage.toLocaleLowerCase() !== "all") {
postData.budgetPercentage = query.budgetPercentage
if (Boolean(query.budgetPercentage)) {
postData.budgetPercentage = query.budgetPercentage/100
}
console.log(postData)
const response = await fetchCostAndExpenseReport(postData)
if (response) {
downloadFile(new Uint8Array(response.blobValue), response.filename!!)
}
const response = await fetchCostAndExpenseReport(postData)
if (response) {
downloadFile(new Uint8Array(response.blobValue), response.filename!!)
}
}}
/>
</>


Caricamento…
Annulla
Salva