diff --git a/plugin/admin/app/controller/LogisticsShipController.php b/plugin/admin/app/controller/LogisticsShipController.php index 1caa267..7ee3406 100644 --- a/plugin/admin/app/controller/LogisticsShipController.php +++ b/plugin/admin/app/controller/LogisticsShipController.php @@ -7,12 +7,18 @@ use support\Response; use plugin\admin\app\model\LogisticsShip; use plugin\admin\app\controller\Crud; use support\exception\BusinessException; +use util\Util; /** * 船舶信息 */ class LogisticsShipController extends Crud { + /** + * 不需要鉴权的方法 + * @var string[] + */ + protected $noNeedAuth = ['getAll']; /** * @var LogisticsShip @@ -87,4 +93,11 @@ class LogisticsShipController extends Crud ]); } + public function getAll() + { + $lang = session('lang', 'zh-cn'); + $locations = LogisticsShip::whereIn('status',[0,1])->get(); + return Util::success($locations); + } + } diff --git a/plugin/admin/app/controller/VehicleController.php b/plugin/admin/app/controller/VehicleController.php index 25d9ca4..bba65f5 100644 --- a/plugin/admin/app/controller/VehicleController.php +++ b/plugin/admin/app/controller/VehicleController.php @@ -280,6 +280,18 @@ class VehicleController extends Crud $sourceLang = $languages[$lang]; unset($languages[$lang]); + $data_t = $data; + unset($data['brand']); + unset($data['model']); + unset($data['purchase']); + unset($data['procedure_location']); + unset($data['fbo_destination']); + foreach ($translationModels as $model) { + $vehicle = $model::find($data_t['id']); + $vehicle->fill($data_t); + $vehicle->save(); + } + // 创建翻译服务实例 $translatorService = new \app\service\TranslatorService(); foreach ($languages as $lang) { diff --git a/plugin/admin/app/lang/ar/vehicle.php b/plugin/admin/app/lang/ar/vehicle.php index 64abc9a..579eb3f 100644 --- a/plugin/admin/app/lang/ar/vehicle.php +++ b/plugin/admin/app/lang/ar/vehicle.php @@ -73,6 +73,8 @@ return [ 'select_location' => 'اختر الموقع', 'select_final_location' => 'اختر الوجهة', 'select_fbo_location' => 'اختر ميناء FBO', + 'ship' => 'سفن النقل', + 'please_ship' => 'الرجاء اختيار السفينة', // الترقيم 'pagination_total' => 'إجمالي {total} عنصر', diff --git a/plugin/admin/app/lang/en/vehicle.php b/plugin/admin/app/lang/en/vehicle.php index 4bbe9fc..4f43b6e 100644 --- a/plugin/admin/app/lang/en/vehicle.php +++ b/plugin/admin/app/lang/en/vehicle.php @@ -73,6 +73,8 @@ return [ 'select_location' => 'Select Location', 'select_final_location' => 'Select Destination', 'select_fbo_location' => 'Select FBO Port', + 'ship' => 'Transport Ships', + 'please_ship' => 'Please select a vessel', // Pagination related 'pagination_total' => 'Total {total} items', diff --git a/plugin/admin/app/lang/ru/vehicle.php b/plugin/admin/app/lang/ru/vehicle.php index 37f2edc..86525cc 100644 --- a/plugin/admin/app/lang/ru/vehicle.php +++ b/plugin/admin/app/lang/ru/vehicle.php @@ -72,6 +72,8 @@ return [ 'select_location' => 'Выбрать местоположение', 'select_final_location' => 'Выбрать пункт назначения', 'select_fbo_location' => 'Выбрать порт FBO', + 'ship' => 'Транспортные корабли', + 'please_ship' => 'Пожалуйста, выберите судно', // Пагинация 'pagination_total' => 'Всего {total} записей', diff --git a/plugin/admin/app/lang/zh-cn/vehicle.php b/plugin/admin/app/lang/zh-cn/vehicle.php index 6eb6fec..b0fa5fb 100644 --- a/plugin/admin/app/lang/zh-cn/vehicle.php +++ b/plugin/admin/app/lang/zh-cn/vehicle.php @@ -74,7 +74,9 @@ return [ 'agent' => '代理', 'classify' => '分类', 'classify_placeholder' => '请选择分类', - + 'ship' => '运输船舶', + 'please_ship' => '请选择船舶', + // 分页相关 'pagination_total' => '共 {total} 条', 'pagination_page' => '第 {page} 页',