feature/EK-33291的改动

common/libs/export/BaseExport.php

@@ -1668,6 +1668,7 @@ ORDER;
                 $unitBvFormat = Tool::formatAmount($value['REAL_PV']);
 
                 // 订单详情
+                //ek-3391 Taxable Amount和VAT Amount字段取值错误（两个取值取反了），需要修改 (2025/11/25 13:35 Ryan)
                 $orderDetails .= <<<EOT
                 <tr style="text-align: left; padding: 10px 5px; font-weight: normal; font-size: 12px; width: 100%;">
                     <td style="width: 30px;">{$no}</td>
@@ -1675,11 +1676,11 @@ ORDER;
                     <td>{$value['GOODS_TITLE']}</td>
                     <td>{$value['BUY_NUMS']}</td>
                     <td>{$unitPriceFormat}</td>
-                    <td>{$unitBvFormat}</td>
-                    <td>{$totalBvFormat}</td>
-                    <td>{$taxableAmountFormat}</td>
+<!--                    <td>{$unitBvFormat}</td>-->
+<!--                    <td>{$totalBvFormat}</td>-->
+                    <td>{$vatAmountFormat}</td> 
                     <td>{$vatRateFormat}</td>
-                    <td>{$vatAmountFormat}</td>
+                    <td>{$taxableAmountFormat}</td>
                     <td>{$totalFormat}</td> 
                 </tr>
 EOT;
@@ -1809,19 +1810,19 @@ EOT;
                         <br />
                         <br />
                         <br />
-                        <table border="1" width="100%">
-                            <tr style="text-align: left; font-weight: normal; font-size: 12px; width: 100%; padding: 5px 5px;">
-                                <th style="width: 30px;">No.</th>
-                                <th>Product Code</th>
-                                <th>Product Name</th>
-                                <th>Quantity</th>
-                                <th>Unit Price({$currency})</th>
-                                <th>Unit BV</th>
-                                <th>Total BV</th>
-                                <th>Taxable Amount({$currency})</th>
-                                <th>VAT Rate</th>
-                                <th>VAT Amount({$currency})</th>
-                                <th>Total({$currency})</th>
+                        <table border="1" width="100%" style="table-layout: auto;">
+                            <tr style="text-align: left; font-weight: normal; font-size: 12px; white-space: nowrap;">
+                                <th style="white-space: nowrap; width: auto;">No.</th>
+                                <th style="white-space: nowrap; width: auto;">Product Code</th>
+                                <th style="white-space: nowrap; width: auto;">Product Name</th>
+                                <th style="white-space: nowrap; width: auto;">Quantity</th>
+                                <th style="white-space: nowrap; width: auto;">Unit Price({$currency})</th>
+                                <!--<th style="white-space: nowrap; width: auto;">Unit BV</th>
+                                <th style="white-space: nowrap; width: auto;">Total BV</th>-->
+                                <th style="white-space: nowrap; width: auto;">Taxable Amount({$currency})</th>
+                                <th style="white-space: nowrap; width: auto;">VAT Rate</th>
+                                <th style="white-space: nowrap; width: auto;">VAT Amount({$currency})</th>
+                                <th style="white-space: nowrap; width: auto;">Total({$currency})</th>
                             </tr>
                             {$orderDetails}
                         </table>