修正BUG

app/Admin/Actions/Grid/InquiryAssignment.php

@@ -24,6 +24,9 @@ class InquiryAssignment extends BatchAction
      */
     public function render()
     {
+        $assignment = admin_trans_label('assignment');
+
+        $button = '<button type="button" class="btn btn-success"">'.$assignment.'</button>';
         // 实例化表单类
         return Modal::make()
             ->lg()
@@ -32,7 +35,7 @@ class InquiryAssignment extends BatchAction
             //->on('click',$this->getModalScript2())
             ->onShow($this->getModalScript())
             // 因为此处使用了表单异步加载功能，所以一定要用 onLoad 方法
-            ->button('<button type="button" class="btn btn-success"">Assignment</button>');
+            ->button($button);
     }
 
 

app/Admin/Controllers/BaseProductCategoryController.php

@@ -69,14 +69,17 @@ class BaseProductCategoryController extends AdminController
         return Form::make(new BaseProductCategory(), function (Form $form) {
             $form->display('id', 'ID');
             $form->select('parent_id', admin_trans_field('parent'))
-                ->options(BaseProductCategory::selectOptions())
+                ->options(BaseProductCategory::selectMainOptions(function ($query) {
+                    // 在这里定义查询条件
+                    $query->where('parent_id', 0);
+                }))
                 ->saving(function ($v) {
                     return (int) $v;
                 });
             $form->text('name')->required();
             $form->select('parameter_id', admin_trans_field('parameter_name'))->options(BaseProductParameter::selectOptions())->required();
             $form->number('order')
-                ->default(0)
+                ->default(100)
                 ->rules('numeric')
                 ->help(admin_trans_label('order_tips')); // 添加备注
             $form->switch('enabled')->default(1);

app/Admin/Repositories/BaseProductCategory.php

@@ -7,6 +7,7 @@ use App\Models\BaseProductParameter;
 use Dcat\Admin\Repositories\EloquentRepository;
 use Dcat\Admin\Traits\HasDateTimeFormatter;
 use Dcat\Admin\Traits\ModelTree;
+use Illuminate\Support\Facades\Session;
 
 class BaseProductCategory extends EloquentRepository
 {
@@ -24,10 +25,44 @@ class BaseProductCategory extends EloquentRepository
     // 调用模型方法
     public static function selectOptions(\Closure $closure = null)
     {
-       $selectOptions =  Model::class::selectOptions($closure);
+        if (!$closure) {
+            $closure = function ($query) {
+                $query = $query->where('enabled', 1);
+                $query =  $query->orderBy('order', 'asc');
+                return $query;
+            };
+        }
+
+        $selectOptions =  Model::class::selectOptions($closure);
         return $selectOptions;
     }
 
+    public static function selectMainOptions(\Closure $closure = null)
+    {
+        $query = Model::query();
+
+        //通过传入条件限制
+        if ($closure) {
+            $closure($query);
+        }
+
+        // 确保查询构造器不为空
+        if (!$query) {
+            return [];
+        }
+
+        // 返回键值对数组，并按 'name' 和 'order' 字段排序
+        $results = $query->orderBy('name')->orderBy('order')->pluck('name', 'id');
+
+        // 在每个 name 前面加上 '├─'
+        $results = $results->map(function ($name) {
+            return '├─' . $name;
+        });
+
+        return $results->all();
+
+    }
+
 
     public static function getParameter($categoryId)
     {

app/Admin/Repositories/BaseVideoCategory.php

@@ -17,6 +17,14 @@ class BaseVideoCategory extends EloquentRepository
     // 调用模型方法
     public static function selectOptions(\Closure $closure = null)
     {
+        if (!$closure) {
+            $closure = function ($query) {
+                $query = $query->where('enabled', 1);
+                $query =  $query->orderBy('order', 'asc');
+                return $query;
+            };
+        }
+
         $selectOptions =  Model::class::selectOptions($closure);
         return $selectOptions;
     }

app/Admin/Repositories/DistInquiry.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Repositories;
 
 use App\Models\DistInquiry as Model;
+use Carbon\Carbon;
 use Dcat\Admin\Repositories\EloquentRepository;
 
 class DistInquiry extends EloquentRepository
@@ -34,6 +35,7 @@ class DistInquiry extends EloquentRepository
         foreach ($inquiries as $inquiry) {
             $inquiry->dist_id = $distId;
             $inquiry->status = 1;
+            $inquiry->allocate_time = Carbon::now();
             $inquiry->save();
         }
     }

app/Distributor/Controllers/DistProductCategoryController.php

@@ -119,7 +119,7 @@ class DistProductCategoryController extends AdminController
                 });
             $form->text('name')->required();
             $form->number('order')
-                ->default(0)
+                ->default(100)
                 ->rules('numeric')
                 ->help(admin_trans_label('order_tips')); // 添加备注
             $form->switch('enabled')->default(1);

app/Distributor/Repositories/DistProductCategory.php

@@ -64,8 +64,16 @@ class DistProductCategory extends EloquentRepository
     // 调用模型方法
     public static function selectOptions(\Closure $closure = null)
     {
-        $selectOptions = Model::class::selectOptions($closure);
+        if (!$closure) {
+            $closure = function ($query) {
+                $query = $query->where('dist_id', getDistributorId());
+                $query = $query->where('enabled', 1);
+                $query =  $query->orderBy('order', 'asc');
+                return $query;
+            };
+        }
 
+        $selectOptions = Model::class::selectOptions($closure);
         return $selectOptions;
     }
 

app/Distributor/Repositories/DistVideoCategory.php

@@ -17,6 +17,15 @@ class DistVideoCategory extends EloquentRepository
     // 调用模型方法
     public static function selectOptions(\Closure $closure = null)
     {
+        if (!$closure) {
+            $closure = function ($query) {
+                $query = $query->where('dist_id', getDistributorId());
+                $query = $query->where('enabled', 1);
+                $query =  $query->orderBy('order', 'asc');
+                return $query;
+            };
+        }
+
         $selectOptions =  Model::class::selectOptions($closure);
         return $selectOptions;
     }

app/Models/BaseProductCategory.php

@@ -8,7 +8,7 @@ use Dcat\Admin\Traits\ModelTree;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\EloquentSortable\Sortable;
 
-class BaseProductCategory extends Model implements Sortable
+class BaseProductCategory extends Model
 {
     use HasDateTimeFormatter,
         ModelTree {

lang/zh_CN/global.php

@@ -65,6 +65,7 @@ return [
         'folder'                => '文件夹名称',
         'imported'              => '是否导入',
         'describe'              => '描述',
+
     ],
     'labels' => [
         'list'         => '列表',
@@ -94,6 +95,7 @@ return [
         'import_tmpl'  => '导入模板',
         'category_name'         => '分类名称',
         'parameter_name'        => '参数名称',
+        'assignment'            => '分配',
     ],
     'options' => [
         //