瀏覽代碼

feature/EK-4047

ryan 1 周之前
父節點
當前提交
7d14cdad28

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

@@ -92,6 +92,8 @@ class FinanceController extends BaseController {
             'AUDITED_AT' => 'BA.AUDITED_AT',
             'AUDITED_AT' => 'BA.AUDITED_AT',
             'CREATE_ADMIN_NAME' => 'ADMC.ADMIN_NAME',
             'CREATE_ADMIN_NAME' => 'ADMC.ADMIN_NAME',
             'AUDIT_ADMIN_NAME' => 'ADMU.ADMIN_NAME',
             'AUDIT_ADMIN_NAME' => 'ADMU.ADMIN_NAME',
+            //4047 国家筛选
+            'COUNTRY' => 'U.COUNTRY_ID',
         ]);
         ]);
         $condition = $filter['condition'];
         $condition = $filter['condition'];
         $params = $filter['params'];
         $params = $filter['params'];

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

@@ -260,8 +260,30 @@ class BalanceAuditList extends \common\libs\dataList\DataList implements DataLis
                     'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAuditTime'), 
                     'name' => Yii::t('ctx', 'modelListFinanceBalanceAuditListAuditTime'), 
                     'other' => 'date'
                     'other' => 'date'
                 ], // 审核时间
                 ], // 审核时间
+
+                //4047 (2026/3/24 16:54 Ryan)
+                'COUNTRY' => [
+                    'name' => Yii::t('ctx', 'country'),
+                    'other'=> 'select',
+                    'selectData'=> self::getCountry()
+                ],
             ];
             ];
         }
         }
         return $this->filterTypes;
         return $this->filterTypes;
     }
     }
+
+    public function getCountry()
+    {
+        $countries = Countries::getFromCache();
+
+        $data = [];
+        foreach ($countries as $country) {
+            $data[] = [
+                'id' => $country['ID'],
+                'name' => $country['NAME'],
+            ];
+        }
+
+        return $data;
+    }
 }
 }