ryan преди 1 седмица
родител
ревизия
bbfc34300e
променени са 2 файла, в които са добавени 23 реда и са изтрити 2 реда
  1. 1 2
      backendApi/modules/v1/controllers/FinanceController.php
  2. 22 0
      backendApi/modules/v1/models/lists/finance/TransferList.php

+ 1 - 2
backendApi/modules/v1/controllers/FinanceController.php

@@ -300,8 +300,7 @@ class FinanceController extends BaseController {
             'PERIOD_NUM' => 'PERIOD_NUM',
             'REMARK' => 'REMARK',
             //4047 国家筛选
-            'COUNTRY_ID' => 'U.COUNTRY_ID',
-            'COUNTRY_NAME' => 'CN.NAME',
+            'COUNTRY' => 'U.COUNTRY_ID',
         ]);
         $condition = $filter['condition'];
         $params = $filter['params'];

+ 22 - 0
backendApi/modules/v1/models/lists/finance/TransferList.php

@@ -209,8 +209,30 @@ class TransferList extends \common\libs\dataList\DataList implements DataListInt
                 'CREATED_AT' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceTranserListCreatedAt'), 'other' => 'date'],
                 'PERIOD_NUM' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceTranserListPeriodNum')],
                 'REMARK' => ['isUserTable' => false, 'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListRemark')],
+                //4047 (2026/3/24 16:54 Ryan)
+
+                'COUNTRY' => [
+                    'name' => Yii::t('ctx', 'country'),
+                    'other'=> 'select',
+                    'selectData'=> self::getCountry()
+                ],
             ];
         }
         return $this->filterTypes;
     }
+
+    public function getCountry()
+    {
+        $countries = Countries::getFromCache();
+
+        $data = [];
+        foreach ($countries as $country) {
+            $data[] = [
+                'id' => $country['ID'],
+                'name' => $country['NAME'],
+            ];
+        }
+
+        return $data;
+    }
 }