fix: update getDate function to handle hour data and add VnInputTime component for shipped hour
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
This commit is contained in:
parent
3876dc4c34
commit
c540865694
|
@ -70,8 +70,6 @@ async function getDate(query, params) {
|
||||||
for (const param in params) {
|
for (const param in params) {
|
||||||
if (!params[param]) return;
|
if (!params[param]) return;
|
||||||
}
|
}
|
||||||
|
|
||||||
formData.value.zoneFk = null;
|
|
||||||
zonesOptions.value = [];
|
zonesOptions.value = [];
|
||||||
const { data } = await axios.get(query, { params });
|
const { data } = await axios.get(query, { params });
|
||||||
if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
|
if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
|
||||||
|
@ -79,7 +77,7 @@ async function getDate(query, params) {
|
||||||
formData.value.zoneFk = data.zoneFk;
|
formData.value.zoneFk = data.zoneFk;
|
||||||
formData.value.landed = data.landed;
|
formData.value.landed = data.landed;
|
||||||
const shippedDate = new Date(params.shipped);
|
const shippedDate = new Date(params.shipped);
|
||||||
const landedDate = new Date(data.landed);
|
const landedDate = new Date(data.hour);
|
||||||
shippedDate.setHours(
|
shippedDate.setHours(
|
||||||
landedDate.getHours(),
|
landedDate.getHours(),
|
||||||
landedDate.getMinutes(),
|
landedDate.getMinutes(),
|
||||||
|
@ -424,6 +422,14 @@ async function getZone(options) {
|
||||||
:rules="validate('ticketList.shipped')"
|
:rules="validate('ticketList.shipped')"
|
||||||
@update:model-value="setShipped"
|
@update:model-value="setShipped"
|
||||||
/>
|
/>
|
||||||
|
<VnInputTime
|
||||||
|
:label="t('basicData.shippedHour')"
|
||||||
|
v-model="formData.shipped"
|
||||||
|
:required="true"
|
||||||
|
:rules="validate('basicData.shippedHour')"
|
||||||
|
disabled
|
||||||
|
@update:model-value="setShipped"
|
||||||
|
/>
|
||||||
<VnInputDate
|
<VnInputDate
|
||||||
:label="t('basicData.landed')"
|
:label="t('basicData.landed')"
|
||||||
v-model="formData.landed"
|
v-model="formData.landed"
|
||||||
|
|
Loading…
Reference in New Issue