igb 4 ماه پیش
والد
کامیت
23e97204f3
3فایلهای تغییر یافته به همراه35 افزوده شده و 12 حذف شده
  1. 31 12
      app/Admin/Controllers/DistMessageController.php
  2. 2 0
      lang/en/global.php
  3. 2 0
      lang/zh_CN/global.php

+ 31 - 12
app/Admin/Controllers/DistMessageController.php

@@ -14,15 +14,20 @@ use App\Distributor\Repositories\DistAdminDistributor;
 
 class DistMessageController extends AdminController
 {
+    public function title()
+    {
+        return admin_trans('admin.messages');
+
+    }
     /**
      * page index
      */
     public function index(Content $content)
     {
         return $content
-            ->header('列表')
-            ->description('全部')
-            ->breadcrumb(['text'=>'列表','url'=>''])
+            ->header(admin_trans( 'admin.messages'))
+            ->description(admin_trans('admin.all'))
+            ->breadcrumb(['text'=>'list','url'=>''])
             ->body($this->grid());
     }
 
@@ -35,10 +40,17 @@ class DistMessageController extends AdminController
     {
         return Grid::make(new DistMessage(), function (Grid $grid) {
             $grid->column('id')->sortable();
-            $grid->column('title', 'message Title');
+            $grid->column('title', admin_trans_field('message_title'));
             $grid->column('content');
-            $grid->column('sender_id');
-            $grid->column('target_type');
+            //$grid->column('sender_id');
+            $grid->column('target_type')->display(function ($value) {
+                if ($value === 'all') {
+                    return admin_trans_label('all_users');
+                } elseif ($value === 'users') {
+                    return admin_trans_label('specified_users');
+                }
+                return $value;
+            });
             //$grid->column('target_ids');
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
@@ -63,8 +75,15 @@ class DistMessageController extends AdminController
             $show->field('id');
             $show->field('title');
             $show->field('content');
-            $show->field('sender_id');
-            $show->field('target_type');
+            //$show->field('sender_id');
+            $show->field('target_type')->as(function ($value) {
+                if ($value === 'all') {
+                    return admin_trans_label('all_users');
+                } elseif ($value === 'users') {
+                    return admin_trans_label('specified_users');
+                }
+                return $value;
+            });
             //$show->field('target_ids');
 //            $show->field('target_ids');
             // 获取 target_ids 并显示对应的 company_name
@@ -129,14 +148,14 @@ JS
             if ($form->isEditing()) {
                 // 如果是编辑操作,设置 target_type 为只读
                 $form->select('target_type')->options([
-                    'all' => 'all Users',
-                    'users' => 'specified Users',
+                    'all' => admin_trans_label('all_users'),
+                    'users' => admin_trans_label('specified_users'),
                 ])->rules('required')->readonly();
             } else {
                 // 如果是创建操作,正常显示 target_type
                 $form->select('target_type')->options([
-                    'all' => 'all Users',
-                    'users' => 'specified Users',
+                    'all' => admin_trans_label('all_users'),
+                    'users' => admin_trans_label('specified_users'),
                 ])->rules('required');
             }
 

+ 2 - 0
lang/en/global.php

@@ -179,6 +179,8 @@ return [
         'no_selected_data' => 'No selected data',
         'select_distributor' => 'Select Distributor',
         'confirm_process_inquiry' => 'Are you sure to process inquiry?',
+        'all_users' => 'All Users',
+        'specified_users' => 'Specified Users',
     ],
     'options' => [
         //

+ 2 - 0
lang/zh_CN/global.php

@@ -186,6 +186,8 @@ return [
         'confirm_process_inquiry' => '确认处理询价?',
         'read'                  => '已读',
         'unread'                => '未读',
+        'all_users'             => '所有用户',
+        'specified_users' => '指定用户',
     ],
     'options' => [
         //