From 88033317efb033c046096be876b44c93209e0d60 Mon Sep 17 00:00:00 2001 From: panliang <1163816051@qq.com> Date: Fri, 26 Apr 2024 08:34:34 +0800 Subject: [PATCH] fix bug --- app/Admin/Controllers/AgreementController.php | 1 + app/Admin/Controllers/Complaint/ComplaintController.php | 1 + app/Admin/Controllers/Complaint/FeedbackController.php | 1 + .../Controllers/Finance/CommissionIncomeController.php | 1 + app/Admin/Controllers/Finance/LedgerController.php | 1 + app/Admin/Controllers/Finance/ReimbursementController.php | 1 + app/Admin/Controllers/Finance/SalesStatisticController.php | 1 + .../Controllers/Finance/StoreMasterCommissionController.php | 1 + app/Admin/Controllers/Finance/StoreStatisticController.php | 1 + app/Admin/Controllers/Hr/EmployeeController.php | 1 + app/Admin/Controllers/Hr/HolidayController.php | 1 + app/Admin/Controllers/Hr/OfficalBusinessController.php | 1 + app/Admin/Controllers/Hr/OvertimeController.php | 1 + app/Admin/Controllers/Hr/PromotionController.php | 1 + app/Admin/Controllers/Hr/RestController.php | 1 + app/Admin/Controllers/Hr/SignController.php | 1 + app/Admin/Controllers/Hr/SignRepairController.php | 1 + app/Admin/Controllers/Plan/PlanController.php | 1 + app/Admin/Controllers/Store/DeviceController.php | 1 + app/Admin/Controllers/Store/EmployeeController.php | 1 + app/Admin/Controllers/Store/StoreController.php | 3 ++- app/Admin/Controllers/System/AdminUserController.php | 1 + app/Admin/Controllers/System/KeywordController.php | 1 + app/Admin/Controllers/System/WorkflowController.php | 1 + app/Admin/Controllers/Train/BookController.php | 1 + app/Admin/Controllers/Train/ExaminationController.php | 1 + app/Admin/Controllers/Train/PaperController.php | 1 + app/Admin/Controllers/Train/QuestionController.php | 1 + app/Admin/Services/StoreService.php | 4 ++-- app/Models/Store.php | 4 +++- .../migrations/2024_03_23_095309_create_stores_table.php | 6 ++++++ 31 files changed, 40 insertions(+), 4 deletions(-) diff --git a/app/Admin/Controllers/AgreementController.php b/app/Admin/Controllers/AgreementController.php index 8876594..c1a8238 100644 --- a/app/Admin/Controllers/AgreementController.php +++ b/app/Admin/Controllers/AgreementController.php @@ -51,6 +51,7 @@ class AgreementController extends AdminController ->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('id')->label(__('agreement.id')), amisMake()->TableColumn()->name('name')->label(__('agreement.name')), diff --git a/app/Admin/Controllers/Complaint/ComplaintController.php b/app/Admin/Controllers/Complaint/ComplaintController.php index 36a9725..46037cc 100644 --- a/app/Admin/Controllers/Complaint/ComplaintController.php +++ b/app/Admin/Controllers/Complaint/ComplaintController.php @@ -43,6 +43,7 @@ class ComplaintController extends AdminController ->options(ComplaintStatus::options()), ]), ])) + ->filterDefaultVisible() ->columns([ amis()->TableColumn()->name('created_at')->label(__('complaint.complaint.created_at')), amis()->TableColumn() diff --git a/app/Admin/Controllers/Complaint/FeedbackController.php b/app/Admin/Controllers/Complaint/FeedbackController.php index 2347923..e82ee4d 100644 --- a/app/Admin/Controllers/Complaint/FeedbackController.php +++ b/app/Admin/Controllers/Complaint/FeedbackController.php @@ -35,6 +35,7 @@ class FeedbackController extends AdminController ->columnRatio(4), ]), ])) + ->filterDefaultVisible() ->columns([ amis()->TableColumn()->name('id')->label(__('complaint.feedback.id')), amis()->TableColumn()->name('employee.name')->label(__('complaint.feedback.employee')), diff --git a/app/Admin/Controllers/Finance/CommissionIncomeController.php b/app/Admin/Controllers/Finance/CommissionIncomeController.php index 840f5d7..d05b868 100644 --- a/app/Admin/Controllers/Finance/CommissionIncomeController.php +++ b/app/Admin/Controllers/Finance/CommissionIncomeController.php @@ -44,6 +44,7 @@ class CommissionIncomeController extends AdminController ->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amis()->TableColumn('expected_commission', '预期佣金'), amis()->TableColumn('actual_commission', '实际佣金'), diff --git a/app/Admin/Controllers/Finance/LedgerController.php b/app/Admin/Controllers/Finance/LedgerController.php index d432c3b..ae28d1d 100644 --- a/app/Admin/Controllers/Finance/LedgerController.php +++ b/app/Admin/Controllers/Finance/LedgerController.php @@ -75,6 +75,7 @@ class LedgerController extends AdminController ->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ // amis()->TableColumn()->name('id')->label(__('finance.ledger.id')), amis()->TableColumn()->name('date')->label(__('finance.ledger.date')), diff --git a/app/Admin/Controllers/Finance/ReimbursementController.php b/app/Admin/Controllers/Finance/ReimbursementController.php index 056f6d8..c255d6c 100644 --- a/app/Admin/Controllers/Finance/ReimbursementController.php +++ b/app/Admin/Controllers/Finance/ReimbursementController.php @@ -48,6 +48,7 @@ class ReimbursementController extends AdminController ->columnRatio(4), ]), ])) + ->filterDefaultVisible() ->columns([ // amis()->TableColumn()->name('id')->label(__('finance.reimbursement.id')), amis()->TableColumn()->name('employee.name')->label(__('finance.reimbursement.employee')), diff --git a/app/Admin/Controllers/Finance/SalesStatisticController.php b/app/Admin/Controllers/Finance/SalesStatisticController.php index 771d210..3e9ca6c 100644 --- a/app/Admin/Controllers/Finance/SalesStatisticController.php +++ b/app/Admin/Controllers/Finance/SalesStatisticController.php @@ -45,6 +45,7 @@ class SalesStatisticController extends AdminController ->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amis()->TableColumn('name', '彩种'), amis()->TableColumn('sales', '销量'), diff --git a/app/Admin/Controllers/Finance/StoreMasterCommissionController.php b/app/Admin/Controllers/Finance/StoreMasterCommissionController.php index d3b5a4d..c19f6d1 100644 --- a/app/Admin/Controllers/Finance/StoreMasterCommissionController.php +++ b/app/Admin/Controllers/Finance/StoreMasterCommissionController.php @@ -45,6 +45,7 @@ class StoreMasterCommissionController extends AdminController ->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amis()->TableColumn('id', __('finance.store_master_commission.id')), amis()->TableColumn('month', __('finance.store_master_commission.month')), diff --git a/app/Admin/Controllers/Finance/StoreStatisticController.php b/app/Admin/Controllers/Finance/StoreStatisticController.php index fd054ee..d9b78f5 100644 --- a/app/Admin/Controllers/Finance/StoreStatisticController.php +++ b/app/Admin/Controllers/Finance/StoreStatisticController.php @@ -41,6 +41,7 @@ class StoreStatisticController extends AdminController ->extractValue(false), ]), ])) + ->filterDefaultVisible() ->columns([ amis()->TableColumn('ranking', '排序'), amis()->TableColumn('store.title', '门店'), diff --git a/app/Admin/Controllers/Hr/EmployeeController.php b/app/Admin/Controllers/Hr/EmployeeController.php index e460687..8c05cec 100644 --- a/app/Admin/Controllers/Hr/EmployeeController.php +++ b/app/Admin/Controllers/Hr/EmployeeController.php @@ -31,6 +31,7 @@ class EmployeeController extends AdminController amisMake()->SelectControl()->name('employee_status')->label(__('employee.employee_status'))->columnRatio(3)->clearable()->options(EmployeeStatus::options()), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('id')->label(__('employee.id')), amisMake()->TableColumn()->name('name')->label(__('employee.name')), diff --git a/app/Admin/Controllers/Hr/HolidayController.php b/app/Admin/Controllers/Hr/HolidayController.php index b43d308..20c2af6 100644 --- a/app/Admin/Controllers/Hr/HolidayController.php +++ b/app/Admin/Controllers/Hr/HolidayController.php @@ -54,6 +54,7 @@ class HolidayController extends AdminController ->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('id')->label(__('holiday_apply.id')), amisMake()->TableColumn()->name('store.title')->label(__('employee_sign.store_id')), diff --git a/app/Admin/Controllers/Hr/OfficalBusinessController.php b/app/Admin/Controllers/Hr/OfficalBusinessController.php index eab4551..e853e03 100644 --- a/app/Admin/Controllers/Hr/OfficalBusinessController.php +++ b/app/Admin/Controllers/Hr/OfficalBusinessController.php @@ -48,6 +48,7 @@ class OfficalBusinessController extends AdminController ->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('store.title')->label(__('offical_business.store_id')), amisMake()->TableColumn()->name('employee.name')->label(__('offical_business.employee_id')), diff --git a/app/Admin/Controllers/Hr/OvertimeController.php b/app/Admin/Controllers/Hr/OvertimeController.php index 5fbfd46..43dab2c 100644 --- a/app/Admin/Controllers/Hr/OvertimeController.php +++ b/app/Admin/Controllers/Hr/OvertimeController.php @@ -51,6 +51,7 @@ class OvertimeController extends AdminController ->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('store.title')->label(__('overtime_apply.store_id')), amisMake()->TableColumn()->name('employee.name')->label(__('overtime_apply.employee_id')), diff --git a/app/Admin/Controllers/Hr/PromotionController.php b/app/Admin/Controllers/Hr/PromotionController.php index 1e8e9ec..bc582fa 100644 --- a/app/Admin/Controllers/Hr/PromotionController.php +++ b/app/Admin/Controllers/Hr/PromotionController.php @@ -28,6 +28,7 @@ class PromotionController extends AdminController ...$this->baseHeaderToolBar(), ]) ->bulkActions([]) + ->filterDefaultVisible() ->filter($this->baseFilter()->body([ amis()->GroupControl()->mode('horizontal')->body([ amisMake()->SelectControl()->name('store_id')->label(__('employee_promotion.store_id')) diff --git a/app/Admin/Controllers/Hr/RestController.php b/app/Admin/Controllers/Hr/RestController.php index d103dba..f7777e2 100644 --- a/app/Admin/Controllers/Hr/RestController.php +++ b/app/Admin/Controllers/Hr/RestController.php @@ -30,6 +30,7 @@ class RestController extends AdminController amisMake()->DateRangeControl()->name('date_range')->label(__('employee_sign.date'))->columnRatio(3)->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('employee.name')->label(__('employee.name')), // amisMake()->TableColumn()->name('employee.phone')->label(__('employee.phone')), diff --git a/app/Admin/Controllers/Hr/SignController.php b/app/Admin/Controllers/Hr/SignController.php index f9ad33c..fbd5d1c 100644 --- a/app/Admin/Controllers/Hr/SignController.php +++ b/app/Admin/Controllers/Hr/SignController.php @@ -38,6 +38,7 @@ class SignController extends AdminController amisMake()->DateRangeControl()->name('date_range')->label(__('employee_sign.date'))->columnRatio(3)->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('date')->label(__('employee_sign.date')), amisMake()->TableColumn()->name('store.title')->label(__('employee_sign.store_id')), diff --git a/app/Admin/Controllers/Hr/SignRepairController.php b/app/Admin/Controllers/Hr/SignRepairController.php index e44e568..447a022 100644 --- a/app/Admin/Controllers/Hr/SignRepairController.php +++ b/app/Admin/Controllers/Hr/SignRepairController.php @@ -52,6 +52,7 @@ class SignRepairController extends AdminController ->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('id')->label(__('employee_sign_repair.id')), amisMake()->TableColumn()->name('store.title')->label(__('employee_sign_repair.store_id')), diff --git a/app/Admin/Controllers/Plan/PlanController.php b/app/Admin/Controllers/Plan/PlanController.php index 779ec20..1898268 100644 --- a/app/Admin/Controllers/Plan/PlanController.php +++ b/app/Admin/Controllers/Plan/PlanController.php @@ -62,6 +62,7 @@ class PlanController extends AdminController ->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amis()->TableColumn('id', __('plan.plan.id')), amis()->TableColumn('name', __('plan.plan.name')), diff --git a/app/Admin/Controllers/Store/DeviceController.php b/app/Admin/Controllers/Store/DeviceController.php index 98e3efd..8c956c6 100644 --- a/app/Admin/Controllers/Store/DeviceController.php +++ b/app/Admin/Controllers/Store/DeviceController.php @@ -35,6 +35,7 @@ class DeviceController extends AdminController amisMake()->TextControl()->name('name')->label(__('store_device.name'))->columnRatio(3)->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('id')->label(__('store_device.id')), amisMake()->TableColumn()->name('store.title')->label(__('store_device.store_id')), diff --git a/app/Admin/Controllers/Store/EmployeeController.php b/app/Admin/Controllers/Store/EmployeeController.php index d007bd0..0624e2b 100644 --- a/app/Admin/Controllers/Store/EmployeeController.php +++ b/app/Admin/Controllers/Store/EmployeeController.php @@ -36,6 +36,7 @@ class EmployeeController extends AdminController amisMake()->TextControl()->name('employee_search')->label(__('store.employees'))->placeholder('姓名/电话')->columnRatio(3)->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('store.title')->label(__('employee.store_id')), amisMake()->TableColumn()->name('name')->label(__('employee.name')), diff --git a/app/Admin/Controllers/Store/StoreController.php b/app/Admin/Controllers/Store/StoreController.php index 0ef91bf..379b1e3 100644 --- a/app/Admin/Controllers/Store/StoreController.php +++ b/app/Admin/Controllers/Store/StoreController.php @@ -56,6 +56,7 @@ class StoreController extends AdminController amis()->SelectControl()->name('business_status')->label(__('store.business_status'))->options(BusinessStatus::options())->columnRatio(3)->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amis()->TableColumn()->name('id')->label(__('store.id')), amis()->TableColumn()->name('title')->label(__('store.title')), @@ -111,7 +112,7 @@ class StoreController extends AdminController ->showSteps(false) ->required(), amis()->InputCityControl()->name('region')->label(__('store.region'))->allowDistrict(false)->extractValue(false)->required(), - amis()->LocationControl()->name('location')->label(__('store.location'))->ak(config('baidu.js_secret'))->autoSelectCurrentLoc(), + amis()->LocationControl()->name('region')->label(__('store.location'))->ak(config('baidu.js_secret'))->autoSelectCurrentLoc()->required(), ]); } diff --git a/app/Admin/Controllers/System/AdminUserController.php b/app/Admin/Controllers/System/AdminUserController.php index 1612211..a062586 100644 --- a/app/Admin/Controllers/System/AdminUserController.php +++ b/app/Admin/Controllers/System/AdminUserController.php @@ -32,6 +32,7 @@ class AdminUserController extends AdminController ->size('md') ->placeholder(__('admin.admin_user.search_username')) )) + ->filterDefaultVisible() ->quickSaveItemApi($this->getQuickEditItemPath(['lock'])) ->itemCheckableOn('${id !== 1}') ->columns([ diff --git a/app/Admin/Controllers/System/KeywordController.php b/app/Admin/Controllers/System/KeywordController.php index 49c4688..2bc26a6 100644 --- a/app/Admin/Controllers/System/KeywordController.php +++ b/app/Admin/Controllers/System/KeywordController.php @@ -41,6 +41,7 @@ class KeywordController extends AdminController ->placeholder(__('admin.keywords.search_name')), ] )) + ->filterDefaultVisible() ->columns([ // TableColumn::make()->name('id')->label('ID')->sortable(true), TableColumn::make()->name('name')->label('名称'), diff --git a/app/Admin/Controllers/System/WorkflowController.php b/app/Admin/Controllers/System/WorkflowController.php index 75cf490..c4e271a 100644 --- a/app/Admin/Controllers/System/WorkflowController.php +++ b/app/Admin/Controllers/System/WorkflowController.php @@ -42,6 +42,7 @@ class WorkflowController extends AdminController amisMake()->TextControl()->name('search')->label(__('admin.keyword'))->placeholder(__('workflow.key').'/'.__('workflow.name'))->columnRatio(3)->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('id')->label(__('workflow.id')), amisMake()->TableColumn()->name('key')->label(__('workflow.key')), diff --git a/app/Admin/Controllers/Train/BookController.php b/app/Admin/Controllers/Train/BookController.php index 4d50523..4a78652 100644 --- a/app/Admin/Controllers/Train/BookController.php +++ b/app/Admin/Controllers/Train/BookController.php @@ -37,6 +37,7 @@ class BookController extends AdminController amisMake()->SelectControl()->options(BookType::options())->name('type')->label(__('train_book.type'))->columnRatio(3)->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('id')->label(__('train_book.id')), amisMake()->TableColumn()->name('category.name')->label(__('train_book.category_id')), diff --git a/app/Admin/Controllers/Train/ExaminationController.php b/app/Admin/Controllers/Train/ExaminationController.php index 1171d5c..46f1543 100644 --- a/app/Admin/Controllers/Train/ExaminationController.php +++ b/app/Admin/Controllers/Train/ExaminationController.php @@ -34,6 +34,7 @@ class ExaminationController extends AdminController amisMake()->SelectControl()->options(ExamStatus::options())->name('exam_status')->label(__('train_examination.exam_status'))->columnRatio(3)->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('id')->label(__('train_examination.id')), amisMake()->TableColumn()->name('name')->label(__('train_examination.name')), diff --git a/app/Admin/Controllers/Train/PaperController.php b/app/Admin/Controllers/Train/PaperController.php index 7f59942..2511ac6 100644 --- a/app/Admin/Controllers/Train/PaperController.php +++ b/app/Admin/Controllers/Train/PaperController.php @@ -30,6 +30,7 @@ class PaperController extends AdminController amisMake()->TextControl()->name('employee_search')->label(__('train_paper.employee_id'))->columnRatio(3)->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('id')->label(__('train_paper.id')), amisMake()->TableColumn()->name('examination.name')->label(__('train_paper.examination_id')), diff --git a/app/Admin/Controllers/Train/QuestionController.php b/app/Admin/Controllers/Train/QuestionController.php index 70445c4..2dc9b22 100644 --- a/app/Admin/Controllers/Train/QuestionController.php +++ b/app/Admin/Controllers/Train/QuestionController.php @@ -31,6 +31,7 @@ class QuestionController extends AdminController amisMake()->SelectControl()->options(QuestionCate::options())->name('cate')->label(__('train_question.cate'))->columnRatio(3)->clearable(), ]), ])) + ->filterDefaultVisible() ->columns([ amisMake()->TableColumn()->name('id')->label(__('train_question.id')), amisMake()->TableColumn()->name('title')->label(__('train_question.title')), diff --git a/app/Admin/Services/StoreService.php b/app/Admin/Services/StoreService.php index 4648905..2f55b33 100644 --- a/app/Admin/Services/StoreService.php +++ b/app/Admin/Services/StoreService.php @@ -137,8 +137,8 @@ class StoreService extends BaseService 'business_id' => __('store.business_id'), 'level_id' => __('store.level_id'), 'region' => __('store.region'), - 'lon' => __('store.lon'), - 'lat' => __('store.lat'), + 'lon' => __('store.location'), + 'lat' => __('store.location'), 'profit_ratio' => __('store.profit_ratio'), ] ); diff --git a/app/Models/Store.php b/app/Models/Store.php index 4ef9cca..cbebd89 100644 --- a/app/Models/Store.php +++ b/app/Models/Store.php @@ -21,11 +21,13 @@ class Store extends Model 'profit_ratio' => 0, ]; - protected $fillable = ['title', 'master_id', 'category_id', 'business_id', 'level_id', 'region', 'lon', 'lat', 'address', 'profit_ratio', 'profit_money', 'business_status']; + protected $fillable = ['title', 'master_id', 'category_id', 'business_id', 'level_id', 'region', 'location', 'lon', 'lat', 'address', 'profit_ratio', 'profit_money', 'business_status']; protected $casts = [ // 地区 {province: 四川省, city: 成都市} 'region' => 'json', + // {address: 重庆市綦江区古南街道中山路1号, lng: 106.65781638883, lat: 29.033745284277, city: 重庆市, vendor: baidu} + 'location' => 'json', 'business_status' => BusinessStatus::class, ]; diff --git a/database/migrations/2024_03_23_095309_create_stores_table.php b/database/migrations/2024_03_23_095309_create_stores_table.php index 91a5a68..bcc7bce 100644 --- a/database/migrations/2024_03_23_095309_create_stores_table.php +++ b/database/migrations/2024_03_23_095309_create_stores_table.php @@ -22,6 +22,12 @@ return new class extends Migration $table->string('address')->nullable()->comment('详细地址'); $table->string('lon')->comment('精度'); $table->string('lat')->comment('纬度'); + // "address" => "重庆市綦江区古南街道中山路1号" + // "lat" => 29.033745284277 + // "lng" => 106.65781638883 + // "city" => "重庆市" + // "vendor" => "baidu" + $table->json('location')->nullable()->comment('位置信息'); $table->decimal('profit_ratio', 5, 2)->unsigned()->default(0)->comment('佣金比例(0-100)'); $table->decimal('profit_money')->default(0)->comment('累计佣金'); $table->string('business_status')->default(1)->comment('营业状态{1: 开业, 2: 关闭}');