theo 3 жил өмнө
parent
commit
1173fb6558

+ 2 - 2
backendApi/modules/v1/controllers/AtlasController.php

@@ -145,7 +145,7 @@ class AtlasController extends BaseController {
             }
         }
         $form = new AtlasExportForm();
-        $result = $form->run(array_merge($filter, ['others' => ['userId' => $userId, 'deep' => $deep, 'periodNum' => $periodNum]]), '开拓网络列表');
+        $result = $form->run(array_merge($filter, ['others' => ['userId' => $userId, 'deep' => $deep, 'periodNum' => $periodNum]]), 'Sponsor_Network'); // 开拓网络列表
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -210,7 +210,7 @@ class AtlasController extends BaseController {
             }
         }
         $form = new AtlasExportForm();
-        $result = $form->run(array_merge($filter, ['others' => ['userId' => $userId, 'deep' => $deep, 'periodNum' => $periodNum]]), '安置网络列表');
+        $result = $form->run(array_merge($filter, ['others' => ['userId' => $userId, 'deep' => $deep, 'periodNum' => $periodNum]]), 'Placement_Network'); // 安置网络列表
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }

+ 2 - 2
backendApi/modules/v1/controllers/BonusController.php

@@ -283,7 +283,7 @@ class BonusController extends BaseController {
             'TRANSFER_SN' => 'TRANSFER_SN',
         ]);
         $form = new BonusExportForm();
-        $result = $form->run($filter, '奖金流水');
+        $result = $form->run($filter, 'Bonus_Flow'); // 奖金流水
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -901,7 +901,7 @@ class BonusController extends BaseController {
 //        $filter['condition'] .= ' AND CB.PERIOD_NUM=:PERIOD_NUM';
 //        $filter['params'][':PERIOD_NUM'] = $periodNum;
         $form = new BonusExportForm();
-        $result = $form->run(array_merge($filter, ['others'=>['yearMonth'=>$yearMonth]]), '往期奖金');
+        $result = $form->run(array_merge($filter, ['others'=>['yearMonth'=>$yearMonth]]), 'Member Bonus'); // 往期奖金
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }

+ 3 - 3
backendApi/modules/v1/controllers/FinanceController.php

@@ -307,7 +307,7 @@ class FinanceController extends BaseController {
             'REMARK' => 'REMARK',
         ]);
         $form = new FinanceExportForm();
-        $result = $form->run($filter, '转账列表');
+        $result = $form->run($filter, 'Transfer_List'); // 转账列表
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -473,7 +473,7 @@ class FinanceController extends BaseController {
             }
         }
         $form = new FinanceExportForm();
-        $result = $form->run($filter, '提现申请');
+        $result = $form->run($filter, 'Withdraw_Apply'); // 提现申请
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -1121,7 +1121,7 @@ class FinanceController extends BaseController {
             'CREATED_AT' => 'R.CREATED_AT',
         ]);
         $form = new FinanceExportForm();
-        $result = $form->run($filter, '充值申请');
+        $result = $form->run($filter, 'Recharge'); // 充值申请
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }

+ 1 - 1
backendApi/modules/v1/controllers/LogController.php

@@ -96,7 +96,7 @@ class LogController extends BaseController {
             'request_route' => 'user_agent',
         ]);
         $form = new LogExportForm();
-        $result = $form->run($filter, '会员登录日志');
+        $result = $form->run($filter, 'Member_Login_Log'); // 会员登录日志
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }

+ 2 - 2
backendApi/modules/v1/controllers/ShopController.php

@@ -93,7 +93,7 @@ class ShopController extends BaseController {
             'CATEGORY_TYPE' => 'CATEGORY_TYPE',
         ]);
         $form = new ShopExportForm();
-        $result = $form->run($filter, '商品列表');
+        $result = $form->run($filter, 'Goods_List'); // 商品列表
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -414,7 +414,7 @@ class ShopController extends BaseController {
         ]);
         $filter['condition'] = !$filter['condition'] ? '1=1 AND O.IS_DELETE=0' : ('O.IS_DELETE=0 ' . $filter['condition']);
         $form = new ShopExportForm();
-        $result = $form->run($filter, '订单列表');
+        $result = $form->run($filter, 'Order_List'); // 订单列表
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }

+ 2 - 2
backendApi/modules/v1/controllers/UserController.php

@@ -203,7 +203,7 @@ class UserController extends BaseController
             'ALLOW_TRANSFER' => 'UI.ALLOW_TRANSFER',
         ]);
         $form = new UserExportForm();
-        $result = $form->run($filter, '会员列表');
+        $result = $form->run($filter, 'Member_List');
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }
@@ -745,7 +745,7 @@ class UserController extends BaseController
             //'CREATE_REMARK' => 'UM.CREATE_REMARK',
         ]);
         $form = new UserExportForm();
-        $result = $form->run($filter, '移网管理');
+        $result = $form->run($filter, 'Move_Network'); // 移网管理
         if (!$result) {
             return static::notice(Form::formatErrorsForApi($form->getErrors()), 400);
         }

+ 1 - 1
backendEle/src/views/file/export.vue

@@ -20,7 +20,7 @@
         <el-table-column label="route"><!-- 路径 -->
           <template slot-scope="scope">
             <el-button type="success" size="small" @click="singleDownload(scope.row)"
-                       v-if="Number(scope.row.EXPORT_PERCENT)===100">下载
+                       v-if="Number(scope.row.EXPORT_PERCENT)===100">Download
             </el-button>
           </template>
         </el-table-column>

+ 1 - 1
common/libs/export/BaseExport.php

@@ -488,7 +488,7 @@ class BaseExport extends Component {
 
         // 把文件对应的相关资料存入数据库中
         $export = new Export();
-        $export->EXPORT_NAME = $params['listName'] . '_' . date('y年m月d日H时i分s秒导出', Date::nowTime());
+        $export->EXPORT_NAME = $params['listName'] . '_' . date('Exp_y-m-d H:i:s', Date::nowTime());
         $export->MODULE_NAME = $params['moduleId'];
         $export->REMARK = $params['remark'];
         $export->IS_EXPORTING = 1;

+ 1 - 1
console/controllers/UserController.php

@@ -92,7 +92,7 @@ class UserController extends BaseController
      * @return bool
      */
     public function actionIndexExport($taskId){
-        return $this->_export($taskId, IndexList::class, '会员列表');
+        return $this->_export($taskId, IndexList::class, 'Member_list');
     }
 
     /**