mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/portal.git
synced 2026-08-27 08:24:39 +00:00
add 'ADD Container' button
update add container form
This commit is contained in:
edmondlang
+2
-10
@@ -94,15 +94,15 @@ class CreateLoadContainerLogic extends AbstractControllerLogic
|
||||
$transportObject = new TransportObject(
|
||||
TransportType::LAND, null,
|
||||
$request->input('tracking'),
|
||||
Carbon::parse($request->input('eta')),
|
||||
Carbon::parse($request->input('etd')),
|
||||
Carbon::parse($request->input('eta')),
|
||||
ApprovalStatus::APPROVED
|
||||
);
|
||||
$transport = $this->createsTransport->execute($transportObject, $container);
|
||||
|
||||
$scheduleObject = new ScheduleObject(
|
||||
Carbon::parse($request->input('eta')),
|
||||
Carbon::parse($request->input('etd')),
|
||||
Carbon::parse($request->input('eta')),
|
||||
ApprovalStatus::APPROVED
|
||||
);
|
||||
$schedule = $this->createsSchedule->execute($transport, $scheduleObject);
|
||||
@@ -110,12 +110,4 @@ class CreateLoadContainerLogic extends AbstractControllerLogic
|
||||
return $this->resourceResponse(new ContainerResource($container));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
{
|
||||
"container_reference": "",
|
||||
"container_number": "",
|
||||
"seal_reference": "",
|
||||
"container_type": "",
|
||||
|
||||
}
|
||||
File diff suppressed because one or more lines are too long
+60
-29
@@ -9,45 +9,77 @@
|
||||
<error-message-component class="m-b-20" :error="error"></error-message-component>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<validation-wrapper-component class="m-b-15" :validator="$v.parameters.receive_date">
|
||||
<label class="text-primary">Receive Date</label>
|
||||
<date-picker-component :parameters="parameters" :value="'receive_date'"></date-picker-component>
|
||||
</validation-wrapper-component>
|
||||
<validation-wrapper-component class="m-b-15" :validator="$v.parameters.tracking">
|
||||
<label class="text-primary">Tracking</label>
|
||||
<input type="text" class="form-control fs-12" v-model.trim="parameters.tracking">
|
||||
</validation-wrapper-component>
|
||||
<div class="row m-b-10">
|
||||
<div class="col">
|
||||
<div class="row m-b-0 text-primary">
|
||||
<div class="col">
|
||||
<label class="text-primary fs-11 all-caps">Select the warehouse</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row text-center justify-content-center">
|
||||
<div class="col p-r-5">
|
||||
<div class="b-a b-thick p-t-15 p-b-15 p-l-35 p-r-35 pointer" :class="{ 'b-primary': parameters.company_module_id === 3, 'b-grey': parameters.company_module_id !== 3 }" @click="parameters.company_module_id = 3">
|
||||
<div class="row m-b-15 justify-content-center">
|
||||
<div class="col-8">
|
||||
<img src="/images/guangzhou-map.png" class="w-100">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<h5 class="no-margin" :class="{ 'text-primary': parameters.company_module_id === 3, 'semi-bold': parameters.company_module_id === 3 }">Guangzhou</h5>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col p-l-5">
|
||||
<div class="b-a b-thick p-t-15 p-b-15 p-l-35 p-r-35 pointer" :class="{ 'b-primary': parameters.company_module_id === 4, 'b-grey': parameters.company_module_id !== 4 }" @click="parameters.company_module_id = 4">
|
||||
<div class="row m-b-15 justify-content-center">
|
||||
<div class="col-8">
|
||||
<img src="/images/yiwu-map.png" class="w-100">
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<h5 class="no-margin" :class="{ 'text-primary': parameters.company_module_id === 4, 'semi-bold': parameters.company_module_id === 4}">Yiwu</h5>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<validation-wrapper-component class="m-b-15" :validator="$v.parameters.company_module_id">
|
||||
<label class="text-primary">Company Module</label>
|
||||
<input type="text" class="form-control fs-12" v-model.trim="parameters.company_module_id">
|
||||
</validation-wrapper-component>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<validation-wrapper-component class="m-b-10" :validator="$v.parameters.etd">
|
||||
<label class="text-primary">ETD</label>
|
||||
<date-picker-component :parameters="parameters" :value="'etd'"></date-picker-component>
|
||||
</validation-wrapper-component>
|
||||
</div>
|
||||
|
||||
<div class="col">
|
||||
<validation-wrapper-component class="m-b-10" :validator="$v.parameters.eta">
|
||||
<label class="text-primary">ETA</label>
|
||||
<date-picker-component :parameters="parameters" :value="'eta'"></date-picker-component>
|
||||
</validation-wrapper-component>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<validation-wrapper-component class="m-b-15" :validator="$v.parameters.container_reference">
|
||||
<label class="text-primary">Container Reference</label>
|
||||
<input type="text" class="form-control fs-12" v-model.trim="parameters.container_reference">
|
||||
</validation-wrapper-component>
|
||||
|
||||
<validation-wrapper-component class="m-b-15" :validator="$v.parameters.container_number">
|
||||
<validation-wrapper-component class="m-b-15" :validator="$v.parameters.container_number">
|
||||
<label class="text-primary">Container Number</label>
|
||||
<input type="text" class="form-control fs-12" v-model.trim="parameters.container_number">
|
||||
</validation-wrapper-component>
|
||||
|
||||
<validation-wrapper-component class="m-b-15" :validator="$v.parameters.seal_reference">
|
||||
<validation-wrapper-component class="m-b-15" :validator="$v.parameters.seal_reference">
|
||||
<label class="text-primary">Seal Reference</label>
|
||||
<input type="text" class="form-control fs-12" v-model.trim="parameters.seal_reference">
|
||||
</validation-wrapper-component>
|
||||
|
||||
<validation-wrapper-component class="m-b-15" :validator="$v.parameters.container_type">
|
||||
<label class="text-primary">Container Type</label>
|
||||
<input type="text" class="form-control fs-12" v-model.trim="parameters.container_type">
|
||||
</validation-wrapper-component>
|
||||
|
||||
<validation-wrapper-component class="m-b-15" :validator="$v.parameters.status">
|
||||
<label class="text-primary">Status</label>
|
||||
<input type="text" class="form-control fs-12" v-model.trim="parameters.status">
|
||||
</validation-wrapper-component>
|
||||
|
||||
<div class="row m-t-15 align-items-center justify-content-center">
|
||||
<div class="col">
|
||||
<div class="btn btn-block btn-lg btn-primary b-rad-none no-border" @click="submitForm">Submit</div>
|
||||
@@ -68,14 +100,13 @@
|
||||
return {
|
||||
error: '',
|
||||
parameters: {
|
||||
tracking: this.tracking,
|
||||
receive_date: this.receive_date,
|
||||
company_module_id: this.company_module_id,
|
||||
container_reference: this.container_reference,
|
||||
container_number: this.container_number,
|
||||
seal_reference: this.seal_reference,
|
||||
container_type: this.container_type,
|
||||
status: this.status,
|
||||
container_type: 1,
|
||||
company_module_id: this.company_module_id,
|
||||
etd: this.etd,
|
||||
eta: this.eta,
|
||||
}
|
||||
};
|
||||
},
|
||||
|
||||
+2
-5
@@ -3,10 +3,10 @@ import { required } from "vuelidate/lib/validators";
|
||||
export default {
|
||||
validations: {
|
||||
parameters: {
|
||||
tracking: {
|
||||
etd: {
|
||||
required
|
||||
},
|
||||
receive_date: {
|
||||
eta: {
|
||||
required
|
||||
},
|
||||
company_module_id: {
|
||||
@@ -24,9 +24,6 @@ export default {
|
||||
container_type: {
|
||||
required
|
||||
},
|
||||
status: {
|
||||
required
|
||||
}
|
||||
}
|
||||
},
|
||||
}
|
||||
@@ -23,12 +23,6 @@
|
||||
<div class="col"></div>
|
||||
<div class="col-auto p-r-0">
|
||||
<a href="{{route('orders.refresh')}}"><div class="btn btn-sm btn-warning all-caps b-rad-none pointer"><i class="fa fa-refresh m-r-10"></i>Refresh Orders</div></a>
|
||||
|
||||
<div data-type="createContainer" class="btn btn-sm btn-block bg-white text-info b-rad-sm pointer requestModal">Add</div>
|
||||
<modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="createContainer" size="large">
|
||||
<create-load-container-form-component :section="'containerListSection'"></create-load-container-form-component>
|
||||
</modal-component>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
@yield('inner_content')
|
||||
|
||||
@@ -8,8 +8,17 @@
|
||||
<div class="row border p-1">Filter</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- <list-component section="containerListSection" :endpoint="route('api.packing_list.container.list')"> -->
|
||||
<list-component section="containerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'with_packing_lists': true, order_by: {column: 'created_at', DESC: true}}">
|
||||
|
||||
<div class="row m-b-15">
|
||||
<div class="col">
|
||||
<div data-type="createContainer" class="btn btn-sm btn-primary all-caps b-rad-none pointer requestModal m-l-5 rounded btn-lg"><i class="fa fa-plus m-r-10"></i>Add Container</div>
|
||||
<modal-component class="animate__animated animate__fast animate__fadeIn" styleType="stick-up" type="createContainer" size="large">
|
||||
<create-load-container-form-component :section="'containerListSection'"></create-load-container-form-component>
|
||||
</modal-component>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<list-component section="containerListSection" :endpoint="route('api.packing_list.container.list')" :options="{'per_page': 5, 'with_packing_lists': true, order_by: {column: 'created_at', DESC: true}}">
|
||||
<template slot="list" slot-scope="{data}">
|
||||
<container-component :data="data"></container-component>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user