1
This commit is contained in:
@@ -337,6 +337,9 @@ class VehicleController
|
||||
public function shipList(Request $request){
|
||||
$navigate = LogisticsShip::where(['status' => 0])->get();
|
||||
$pending = LogisticsShip::where(['status' => 1])->get();
|
||||
foreach ($pending as &$val) {
|
||||
$pending['count'] = Vehicle::where(['locations_id' => $val->id])->count();
|
||||
}
|
||||
$result = ['navigate' => $navigate,'pending' => $pending];
|
||||
|
||||
return Util::success($result);
|
||||
|
||||
@@ -36,5 +36,12 @@ return [
|
||||
'pagination_next' => 'التالي',
|
||||
'pagination_jump' => 'انتقل إلى',
|
||||
'pagination_go' => 'انتقل',
|
||||
'data_not_found' => 'لم يتم العثور على البيانات'
|
||||
'data_not_found' => 'لم يتم العثور على البيانات',
|
||||
|
||||
|
||||
'production' => 'Производственные города',
|
||||
'lng' => 'Долгота',
|
||||
'lat' => 'Измерения',
|
||||
'lng_placeholder' => 'Введите долготу.',
|
||||
'lat_placeholder' => 'Введите широту.',
|
||||
];
|
||||
@@ -36,5 +36,11 @@ return [
|
||||
'pagination_next' => 'Next',
|
||||
'pagination_jump' => 'Jump to',
|
||||
'pagination_go' => 'Go',
|
||||
'data_not_found' => 'Data not found'
|
||||
'data_not_found' => 'Data not found',
|
||||
|
||||
'production' => 'producer city',
|
||||
'lng' => 'longitude',
|
||||
'lat' => 'latitude',
|
||||
'lng_placeholder' => 'Please enter longitude',
|
||||
'lat_placeholder' => 'Please enter latitude',
|
||||
];
|
||||
@@ -36,5 +36,12 @@ return [
|
||||
'pagination_next' => 'Следующая',
|
||||
'pagination_jump' => 'Перейти к',
|
||||
'pagination_go' => 'Перейти',
|
||||
'data_not_found' => 'Данные не найдены'
|
||||
'data_not_found' => 'Данные не найдены',
|
||||
|
||||
|
||||
'production' => 'Производственные города',
|
||||
'lng' => 'Долгота',
|
||||
'lat' => 'Измерения',
|
||||
'lng_placeholder' => 'Введите долготу.',
|
||||
'lat_placeholder' => 'Введите широту.',
|
||||
];
|
||||
@@ -36,5 +36,12 @@ return [
|
||||
'pagination_next' => '下一页',
|
||||
'pagination_jump' => '跳转',
|
||||
'pagination_go' => '确定',
|
||||
'data_not_found' => '未找到数据'
|
||||
];
|
||||
'data_not_found' => '未找到数据',
|
||||
|
||||
|
||||
'production' => '生产城市',
|
||||
'lng' => '经度',
|
||||
'lat' => '维度',
|
||||
'lng_placeholder' => '请输入经度',
|
||||
'lat_placeholder' => '请输入纬度',
|
||||
];
|
||||
@@ -99,7 +99,7 @@
|
||||
if (typeof d[field] == "undefined") return "";
|
||||
let items = [];
|
||||
layui.each((d[field] + "").split(","), function (k , v) {
|
||||
items.push(v === 'port' ? translations.type_port : translations.type_warehouse);
|
||||
items.push(v === 'port' ? translations.type_port : (v === 'production' ? translations.production : translations.type_warehouse));
|
||||
});
|
||||
return util.escape(items.join(","));
|
||||
}
|
||||
|
||||
@@ -41,8 +41,21 @@
|
||||
<div class="layui-input-block">
|
||||
<input type="checkbox" name="type" value="port" title="<?= $translations['type_port'] ?? '港口' ?>" lay-skin="primary">
|
||||
<input type="checkbox" name="type" value="warehouse" title="<?= $translations['type_warehouse'] ?? '仓库' ?>" lay-skin="primary">
|
||||
<input type="checkbox" name="type" value="production" title="<?= $translations['production'] ?? '生产城市' ?>" lay-skin="primary">
|
||||
</div>
|
||||
</div>
|
||||
<!-- <div class="layui-form-item">-->
|
||||
<!-- <label class="layui-form-label"><?= $translations['lng'] ?? '经度' ?></label>-->
|
||||
<!-- <div class="layui-input-block">-->
|
||||
<!-- <input type="text" name="lng" placeholder="<?= $translations['lng_placeholder'] ?? '请输入经度' ?>" autocomplete="off" class="layui-input">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
<!-- <div class="layui-form-item">-->
|
||||
<!-- <label class="layui-form-label"><?= $translations['lat'] ?? '维度' ?></label>-->
|
||||
<!-- <div class="layui-input-block">-->
|
||||
<!-- <input type="text" name="lat" placeholder="<?= $translations['lat_placeholder'] ?? '请输入维度' ?>" autocomplete="off" class="layui-input">-->
|
||||
<!-- </div>-->
|
||||
<!-- </div>-->
|
||||
|
||||
<div class="layui-form-item">
|
||||
<div class="layui-input-block">
|
||||
|
||||
@@ -48,6 +48,7 @@
|
||||
<div class="layui-input-block">
|
||||
<input type="checkbox" name="type" value="port" title="<?= $translations['type_port'] ?? '港口' ?>" lay-skin="primary">
|
||||
<input type="checkbox" name="type" value="warehouse" title="<?= $translations['type_warehouse'] ?? '仓库' ?>" lay-skin="primary">
|
||||
<input type="checkbox" name="type" value="production" title="<?= $translations['production'] ?? '生产城市' ?>" lay-skin="primary">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user