|
|
@@ -59,6 +59,7 @@
|
|
|
<div class="label-list">距离：{{ item.sendInfo.distance }}km</div>
|
|
|
<div class="label-list">运费：¥{{ item.sendInfo.cost }}</div>
|
|
|
<div class="label-list">小费：¥{{ item.sendInfo.tip }}</div>
|
|
|
+ <div class="label-list" v-if="orderData.expressProgress">状态：{{ orderData.expressProgress.progressName }}</div>
|
|
|
<el-popover placement="top" width="160" v-model="sendMySelfConfirm" v-if="orderData.status==3">
|
|
|
<p>快递送到后会自动确定，需要自己确认？</p>
|
|
|
<div style="text-align: right; margin: 0">
|
|
|
@@ -70,15 +71,15 @@
|
|
|
</template>
|
|
|
<template v-if="orderData.sendType==3">
|
|
|
<div class="label-list">
|
|
|
- <div style="margin-bottom: 20px">本店送</div>
|
|
|
- <el-popover placement="top" width="160" v-model="sendMySelfConfirm" v-if="orderData.status==3">
|
|
|
- <p>确认送到了？</p>
|
|
|
- <div style="text-align: right; margin: 0">
|
|
|
- <el-button size="mini" type="text" @click="sendMySelfConfirm = false">取消</el-button>
|
|
|
- <el-button type="primary" size="mini" @click="affirmDeliver">确定</el-button>
|
|
|
- </div>
|
|
|
- <el-button type="primary" slot="reference">确认送达</el-button>
|
|
|
- </el-popover>
|
|
|
+ <div style="margin-bottom: 20px">本店送</div>
|
|
|
+ <el-popover placement="top" width="160" v-model="sendMySelfConfirm" v-if="orderData.status==3">
|
|
|
+ <p>确认送到了？</p>
|
|
|
+ <div style="text-align: right; margin: 0">
|
|
|
+ <el-button size="mini" type="text" @click="sendMySelfConfirm = false">取消</el-button>
|
|
|
+ <el-button type="primary" size="mini" @click="affirmDeliver">确定</el-button>
|
|
|
+ </div>
|
|
|
+ <el-button type="primary" slot="reference">确认送达</el-button>
|
|
|
+ </el-popover>
|
|
|
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -193,6 +194,9 @@
|
|
|
<el-form-item label="运费" prop="remark" style="margin-bottom: 8px;">
|
|
|
<el-input v-model="orderForm.sedCost" :disabled="true" placeholder="" size="mini"></el-input>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item label="备注" prop="remark" style="margin-bottom: 8px;">
|
|
|
+ <el-input type="textarea" v-model="orderForm.remark" placeholder="" size="mini"></el-input>
|
|
|
+ </el-form-item>
|
|
|
</div>
|
|
|
</div>
|
|
|
</el-form>
|
|
|
@@ -533,6 +537,7 @@ export default {
|
|
|
sendCost:this.orderForm.sedCost,
|
|
|
expressId:this.freightInfo.expressId,
|
|
|
sendTime:this.orderForm.reachTime,
|
|
|
+ remark:this.orderForm.remark,
|
|
|
}
|
|
|
this.$service.order.sendExpressage(parameter)
|
|
|
.then(res => {
|
jiangfeng