Merge branch 'master' of http://git.ichunt.net/semour/semour_admin

.env

@@ -13,6 +13,13 @@ DB_DATABASE=semour
 DB_USERNAME=semour
 DB_PASSWORD='semour#zsyM'
 
+DB_CMS_CONNECTION=web
+DB_CMS_HOST=192.168.1.252
+DB_CMS_PORT=3306
+DB_CMS_DATABASE=ichuntcms
+DB_CMS_USERNAME=ichuntcms
+DB_CMS_PASSWORD='ichuntcms#zsyM'
+
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 QUEUE_CONNECTION=sync

app/Admin/Actions/Grid/HandleInquiry.php

+<?php
+
+namespace App\Admin\Actions\Grid;
+
+use Dcat\Admin\Actions\Response;
+use Dcat\Admin\Grid\Tools\AbstractTool;
+use Dcat\Admin\Traits\HasPermissions;
+use Illuminate\Contracts\Auth\Authenticatable;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Http\Request;
+
+class HandleInquiry extends AbstractTool
+{
+    /**
+     * @return string
+     */
+	protected $title = 'Handle';
+
+    protected $style = 'btn btn-primary feather icon-check-square';
+
+    /**
+     * Handle the action request.
+     *
+     * @param Request $request
+     *
+     * @return Response
+     */
+    public function handle(Request $request)
+    {
+        dd($this);
+        $keys = $this->getKey();
+        dd($request->all());
+        return $this->response()
+            ->success('Processed successfully.')
+            ->redirect('/');
+    }
+
+    /**
+     * @return string|void
+     */
+    protected function href()
+    {
+        // return admin_url('auth/users');
+    }
+
+    /**
+	 * @return string|array|void
+	 */
+	public function confirm()
+	{
+		 return ['Confirm?', 'contents'];
+	}
+
+    /**
+     * @param Model|Authenticatable|HasPermissions|null $user
+     *
+     * @return bool
+     */
+    protected function authorize($user): bool
+    {
+        return true;
+    }
+
+    /**
+     * @return array
+     */
+    protected function parameters()
+    {
+        return [];
+    }
+}

app/Admin/Controllers/InquiryController.php

@@ -2,11 +2,16 @@
 
 namespace App\Admin\Controllers;
 
+use App\Admin\Actions\Grid\HandleInquiry;
+use App\Admin\Renderable\BarChart;
+use App\Admin\Renderable\InquiryDetail;
+use App\Admin\Renderable\PostTable;
 use App\Admin\Repositories\Inquiry;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
+use Dcat\Admin\Widgets\Card;
 
 class InquiryController extends AdminController
 {
@@ -20,16 +25,38 @@ class InquiryController extends AdminController
         return Grid::make(new Inquiry(['user']), function (Grid $grid) {
             $grid->showFilter();
 
-            $grid->filter(function($filter){
-                $filter->disableIdFilter();
+            $grid->filter(function ($filter) {
                 $filter->expand(true);
-                $filter->like('id')->width(3);
+                $filter->equal('inquiry_id')->width(3);
                 $filter->like('inquiry_sn')->width(3);
+                $filter->equal('status')->select(admin_trans('inquiry.options.status'))->width(3);
+                $filter->equal('priority')->select(admin_trans('inquiry.options.priority'))->width(3);
+                $filter->like('user.email')->width(3);
+                $filter->like('user.phone')->width(3);
+                $filter->equal('sales_name')->select(admin_trans('inquiry.options.priority'))->width(3);
+                $filter->whereBetween('create_time', function ($q) {
+                    $start = strtotime($this->input['start'] ?? null);
+                    $end = strtotime($this->input['end'] ?? null);
+                    $q->whereBetween('create_time', [$start, $end]);
+                })->datetime()->width(3);
             });
 
+
+            $grid->tools(new HandleInquiry(admin_trans('inquiry.labels.handle')));
+
+
+            $grid->model()->orderBy('inquiry_id', 'desc');
             $grid->column('inquiry_id')->sortable();
+            $grid->column('task_type')->display(admin_trans('inquiry.options.task_type.1'));
             $grid->column('user.email');
-            $grid->column('inquiry_sn');
+            $grid->column('inquiry_sn')->modal(function (Grid\Displayers\Modal $modal) {
+                $modal->xl();
+                // 标题
+                $modal->title(admin_trans('inquiry.labels.inquiry_detail'));
+                $detail = InquiryDetail::make(['key' => $this->inquiry_id]);
+                $list = InquiryDetail::inquiryItems($this->inquiry_id);
+                return new Card($detail) . new Card($list);
+            });
             $grid->column('status')->using(admin_trans('inquiry.options.status'))->badge([
                 -1 => 'danger',
                 0 => 'primary',
@@ -52,11 +79,6 @@ class InquiryController extends AdminController
             $grid->column('update_time')->display(function ($time) {
                 return $time ? date('Y-m-d H:i:s', $time) : '';
             });
-
-            $grid->filter(function (Grid\Filter $filter) {
-                $filter->equal('inquiry_id');
-
-            });
         });
     }
 

app/Admin/Extensions/Show/Textarea.php

+<?php
+
+namespace App\Admin\Extensions\Show;
+
+use Dcat\Admin\Admin;
+use Dcat\Admin\Show\AbstractField;
+
+class Textarea extends AbstractField
+{
+    // 这个属性设置为false则不会转义HTML代码
+    public $escape = false;
+    public $border = false;
+
+    public function render($arg = '')
+    {
+        Admin::script(
+            <<<JS
+$('.custom-textarea').parent().parent().css('margin-left','-220px');
+JS
+        );
+        // 返回任意可被渲染的内容
+
+        return "<div class='box box-solid box-default no-margin box-show custom-textarea'><div class='box-body'  style='min-height: 150px;'>$this->value</div></div>";
+    }
+}

app/Admin/Renderable/AdminSetting.php

+<?php
+
+namespace App\Admin\Renderable;
+
+use App\Admin\Forms\AdminSetting as AdminSettingForm;
+use Dcat\Admin\Support\LazyRenderable;
+
+class AdminSetting extends LazyRenderable
+{
+    public function render()
+    {
+        return AdminSettingForm::make();
+    }
+}

app/Admin/Renderable/BarChart.php

+<?php
+
+namespace App\Admin\Renderable;
+
+use App\Admin\Widgets\Charts\Bar;
+use Dcat\Admin\Support\LazyRenderable;
+
+class BarChart extends LazyRenderable
+{
+    public function render()
+    {
+        return Bar::make();
+    }
+}

app/Admin/Renderable/InquiryDetail.php

+<?php
+
+namespace App\Admin\Renderable;
+
+use App\Models\InquiryItems;
+use Dcat\Admin\Layout\Column;
+use Dcat\Admin\Layout\Content;
+use Dcat\Admin\Layout\Row;
+use Dcat\Admin\Show;
+use Dcat\Admin\Support\LazyRenderable;
+use App\Admin\Repositories\Inquiry;
+use Dcat\Admin\Widgets\Card;
+use Dcat\Admin\Widgets\Table;
+use Faker\Factory;
+
+
+class InquiryDetail extends LazyRenderable
+{
+    public function render()
+    {
+        $id = $this->key;
+        // 只填充内容，不需要标题
+        return Show::make($id, new Inquiry(['user', 'sales_user']), function (Show $show) {
+            $show->panel()
+                ->tools(function ($tools) {
+                    $tools->disableEdit();
+                    $tools->disableList();
+                    $tools->disableDelete();
+                });
+            $show->row(function (Show\Row $show) {
+                $show->width(4)->field('inquiry_sn');
+                $show->width(4)->field('task_type')->value(admin_trans('inquiry.options.task_type.1'));
+                $show->width(4)->field('sales_user.name');
+            });
+            $show->row(function (Show\Row $show) {
+                $show->width(4)->field('status')->using(admin_trans('inquiry.options.status'));
+                $show->width(4)->field('priority')->using(admin_trans('inquiry.options.priority'));
+            });
+            $show->row(function (Show\Row $show) {
+                $show->width(4)->field('user.id');
+                $show->width(4)->field('user.company_name');
+            });
+            $show->row(function (Show\Row $show) {
+                $show->width(4)->field('user.phone');
+                $show->width(4)->field('user.email');
+            });
+
+            $show->row(function (Show\Row $show) {
+                $show->field('remark')->textarea('remark');
+            });
+        });
+    }
+
+    public static function inquiryItems($id)
+    {
+        $data = [];
+        $inquiryItems = InquiryItems::where('inquiry_id', $id)
+            ->get()->toArray();
+
+        foreach ($inquiryItems as $item) {
+            $data[] = [
+                $item['goods_name'],
+                $item['brand_name'],
+                $item['inquiry_number'],
+            ];
+        }
+        return Table::make([
+            admin_trans('inquiry-items.fields.goods_name'),
+            admin_trans('inquiry-items.fields.brand_name'),
+            admin_trans('inquiry-items.fields.inquiry_number')
+        ], $data);
+    }
+}

app/Admin/Renderable/ModalForm.php

+<?php
+
+namespace App\Admin\Renderable;
+
+use App\Admin\Forms\UserProfile;
+use Dcat\Admin\Support\LazyRenderable;
+
+class ModalForm extends LazyRenderable
+{
+    public function render()
+    {
+        return UserProfile::make()->setCurrentUrl($this->current);
+    }
+}

app/Admin/Renderable/PostTable.php

+<?php
+
+namespace App\Admin\Renderable;
+
+use Dcat\Admin\Support\LazyRenderable;
+use Dcat\Admin\Widgets\Table;
+use Faker\Factory;
+
+class PostTable extends LazyRenderable
+{
+    public function render()
+    {
+        $data = [];
+
+        $faker = Factory::create();
+
+        for ($i = 0; $i < 5; $i++) {
+            $data[] = [
+                $faker->title,
+                $faker->email,
+                $faker->date(),
+            ];
+        }
+
+        return Table::make(['Title', 'Email', 'date'], $data);
+    }
+}

app/Admin/Renderable/UserTable.php

+<?php
+
+namespace App\Admin\Renderable;
+
+use Dcat\Admin\Grid;
+use Dcat\Admin\Grid\LazyRenderable;
+use Dcat\Admin\Models\Administrator;
+
+class UserTable extends LazyRenderable
+{
+    public function grid(): Grid
+    {
+        return Grid::make(new Administrator(), function (Grid $grid) {
+            $grid->column('id', 'ID')->sortable();
+            $grid->column('username');
+            $grid->column('name');
+            $grid->column('created_at');
+            $grid->column('updated_at');
+
+            $grid->quickSearch(['id', 'username', 'name']);
+
+            $grid->paginate(10);
+            $grid->disableActions();
+
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->like('username')->width(4);
+                $filter->like('name')->width(4);
+            });
+        });
+    }
+}

app/Admin/RowActions/Copy.php

+<?php
+
+namespace App\Admin\RowActions;
+
+use Dcat\Admin\Grid\RowAction;
+use Illuminate\Http\Request;
+use Illuminate\Database\Eloquent\Model;
+
+class Copy extends RowAction
+{
+    protected $model;
+
+    public function __construct(string $model = null)
+    {
+        $this->model = $model;
+    }
+
+    /**
+     * 标题
+     *
+     * @return string
+     */
+    public function title()
+    {
+        return 'Copy';
+    }
+
+    /**
+     * 设置确认弹窗信息，如果返回空值，则不会弹出弹窗
+     *
+     * 允许返回字符串或数组类型
+     *
+     * @return array|string|void
+     */
+    public function confirm()
+    {
+        return [
+            // 确认弹窗 title
+            "您确定要复制这行数据吗？",
+            // 确认弹窗 content
+            $this->row->username,
+        ];
+    }
+
+    /**
+     * 处理接口的方法
+     *
+     * @param Request $request
+     *
+     * @return \Dcat\Admin\Actions\Response
+     */
+    public function handle(Request $request)
+    {
+        // 获取当前行ID
+        $id = $this->getKey();
+
+        // 获取通过 parameters 传递的参数
+        $username = $request->get('username');
+
+        /* @var Model $model */
+        $model = $request->get('model');
+
+        // 复制数据
+        $model::find($id)->replicate()->save();
+
+        // 返回响应结果并刷新页面
+        return $this->response()->success("复制成功: [{$username}]")->refresh();
+    }
+
+    /**
+     * 设置要POST到接口的数据
+     *
+     * @return array
+     */
+    public function parameters()
+    {
+        return [
+            // 发送当前行 username 字段数据到接口
+            'username' => $this->row->username,
+            // 把模型类名传递到接口
+            'model' => $this->model,
+        ];
+    }
+}

app/Admin/Widgets/Charts/Bar.php

+<?php
+
+namespace App\Admin\Widgets\Charts;
+
+use Dcat\Admin\Admin;
+use Dcat\Admin\Widgets\ApexCharts\Chart;
+
+class Bar extends Chart
+{
+    public function __construct($containerSelector = null, $options = [])
+    {
+        parent::__construct($containerSelector, $options);
+
+        $this->setUpOptions();
+    }
+
+    /**
+     * 初始化图表配置
+     */
+    protected function setUpOptions()
+    {
+        $color = Admin::color();
+
+        $colors = [$color->primary(), $color->primaryDarker()];
+
+        $this->options([
+            'colors' => $colors,
+            'chart' => [
+                'type' => 'bar',
+                'height' => 430
+            ],
+            'plotOptions' => [
+                'bar' => [
+                    'horizontal' => true,
+                    'dataLabels' => [
+                        'position' => 'top',
+                    ],
+                ]
+            ],
+            'dataLabels' => [
+                'enabled' => true,
+                'offsetX' => -6,
+                'style' => [
+                    'fontSize' => '12px',
+                    'colors' => ['#fff']
+                ]
+            ],
+            'stroke' => [
+                'show' => true,
+                'width' => 1,
+                'colors' => ['#fff']
+            ],
+            'xaxis' => [
+                'categories' => [],
+            ],
+        ]);
+    }
+
+    /**
+     * 处理图表数据
+     */
+    protected function buildData()
+    {
+        // 执行你的数据查询逻辑
+        $data = [
+            [
+                'data' => [44, 55, 41, 64, 22, 43, 21]
+            ],
+            [
+                'data' => [53, 32, 33, 52, 13, 44, 32]
+            ]
+        ];
+        $categories = [2001, 2002, 2003, 2004, 2005, 2006, 2007];
+
+        $this->withData($data);
+        $this->withCategories($categories);
+    }
+
+    /**
+     * 设置图表数据
+     *
+     * @param array $data
+     *
+     * @return $this
+     */
+    public function withData(array $data)
+    {
+        return $this->option('series', $data);
+    }
+
+    /**
+     * 设置图表类别.
+     *
+     * @param array $data
+     *
+     * @return $this
+     */
+    public function withCategories(array $data)
+    {
+        return $this->option('xaxis.categories', $data);
+    }
+
+    /**
+     * 渲染图表
+     *
+     * @return string
+     */
+    public function render()
+    {
+        $this->buildData();
+
+        return parent::render();
+    }
+}

app/Admin/Widgets/Charts/MyAjaxBar.php

+<?php
+
+namespace App\Admin\Widgets\Charts;
+
+use Illuminate\Http\Request;
+
+class MyAjaxBar extends MyBar
+{
+    /**
+     * 处理请求
+     * 如果你的图表类中包含此方法，则可以通过此方法处理前端通过ajax提交的获取图表数据的请求
+     *
+     * @param Request $request
+     * @return mixed|void
+     */
+    public function handle(Request $request)
+    {
+        switch ((int) $request->get('option')) {
+            case 30:
+                // 你的数据查询逻辑
+                $data = [
+                    [
+                        'data' => [44, 55, 41, 64, 22, 43, 21]
+                    ],
+                    [
+                        'data' => [53, 32, 33, 52, 13, 44, 32]
+                    ]
+                ];
+                $categories = [2001, 2002, 2003, 2004, 2005, 2006, 2007];
+
+                break;
+            case 28:
+                // 你的数据查询逻辑
+                $data = [
+                    [
+                        'data' => [44, 55, 41, 64, 22, 43, 21]
+                    ],
+                    [
+                        'data' => [53, 32, 33, 52, 13, 44, 32]
+                    ]
+                ];
+                $categories = [2001, 2002, 2003, 2004, 2005, 2006, 2007];
+
+                break;
+            case 7:
+            default:
+                // 你的数据查询逻辑
+                $data = [
+                    [
+                        'data' => [44, 55, 41, 64, 22, 43, 21]
+                    ],
+                    [
+                        'data' => [53, 32, 33, 52, 13, 44, 32]
+                    ]
+                ];
+                $categories = [2001, 2002, 2003, 2004, 2005, 2006, 2007];
+                break;
+        }
+
+        $this->withData($data);
+        $this->withCategories($categories);
+    }
+
+    /**
+     * 这里覆写父类的方法，不再查询数据
+     */
+    protected function buildData()
+    {
+    }
+}

app/Admin/Widgets/Charts/MyBar.php

+<?php
+
+namespace App\Admin\Widgets\Charts;
+
+use Dcat\Admin\Admin;
+use Dcat\Admin\Widgets\ApexCharts\Chart;
+
+class MyBar extends Chart
+{
+    public function __construct($containerSelector = null, $options = [])
+    {
+        parent::__construct($containerSelector, $options);
+
+        $this->setUpOptions();
+    }
+
+    /**
+     * 初始化图表配置
+     */
+    protected function setUpOptions()
+    {
+        $color = Admin::color();
+
+        $colors = [$color->primary(), $color->primaryDarker()];
+
+        $this->options([
+            'colors' => $colors,
+            'chart' => [
+                'type' => 'bar',
+                'height' => 430
+            ],
+            'plotOptions' => [
+                'bar' => [
+                    'horizontal' => true,
+                    'dataLabels' => [
+                        'position' => 'top',
+                    ],
+                ]
+            ],
+            'dataLabels' => [
+                'enabled' => true,
+                'offsetX' => -6,
+                'style' => [
+                    'fontSize' => '12px',
+                    'colors' => ['#fff']
+                ]
+            ],
+            'stroke' => [
+                'show' => true,
+                'width' => 1,
+                'colors' => ['#fff']
+            ],
+            'xaxis' => [
+                'categories' => [],
+            ],
+        ]);
+    }
+
+    /**
+     * 处理图表数据
+     */
+    protected function buildData()
+    {
+        // 执行你的数据查询逻辑
+        $data = [
+            [
+                'data' => [44, 55, 41, 64, 22, 43, 21]
+            ],
+            [
+                'data' => [53, 32, 33, 52, 13, 44, 32]
+            ]
+        ];
+        $categories = [2001, 2002, 2003, 2004, 2005, 2006, 2007];
+
+        $this->withData($data);
+        $this->withCategories($categories);
+    }
+
+    /**
+     * 设置图表数据
+     *
+     * @param array $data
+     *
+     * @return $this
+     */
+    public function withData(array $data)
+    {
+        return $this->option('series', $data);
+    }
+
+    /**
+     * 设置图表类别.
+     *
+     * @param array $data
+     *
+     * @return $this
+     */
+    public function withCategories(array $data)
+    {
+        return $this->option('xaxis.categories', $data);
+    }
+
+    /**
+     * 渲染图表
+     *
+     * @return string
+     */
+    public function render()
+    {
+        $this->buildData();
+
+        return parent::render();
+    }
+}

app/Admin/bootstrap.php

 <?php
 
+use App\Admin\Extensions\Show\Textarea;
 use Dcat\Admin\Admin;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid\Filter;
 use Dcat\Admin\Layout\Navbar;
 use Dcat\Admin\Show;
+use Dcat\Admin\Show\Field;
 
 /**
  * Dcat-admin - admin builder based on Laravel.
@@ -36,7 +38,7 @@ $primaryColor = '#009688';
 Admin::style(
     <<<CSS
 body {
-    font-size: 12px;
+    font-size: 12px;!important;
 }
 
 .content-body {
@@ -78,10 +80,29 @@ body.dark-mode .custom-data-table tbody td {
     height:30px;
 }
 
+.form-group .box-body {
+ height: 30px;
+ padding-top: 7px;!important;
+ padding-bottom: 10px;!important;
+}
+
+.col-sm-2 .control-label span{
+font-size: 12px;!important;
+}
+
 thead tr th{
 background: #f2f2f2;
 }
 
+.modal-xl {
+   min-width: 1600px;
+}
+
+.modal-body {
+ padding-left: 20px;
+ padding-right: 20px;
+}
+
 .form-group {
     margin-bottom:5px;
 }
@@ -131,6 +152,7 @@ Dcat\Admin\Color::extend('layui-green', [
     'link' => '#009688',
 ]);
 
+
 // 追加菜单
 Admin::menu()->add(include __DIR__ . '/menu.php', 0);
 
@@ -147,14 +169,10 @@ HTML
     if (!Dcat\Admin\Support\Helper::isAjaxRequest()) {
         $navbar->$method(App\Admin\Actions\AdminSetting::make()->render());
     }
-//    $navbar->right(view('admin.navbar-2'));
-    // 搜索框
     $navbar->right(
         <<<HTML
 HTML
     );
-    // 下拉面板
-//    $navbar->right(view('admin.navbar-1'));
 });
 
 
@@ -173,3 +191,8 @@ Grid::resolving(function (Grid $grid) {
         $filter->panel();
     });
 });
+
+
+//拓展组件
+Field::extend('textarea', Textarea::class);
+

app/Models/Cms/CmsUser.php

+<?php
+
+namespace App\Models\Cms;
+
+use Illuminate\Database\Eloquent\Model;
+
+class CmsUser extends Model
+{
+    protected $connection = 'cms';
+    protected $table = 'user_info';
+    public $timestamps = false;
+}

app/Models/Inquiry.php

@@ -2,6 +2,7 @@
 
 namespace App\Models;
 
+use App\Models\Cms\CmsUser;
 use App\Models\User;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -22,4 +23,9 @@ class Inquiry extends Model
         return $this->belongsTo(User::class, 'user_id', 'id');
     }
 
+    public function sales_user()
+    {
+        return $this->hasOne(CmsUser::class, 'userId', 'sales_id');
+    }
+
 }

config/database.php

@@ -63,6 +63,26 @@ return [
             ]) : [],
         ],
 
+        'cms' => [
+            'driver' => 'mysql',
+            'url' => env('DATABASE_URL'),
+            'host' => env('DB_CMS_HOST', '127.0.0.1'),
+            'port' => env('DB_CMS_PORT', '3306'),
+            'database' => env('DB_CMS_DATABASE', 'forge'),
+            'username' => env('DB_CMS_USERNAME', 'forge'),
+            'password' => env('DB_CMS_PASSWORD', ''),
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
+            'prefix' => '',
+            'prefix_indexes' => true,
+            'strict' => true,
+            'engine' => null,
+            'options' => extension_loaded('pdo_mysql') ? array_filter([
+                PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
+            ]) : [],
+        ],
+
         'pgsql' => [
             'driver' => 'pgsql',
             'url' => env('DATABASE_URL'),

resources/lang/en/inquiry-items.php

+<?php
+return [
+    'labels' => [
+        'Inquiry' => 'Inquiry',
+        'inquiry' => 'Inquiry',
+    ],
+    'fields' => [
+        'inquiry_id' => 'Id',
+        'goods_name' => 'Goods Name',
+        'brand_name' => 'Brand Name',
+        'inquiry_number' => 'Inquiry Number',
+        'status' => 'Status',
+        'remark' => 'Remark',
+    ],
+    'options' => [
+
+    ],
+];

resources/lang/en/inquiry.php

@@ -3,6 +3,8 @@ return [
     'labels' => [
         'Inquiry' => 'Inquiry',
         'inquiry' => 'Inquiry',
+        'inquiry_detail' => 'Inquiry Detail',
+        'handle' => 'Handle'
     ],
     'fields' => [
         'inquiry_id' => 'Id',
@@ -16,6 +18,12 @@ return [
         'create_time' => 'Create Time',
         'update_time' => 'update Time',
         'email' => 'email',
+        'user' => [
+            'phone' => 'Phone',
+        ],
+        'sales_user' => [
+            'name' => 'Sales Name',
+        ]
     ],
     'options' => [
         'status' => [
@@ -31,6 +39,10 @@ return [
         'user_types' => [
             1 => 'person',
             2 => 'company'
+        ],
+        'task_type' => [
+            1 => 'Inquiry',
+            2 => 'Bom'
         ]
     ],
 ];

resources/lang/zh_CN/global.php

@@ -6,6 +6,7 @@ return [
         'name' => '名称',
         'username' => '用户名',
         'email' => '邮箱',
+        'phone' => '电话',
         'http_path' => 'HTTP路径',
         'password' => '密码',
         'password_confirmation' => '确认密码',

resources/lang/zh_CN/inquiry-items.php

+<?php
+return [
+    'labels' => [
+        'Inquiry' => 'Inquiry',
+        'inquiry' => 'Inquiry',
+    ],
+    'fields' => [
+        'inquiry_id' => 'Id',
+        'status' => '状态',
+        'remark' => '备注',
+        'goods_name' => '商品名称',
+        'brand_name' => '品牌名称',
+        'inquiry_number' => '询价数量',
+    ],
+    'options' => [
+
+    ],
+];

resources/lang/zh_CN/inquiry.php

@@ -3,10 +3,13 @@ return [
     'labels' => [
         'Inquiry' => 'Inquiry',
         'inquiry' => 'Inquiry',
+        'inquiry_detail' => '询价详情',
+        'handle' => '处理'
     ],
     'fields' => [
         'inquiry_id' => 'Id',
         'sales_id' => '业务员ID',
+        'sales_name' => '业务员',
         'inquiry_sn' => '询价单号',
         'status' => '处理状态',
         'remark' => '备注',
@@ -15,8 +18,15 @@ return [
         'processing_time' => '处理时间',
         'create_time' => '添加时间',
         'update_time' => '修改时间',
+        'task_type' => '任务类型',
         'user' =>[
+            'id' => '客户编码',
             'email' => '邮箱',
+            'phone' => '电话',
+            'company_name' => '公司名称'
+        ],
+        'sales_user' => [
+            'name' => '业务员',
         ]
     ],
     'options' => [
@@ -33,6 +43,10 @@ return [
         'user_types' => [
             1 => '个人',
             2 => '公司'
+        ],
+        'task_type' => [
+            1 => '询价',
+            2 => 'bom'
         ]
     ],
 ];

resources/lang/zh_CN/menu.php

@@ -14,6 +14,7 @@ return [
         'scaffold' => '代码生成器',
         'icons' => '图标',
         'userAddress' => '用户地址',
-        'inquiry' => '询价管理'
+        'inquiry' => '询价管理',
+        'task' => '任务管理'
     ],
 ];

vendor/_laravel_idea/_ide_helper_model_builders_0bc8ba4a614febbde24e4579ada0a467.php

+<?php //8a895d771bb3f845a8ef0ad09e4db0a2
+/** @noinspection all */
+
+namespace LaravelIdea\Helper\App\Models\Cms {
+
+    use App\Models\Cms\CmsUser;
+    use Illuminate\Contracts\Support\Arrayable;
+    use Illuminate\Database\Query\Expression;
+    use Illuminate\Pagination\LengthAwarePaginator;
+    use Illuminate\Pagination\Paginator;
+    use LaravelIdea\Helper\_BaseBuilder;
+    use LaravelIdea\Helper\_BaseCollection;
+    
+    /**
+     * @method CmsUser|$this shift()
+     * @method CmsUser|$this pop()
+     * @method CmsUser|null get($key, $default = null)
+     * @method CmsUser|null pull($key, $default = null)
+     * @method CmsUser|null first(callable $callback = null, $default = null)
+     * @method CmsUser|null firstWhere(string $key, $operator = null, $value = null)
+     * @method CmsUser|null find($key, $default = null)
+     * @method CmsUser[] all()
+     * @method CmsUser|null last(callable $callback = null, $default = null)
+     * @method CmsUser|$this random(int|null $number = null)
+     */
+    class _IH_CmsUser_C extends _BaseCollection {
+        /**
+         * @param int $size
+         * @return CmsUser[][]
+         */
+        public function chunk($size)
+        {
+            return [];
+        }
+    }
+    
+    /**
+     * @method _IH_CmsUser_QB whereUserid($value)
+     * @method _IH_CmsUser_QB whereName($value)
+     * @method _IH_CmsUser_QB whereEngname($value)
+     * @method _IH_CmsUser_QB whereEmail($value)
+     * @method _IH_CmsUser_QB whereCodeSn($value)
+     * @method _IH_CmsUser_QB whereWorknumber($value)
+     * @method _IH_CmsUser_QB whereMobile($value)
+     * @method _IH_CmsUser_QB whereGender($value)
+     * @method _IH_CmsUser_QB whereIdcard($value)
+     * @method _IH_CmsUser_QB whereTel($value)
+     * @method _IH_CmsUser_QB whereWorkaddr($value)
+     * @method _IH_CmsUser_QB whereFax($value)
+     * @method _IH_CmsUser_QB whereDegree($value)
+     * @method _IH_CmsUser_QB whereSchoole($value)
+     * @method _IH_CmsUser_QB whereQq($value)
+     * @method _IH_CmsUser_QB whereWechat($value)
+     * @method _IH_CmsUser_QB whereDingtalk($value)
+     * @method _IH_CmsUser_QB whereHeader($value)
+     * @method _IH_CmsUser_QB whereCountry($value)
+     * @method _IH_CmsUser_QB whereProvince($value)
+     * @method _IH_CmsUser_QB whereCity($value)
+     * @method _IH_CmsUser_QB whereAddress($value)
+     * @method _IH_CmsUser_QB whereAbo($value)
+     * @method _IH_CmsUser_QB whereJoblevel($value)
+     * @method _IH_CmsUser_QB whereDepartmentId($value)
+     * @method _IH_CmsUser_QB whereDepartmentName($value)
+     * @method _IH_CmsUser_QB wherePositionId($value)
+     * @method _IH_CmsUser_QB wherePositionName($value)
+     * @method _IH_CmsUser_QB whereBirthday($value)
+     * @method _IH_CmsUser_QB whereSuperior($value)
+     * @method _IH_CmsUser_QB whereUnemploydate($value)
+     * @method _IH_CmsUser_QB whereEntrydate($value)
+     * @method _IH_CmsUser_QB wherePersonsite($value)
+     * @method _IH_CmsUser_QB whereResume($value)
+     * @method _IH_CmsUser_QB whereIntroduction($value)
+     * @method _IH_CmsUser_QB whereEmergencypeople($value)
+     * @method _IH_CmsUser_QB whereEmergencyphone($value)
+     * @method _IH_CmsUser_QB whereStatus($value)
+     * @method _IH_CmsUser_QB whereCtime($value)
+     * @method _IH_CmsUser_QB whereMtime($value)
+     * @method _IH_CmsUser_QB whereWechatUnionid($value)
+     * @method CmsUser create(array $attributes = [])
+     * @method _IH_CmsUser_C|CmsUser[] cursor()
+     * @method CmsUser|null|_IH_CmsUser_C|CmsUser[] find($id, array $columns = ['*'])
+     * @method _IH_CmsUser_C|CmsUser[] findMany(array|Arrayable $ids, array $columns = ['*'])
+     * @method CmsUser|_IH_CmsUser_C|CmsUser[] findOrFail($id, array $columns = ['*'])
+     * @method CmsUser|_IH_CmsUser_C|CmsUser[] findOrNew($id, array $columns = ['*'])
+     * @method CmsUser first(array|string $columns = ['*'])
+     * @method CmsUser firstOr(array|\Closure $columns = ['*'], \Closure $callback = null)
+     * @method CmsUser firstOrCreate(array $attributes, array $values = [])
+     * @method CmsUser firstOrFail(array $columns = ['*'])
+     * @method CmsUser firstOrNew(array $attributes = [], array $values = [])
+     * @method CmsUser firstWhere(array|\Closure|Expression|string $column, $operator = null, $value = null, string $boolean = 'and')
+     * @method CmsUser forceCreate(array $attributes)
+     * @method _IH_CmsUser_C|CmsUser[] fromQuery(string $query, array $bindings = [])
+     * @method _IH_CmsUser_C|CmsUser[] get(array|string $columns = ['*'])
+     * @method CmsUser getModel()
+     * @method CmsUser[] getModels(array|string $columns = ['*'])
+     * @method _IH_CmsUser_C|CmsUser[] hydrate(array $items)
+     * @method CmsUser make(array $attributes = [])
+     * @method CmsUser newModelInstance(array $attributes = [])
+     * @method LengthAwarePaginator|CmsUser[]|_IH_CmsUser_C paginate(int|null $perPage = null, array $columns = ['*'], string $pageName = 'page', int|null $page = null)
+     * @method Paginator|CmsUser[]|_IH_CmsUser_C simplePaginate(int|null $perPage = null, array $columns = ['*'], string $pageName = 'page', int|null $page = null)
+     * @method CmsUser updateOrCreate(array $attributes, array $values = [])
+     */
+    class _IH_CmsUser_QB extends _BaseBuilder {}
+}
\ No newline at end of file

vendor/_laravel_idea/_ide_helper_model_builders_76a5a1e066a6fb865b3628376050b5f0.php

-<?php //a628f6cb709e35c62b6245ff41ccbfb0
+<?php //51b738ad7196aff2d476327a5a52f55f
 /** @noinspection all */
 
 namespace LaravelIdea\Helper\App\Models {
@@ -218,17 +218,10 @@ namespace LaravelIdea\Helper\App\Models {
      * @method _IH_User_QB whereId($value)
      * @method _IH_User_QB whereName($value)
      * @method _IH_User_QB whereEmail($value)
-     * @method _IH_User_QB whereEmailVerifiedAt($value)
      * @method _IH_User_QB wherePassword($value)
-     * @method _IH_User_QB wherePhone($value)
      * @method _IH_User_QB whereRememberToken($value)
-     * @method _IH_User_QB whereAccountProperties($value)
-     * @method _IH_User_QB whereStatus($value)
-     * @method _IH_User_QB whereCompanyName($value)
-     * @method _IH_User_QB whereFirstName($value)
-     * @method _IH_User_QB whereLastName($value)
-     * @method _IH_User_QB whereCreatedTime($value)
-     * @method _IH_User_QB whereUpdateTime($value)
+     * @method _IH_User_QB whereCreatedAt($value)
+     * @method _IH_User_QB whereUpdatedAt($value)
      * @method User create(array $attributes = [])
      * @method _IH_User_C|User[] cursor()
      * @method User|null|_IH_User_C|User[] find($id, array $columns = ['*'])

vendor/_laravel_idea/_ide_helper_models_4266814c3f74f34daf45a0d5588ac82f.php

+<?php //ae694e426d4566e093948490e6267234
+/** @noinspection all */
+
+namespace App\Models\Cms {
+
+    use Illuminate\Database\Eloquent\Model;
+    use Illuminate\Support\Carbon;
+    use LaravelIdea\Helper\App\Models\Cms\_IH_CmsUser_C;
+    use LaravelIdea\Helper\App\Models\Cms\_IH_CmsUser_QB;
+    
+    /**
+     * @property int $userId
+     * @property string $name
+     * @property string $engName
+     * @property string $email
+     * @property string $code_sn
+     * @property string $workNumber
+     * @property string $mobile
+     * @property int $gender
+     * @property string $idCard
+     * @property string $tel
+     * @property string $workAddr
+     * @property string $fax
+     * @property string $degree
+     * @property string $schoole
+     * @property string $qq
+     * @property string $wechat
+     * @property string $dingtalk
+     * @property string $header
+     * @property string $country
+     * @property string $province
+     * @property string $city
+     * @property string $address
+     * @property string $abo
+     * @property string $jobLevel
+     * @property int $department_id
+     * @property string $department_name
+     * @property int $position_id
+     * @property string $position_name
+     * @property string $birthday
+     * @property string $superior
+     * @property string $unemployDate
+     * @property string $entryDate
+     * @property string $personSite
+     * @property string $resume
+     * @property string $introduction
+     * @property string $emergencyPeople
+     * @property string $emergencyPhone
+     * @property int $status
+     * @property Carbon $ctime
+     * @property Carbon $mtime
+     * @property string $wechat_unionid
+     * @method static _IH_CmsUser_QB onWriteConnection()
+     * @method _IH_CmsUser_QB newQuery()
+     * @method static _IH_CmsUser_QB on(null|string $connection = null)
+     * @method static _IH_CmsUser_QB query()
+     * @method static _IH_CmsUser_QB with(array|string $relations)
+     * @method _IH_CmsUser_QB newModelQuery()
+     * @method int increment(string $column, float|int $amount = 1, array $extra = [])
+     * @method int decrement(string $column, float|int $amount = 1, array $extra = [])
+     * @method static _IH_CmsUser_C|CmsUser[] all()
+     * @mixin _IH_CmsUser_QB
+     */
+    class CmsUser extends Model {}
+}
\ No newline at end of file

vendor/_laravel_idea/_ide_helper_models_fcbef240bab02b28bcdf663e7b60a935.php

-<?php //9d60455bb08465c866796eeaac0df050
+<?php //031e6111693c38b52094226e664456ed
 /** @noinspection all */
 
 namespace App\Models {
 
+    use App\Models\Cms\CmsUser;
     use Illuminate\Database\Eloquent\Model;
     use Illuminate\Database\Eloquent\Relations\BelongsTo;
+    use Illuminate\Database\Eloquent\Relations\HasOne;
     use Illuminate\Database\Eloquent\Relations\MorphToMany;
     use Illuminate\Notifications\DatabaseNotification;
     use Illuminate\Support\Carbon;
+    use LaravelIdea\Helper\App\Models\Cms\_IH_CmsUser_QB;
     use LaravelIdea\Helper\App\Models\_IH_InquiryItems_C;
     use LaravelIdea\Helper\App\Models\_IH_InquiryItems_QB;
     use LaravelIdea\Helper\App\Models\_IH_Inquiry_C;
@@ -34,6 +37,8 @@ namespace App\Models {
      * @property int $processing_time
      * @property int $create_time
      * @property int $update_time
+     * @property CmsUser $sales_user
+     * @method HasOne|_IH_CmsUser_QB sales_user()
      * @property User $user
      * @method BelongsTo|_IH_User_QB user()
      * @method static _IH_Inquiry_QB onWriteConnection()
@@ -45,6 +50,7 @@ namespace App\Models {
      * @method int increment(string $column, float|int $amount = 1, array $extra = [])
      * @method int decrement(string $column, float|int $amount = 1, array $extra = [])
      * @method static _IH_Inquiry_C|Inquiry[] all()
+     * @ownLinks user_id,\App\Models\User,id
      * @mixin _IH_Inquiry_QB
      */
     class Inquiry extends Model {}
@@ -80,17 +86,10 @@ namespace App\Models {
      * @property int $id
      * @property string $name
      * @property string $email
-     * @property Carbon|null $email_verified_at
      * @property string $password
-     * @property string $phone
-     * @property string $remember_token
-     * @property int $account_properties
-     * @property int $status
-     * @property string $company_name
-     * @property string $first_name
-     * @property string $last_name
-     * @property int $created_time
-     * @property int $update_time
+     * @property string|null $remember_token
+     * @property Carbon|null $created_at
+     * @property Carbon|null $updated_at
      * @property _IH_DatabaseNotification_C|DatabaseNotification[] $notifications
      * @property-read int $notifications_count
      * @method MorphToMany|_IH_DatabaseNotification_QB notifications()
@@ -109,6 +108,7 @@ namespace App\Models {
      * @method int increment(string $column, float|int $amount = 1, array $extra = [])
      * @method int decrement(string $column, float|int $amount = 1, array $extra = [])
      * @method static _IH_User_C|User[] all()
+     * @foreignLinks id,\App\Models\Inquiry,user_id
      * @mixin _IH_User_QB
      */
     class User extends Model {}