|
|
@@ -60,10 +60,10 @@
|
|
|
<div class="form-group row">
|
|
|
<label for="deliver_at" class="col-2 col-form-label text-right text-primary">发货时间 *</label>
|
|
|
<div class="col-8 form-inline">
|
|
|
- <input id="deliver_at_date" @input="spliceDeliverAt" name="deliver_at_date" type="date" class="form-control col-4 @error('deliver_at_date') is-invalid @enderror"
|
|
|
- value="@if(old('deliver_at_date')){{ old('deliver_at_date') }}@else{{$waybill->deliver_at_date}}@endif">
|
|
|
+ <input id="deliver_at_date" @input="spliceDeliverAt" name="deliver_at_date" type="date" class="form-control col-4 @error('deliver_at_date') is-invalid @enderror"
|
|
|
+ v-model="waybill.deliver_at_date">
|
|
|
<input id="deliver_at_time" @input="spliceDeliverAt" name="deliver_at_time" type="time" class="form-control col-4 @error('deliver_at_date') is-invalid @enderror"
|
|
|
- value="@if(old('deliver_at_time')){{ old('deliver_at_time') }}@else{{$waybill->deliver_at_time}}@endif">
|
|
|
+ v-model="waybill.deliver_at_time">
|
|
|
<input hidden id="deliver_at" name="deliver_at" type="text" class="form-control col-4">
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -519,6 +519,8 @@
|
|
|
back_sign_bill: '{{ old("back_sign_bill") ?? $waybill->back_sign_bill}}',
|
|
|
package_service: '{{ old("package_service") ?? $waybill->package_service}}',
|
|
|
inquire_tel: '{{ old("inquire_tel") ?? $waybill->inquire_tel}}',
|
|
|
+ deliver_at_date: '{{old("deliver_at_date") ?? $waybill->deliver_at_date}}',
|
|
|
+ deliver_at_time: '{{old("deliver_at_time") ?? $waybill->deliver_at_time}}'
|
|
|
},
|
|
|
order:{!! $waybill->order ?? '{}' !!},
|
|
|
waybillTemp:{!! $waybill !!},
|
|
|
@@ -747,9 +749,10 @@
|
|
|
this.waybill.amount = 1;
|
|
|
this.waybill.amount_unit_id = 5;
|
|
|
this.waybill.inquire_tel = '13761413262';
|
|
|
+ this.waybill.dispatch_remark = '13761413262';
|
|
|
let date = new Date();
|
|
|
- this.deliver_at_date = date.toLocaleDateString();
|
|
|
- this.deliver_at_time = date.getTime();
|
|
|
+ this.waybill.deliver_at_date = date.getFullYear()+'-'+("0" + (date.getMonth() + 1)).slice(-2) + '-'+date.getDate();
|
|
|
+ this.waybill.deliver_at_time = date.getHours()+':'+date.getMinutes();
|
|
|
}
|
|
|
},
|
|
|
created(){
|
king