diff --git a/Controllers/ApiController.cs b/Controllers/ApiController.cs index e472033d..bf6c4019 100644 --- a/Controllers/ApiController.cs +++ b/Controllers/ApiController.cs @@ -139,13 +139,25 @@ namespace QuotationMaker.Controllers XSSFCellStyle copyTempCellStyle = (XSSFCellStyle)workbook.CreateCellStyle(); // Copy style from old cell and apply to new cell XSSFCellStyle copyTempCellFloatStyle = (XSSFCellStyle)workbook.CreateCellStyle(); + + //估價單總價項目 row = (XSSFRow)sheet.GetRow(11); copyTempCellStyle.CloneStyleFrom(row.Cells[6].CellStyle); copyTempCellFloatStyle.CloneStyleFrom(row.Cells[6].CellStyle); - copyTempCellStyle.DataFormat = workbook.CreateDataFormat().GetFormat("\"NTD \"#,##0"); - copyTempCellFloatStyle.DataFormat = workbook.CreateDataFormat().GetFormat("\"NTD \"#,##0.#"); + copyTempCellStyle.DataFormat = workbook.CreateDataFormat().GetFormat("#,##0"); + copyTempCellFloatStyle.DataFormat = workbook.CreateDataFormat().GetFormat("#,##0.#"); + copyTempCellStyle.BorderTop = BorderStyle.Thin; + copyTempCellStyle.BorderRight = BorderStyle.Thin; + copyTempCellStyle.BorderBottom = BorderStyle.Thin; + copyTempCellStyle.BorderLeft = BorderStyle.Thin; + copyTempCellFloatStyle.BorderTop = BorderStyle.Thin; + copyTempCellFloatStyle.BorderRight = BorderStyle.Thin; + copyTempCellFloatStyle.BorderBottom = BorderStyle.Thin; + copyTempCellFloatStyle.BorderLeft = BorderStyle.Thin; + + //copyTempCellFloatStyle.BorderDiagonalLineStyle= BorderStyle.None; row.Cells[6].SetCellType(CellType.Numeric); row.Cells[6].SetCellValue(objDetail.quotation_noTaxTotal); @@ -468,6 +480,7 @@ namespace QuotationMaker.Controllers row.Cells[6].SetCellType(CellType.Numeric); row.Cells[6].SetCellValue(objMain.quotationMainItem_subTotal); row.Cells[6].CellStyle = copyTempCellStyle; + row.ZeroHeight = true; rowCount++; editRowIndex++; //break; @@ -1916,7 +1929,7 @@ namespace QuotationMaker.Controllers if (token.user_id != GlobalClass.appsettings("Admin:id")) { - ret.quotationViews = conn.Query("select * from quotationView where quotationView_isdel = 'N' and quotationView_revoke = 'N' and project_uid = @project_uid and quotation_create_uid in (@user_list) order by quotation_modifydate desc", new { project_uid = project_uid, user_list = user_uid_list }).ToList(); + ret.quotationViews = conn.Query("select * from quotationView where quotation_isdel = 'N' and quotation_revoke = 'N' and project_uid = @project_uid and quotation_create_uid in (@user_list) order by quotation_modifydate desc", new { project_uid = project_uid, user_list = user_uid_list }).ToList(); } else { diff --git a/wwwroot/logo/bremen_temp.xlsx b/wwwroot/logo/bremen_temp.xlsx index d2277619..b3b1a3d5 100644 Binary files a/wwwroot/logo/bremen_temp.xlsx and b/wwwroot/logo/bremen_temp.xlsx differ diff --git a/wwwroot/logo/journeys_temp.xlsx b/wwwroot/logo/journeys_temp.xlsx index 585f633f..5a28fcc3 100644 Binary files a/wwwroot/logo/journeys_temp.xlsx and b/wwwroot/logo/journeys_temp.xlsx differ