修复询价的BUG

app/Admin/Controllers/DistAppearanceController.php

@@ -44,7 +44,6 @@ class DistAppearanceController extends AdminController
             $grid->column('enabled')->switch();
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
-
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('title');
             });
@@ -85,11 +84,14 @@ class DistAppearanceController extends AdminController
         return Form::make(new DistAppearance(), function (Form $form) {
             $form->display('id');
             $form->text('title');
-            $form->text('cover_image');
-            $form->text('describe');
+            $form->image("cover_image")
+                ->autoUpload()
+                ->uniqueName()
+                ->accept(config('admin.upload.oss_image.accept'))
+                ->maxSize(config('admin.upload.oss_image.max_size'))
+                ->dir('images/appearance/'.date("Ymd"));//
+            $form->textarea('describe');
             $form->switch('enabled')->default(1);
-            $form->display('created_at');
-            $form->display('updated_at');
         });
     }
 }

app/Admin/Controllers/DistInquiryController.php

@@ -43,7 +43,7 @@ class DistInquiryController extends AdminController
             $grid->column('email');
             $grid->column('consulting_products');
             //$grid->column('distributor.username', 'Distributor Username');
-            $grid->column('distributor.name', 'Distributor Company Name');
+            $grid->column('distributor.company_name', 'Distributor Company Name');
             $grid->column('status')->using(config('dictionary.inquiryStatus'))->label([
                 0 => 'default',
                 1 => 'info',
@@ -94,7 +94,7 @@ class DistInquiryController extends AdminController
             $show->field('ip_address');
             $show->field('status')->using(config('dictionary.inquiryStatus'));
             $show->field('allocate_time');
-            $show->field('distributor.name','Distributor Company Name');
+            $show->field('distributor.company_name','Distributor Company Name');
             $show->field('content');
             $show->field('created_at');
             $show->field('updated_at');

app/Admin/Forms/InquiryAssignment.php

@@ -5,7 +5,7 @@ namespace App\Admin\Forms;
 use Dcat\Admin\Contracts\LazyRenderable;
 use Dcat\Admin\Widgets\Form;
 use App\Admin\Repositories\DistInquiry;
-use App\Admin\Renderable\DistUserTable;
+use App\Admin\Renderable\DistDistributorTable;
 use Dcat\Admin\Models\DistAdminUser;
 use Dcat\Admin\Traits\LazyWidget;
 
@@ -14,7 +14,7 @@ class InquiryAssignment extends Form
     // 处理请求
     public function handle(array $input)
     {
-        $distUserId = $input['distUserId'] ?? null;
+        $distId = $input['distId'] ?? null;
         $id = $input['id'] ?? null;
         if (empty($id)) {
             return $this->response()->error('No data selected!');
@@ -25,15 +25,15 @@ class InquiryAssignment extends Form
             return $this->response()->error('The data cannot be assigned!');
         }
         //分配数据
-        DistInquiry::assignData($ids, $distUserId);
+        DistInquiry::assignData($ids, $distId);
         return $this->response()->success('allocation successful')->refresh();
     }
 
     public function form()
     {
-        $this->selectTable('distUserId', 'Select Username')
-            ->title('distUserId')
-            ->from(DistUserTable::make());
+        $this->selectTable('distId', 'Select Distributor')
+            ->title('distId')
+            ->from(DistDistributorTable::make());
         // 设置隐藏表单，传递用户id
         $this->hidden('id')->attribute('id', 'inquiryIds');
     }

app/Admin/Renderable/DistDistributorTable.php

@@ -9,8 +9,6 @@ class DistDistributorTable extends LazyRenderable
 {
     public function grid(): Grid
     {
-        // 获取外部传递的参数
-        $id = $this->id;
 
         return Grid::make(new DistAdminDistributor(), function (Grid $grid) {
             $grid->column('id');

app/Admin/Repositories/DistInquiry.php

@@ -29,10 +29,10 @@ class DistInquiry extends EloquentRepository
     /*
      * 分配询价单
      */
-    public static function assignData($ids, $distUserId) {
+    public static function assignData($ids, $distId) {
         $inquiries = Model::whereIn('id', $ids)->get();
         foreach ($inquiries as $inquiry) {
-            $inquiry->dist_user_id = $distUserId;
+            $inquiry->dist_id = $distId;
             $inquiry->status = 1;
             $inquiry->save();
         }

app/Models/DistInquiry.php

@@ -16,7 +16,7 @@ class DistInquiry extends Model
      */
     public function distributor()
     {
-        return $this->hasOne(DistAdminUser::class,'id', 'dist_user_id');
+        return $this->hasOne(DistAdminDistributor::class,'id', 'dist_id');
     }
 
     /*