diff --git a/src/contexts/AuthContext.jsx b/src/contexts/AuthContext.jsx index 9924aa0..07073f0 100644 --- a/src/contexts/AuthContext.jsx +++ b/src/contexts/AuthContext.jsx @@ -199,7 +199,7 @@ export const AuthProvider = ({ children }) => { .single(); if (error) throw error; if(data?.attributes?.menuKeys){ - return data.attributes.menuKeys; + return data.attributes.menuKeys; }else{ return []; } diff --git a/src/pages/company/quotation/view/index.jsx b/src/pages/company/quotation/view/index.jsx index 4adfeda..f04d0bb 100644 --- a/src/pages/company/quotation/view/index.jsx +++ b/src/pages/company/quotation/view/index.jsx @@ -7,7 +7,7 @@ import html2canvas from 'html2canvas'; import jsPDF from 'jspdf'; const { Title, Text } = Typography; -import { EXCHANGE_RATE,defaultSymbol } from '@/utils/exchange_rate'; +import { EXCHANGE_RATE, defaultSymbol } from '@/utils/exchange_rate'; const QuotationPreview = () => { const { id } = useParams(); @@ -114,17 +114,6 @@ const QuotationPreview = () => { } }; - // 导出按钮组件 - const ExportPDFButton = () => ( - - ); - if (loading) { return (
@@ -139,52 +128,69 @@ const QuotationPreview = () => { const currencySymbol = EXCHANGE_RATE[attributes.currency]?.symbol || defaultSymbol; return ( -
+
+
- - 报价单预览 + + 报价单预览 - +
- } - > -
+
+ +
- {attributes.quataName} - 创建日期:{new Date(quotation.created_at).toLocaleDateString()} + {attributes.quataName} + + 创建日期:{new Date(quotation.created_at).toLocaleDateString()} +
-
- 基本信息 -
+
+ 基本信息 +
- 客户: - + 客户: + {attributes.customers?.map(customer => ( - {customer.name} + + {customer.name} + ))}
- 货币类型: - {attributes.currency} + 货币类型: + {attributes.currency}
{attributes.sections?.map((section, sIndex) => ( -
-
+
+
-

{section.sectionName}

+

{section.sectionName}

-
- - +
+
+ @@ -194,9 +200,9 @@ const QuotationPreview = () => { - + {section.items.map((item, iIndex) => ( - + @@ -216,9 +222,9 @@ const QuotationPreview = () => { ))} {/* 金额汇总 */} -
-
-
+
+
+
税前总计: {currencySymbol}{attributes.beforeTaxAmount?.toLocaleString()} @@ -238,9 +244,9 @@ const QuotationPreview = () => {
)} -
- 最终金额: - +
+ 最终金额: + {currencySymbol}{(attributes.discount || attributes.afterTaxAmount)?.toLocaleString()}
@@ -251,9 +257,9 @@ const QuotationPreview = () => { {/* 补充说明 */} {attributes.description && (
- 补充说明 -
- {attributes.description} + 补充说明 +
+ {attributes.description}
)}
项目明细 描述/备注小计
{item.name} {item.description} {item.unit}