Przeglądaj źródła

feature/20251216-orderlistexport

ryan 3 tygodni temu
rodzic
commit
2bb3f5ad4b

+ 0 - 6
backendApi/modules/v1/models/lists/shop/OrderList.php

@@ -158,15 +158,9 @@ class OrderList extends \common\libs\dataList\DataList implements DataListInterf
                 ],
                 'COUNTRY' => [
                     'header' => \Yii::t('ctx', 'country'), // 国家
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
                 ],
                 'CURRENCY' => [
                     'header' => \Yii::t('ctx', 'currency'), // 币种
-                    'headerOther' => [
-                        'width' => '150',
-                    ],
                 ],
                 'PROVINCE' => [
                     'header' => \Yii::t('ctx', 'shopOrderListState'), // 州

+ 2 - 0
common/libs/export/BaseExport.php

@@ -1241,6 +1241,8 @@ ORDER;
                     'BUY_NUMS' => $columnData['BUY_NUMS'],
                     'CONSIGNEE' => $columnData['CONSIGNEE'],
                     'MOBILE' => "\t{$columnData['MOBILE']}",
+                    'COUNTRY' => $columnData['COUNTRY'],
+                    'CURRENCY' => $columnData['CURRENCY'],
                     'TEL' => "\t{$columnData['TEL']}",
                     'PROVINCE' => $regionConfig[$columnData['PROVINCE']]['REGION_NAME'] ?? '',
                     'CITY' => $regionConfig[$columnData['CITY']]['REGION_NAME'] ?? '',