Commit 5153c691 authored by 邓春圆's avatar 邓春圆

放货时间修改

parent 6ce19e71
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.pickType" form-type="radio" formatter="number"></dict-selector> <dict-selector :type="DICT_TYPE.ECW_HARVEST_METHOD" v-model="form.pickType" form-type="radio" formatter="number"></dict-selector>
</el-form-item> </el-form-item>
<el-form-item :label="$t('提货时间')" v-if="form.pickType == 1"> <el-form-item :label="$t('提货时间')" v-if="form.pickType == 1">
<el-date-picker v-model="form.pickTime" placeholder="" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker v-model="pickupTime" placeholder="" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<template v-if="form.pickType == 2"> <template v-if="form.pickType == 2">
...@@ -39,10 +39,10 @@ ...@@ -39,10 +39,10 @@
<el-input v-model="form.trackingNumber" placeholder=""></el-input> <el-input v-model="form.trackingNumber" placeholder=""></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('送货时间')"> <el-form-item :label="$t('送货时间')">
<el-date-picker type="datetime" @change="deliverFn" v-model="form.deliverTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" v-model="form.deliverTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item :label="$t('签收时间')"> <el-form-item :label="$t('签收时间')">
<el-date-picker type="datetime" v-model="form.pickTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker> <el-date-picker type="datetime" v-model="signingTime" placeholder="" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
</el-form-item> </el-form-item>
</template> </template>
...@@ -69,6 +69,8 @@ export default { ...@@ -69,6 +69,8 @@ export default {
data(){ data(){
return { return {
order: null, order: null,
signingTime:null, //签收时间
pickupTime:null,//提货时间
form: { form: {
pickTime:null, pickTime:null,
deliverTime:null, deliverTime:null,
...@@ -91,9 +93,16 @@ export default { ...@@ -91,9 +93,16 @@ export default {
this.order = res.data this.order = res.data
this.$set(this.form, 'pickType', this.order.consigneeVO.harvestMethod) this.$set(this.form, 'pickType', this.order.consigneeVO.harvestMethod)
}); });
this.form.pickTime = new Date().format('yyyy-MM-dd hh:mm:ss'); // this.form.pickTime = new Date().format('yyyy-MM-dd hh:mm:ss');
this.pickupTime = new Date().format('yyyy-MM-dd hh:mm:ss');
this.signingTime = new Date().format('yyyy-MM-dd hh:mm:ss');
}, },
submit(){ submit(){
if(this.form.pickType === 1){
this.form.pickTime = this.pickupTime;
}else {
this.form.pickTime = this.signingTime;
}
create(Object.assign({orderId: this.order.orderNo}, this.form)).then(res => { create(Object.assign({orderId: this.order.orderNo}, this.form)).then(res => {
return this.$alert(res.message || this.$t('操作成功')) return this.$alert(res.message || this.$t('操作成功'))
}).then(res => { }).then(res => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment