|
|
@@ -65,48 +65,84 @@
|
|
|
:info="item.receive"
|
|
|
/>
|
|
|
<span v-else>无配送信息</span>
|
|
|
- <div style="margin-top: 10px" v-if="!$util.isEmpty(item.receive)">
|
|
|
- <el-button size="mini" v-if="orderData.printStatus == 0" @click="printOrderFn">打印</el-button>
|
|
|
- <el-button size="mini" v-else @click="rePrintOrderFn">重打</el-button>
|
|
|
+ <div
|
|
|
+ style="margin-top: 10px"
|
|
|
+ v-if="!$util.isEmpty(item.receive)"
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ v-if="orderData.printStatus == 0"
|
|
|
+ @click="printOrderFn"
|
|
|
+ >打印</el-button
|
|
|
+ >
|
|
|
+ <el-button size="mini" v-else @click="rePrintOrderFn"
|
|
|
+ >重打</el-button
|
|
|
+ >
|
|
|
</div>
|
|
|
</div>
|
|
|
</template>
|
|
|
<!-- 发货 -->
|
|
|
<template v-if="item.actionName == '发货'">
|
|
|
<div v-if="item.finishTime == 0">
|
|
|
-
|
|
|
-<template v-if="orderData.hasDeliver == 1">
|
|
|
-
|
|
|
- <el-popover
|
|
|
- placement="top"
|
|
|
- width="160"
|
|
|
- v-model="sendMySelfConfirm">
|
|
|
- <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="sendMySelfFn">确定</el-button>
|
|
|
- </div>
|
|
|
- <el-button type="primary" size="small" slot="reference">确认发送</el-button>
|
|
|
- </el-popover>
|
|
|
-
|
|
|
-</template>
|
|
|
-<template v-else>
|
|
|
-
|
|
|
- <el-popover
|
|
|
- placement="top"
|
|
|
- width="160"
|
|
|
- v-model="sendMySelfConfirm">
|
|
|
- <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="sendMySelfFn">确定</el-button>
|
|
|
- </div>
|
|
|
- <el-button type="primary" size="small" slot="reference">自己送</el-button>
|
|
|
- </el-popover>
|
|
|
- <el-button type="primary" size="small" @click="sendShipFn" style="margin-left:15px;">代送</el-button>
|
|
|
-
|
|
|
-</template>
|
|
|
-
|
|
|
+ <template v-if="orderData.hasDeliver == 1">
|
|
|
+ <el-popover
|
|
|
+ placement="top"
|
|
|
+ width="160"
|
|
|
+ v-model="sendMySelfConfirm"
|
|
|
+ >
|
|
|
+ <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="sendMySelfFn"
|
|
|
+ >确定</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
+ <el-button type="primary" size="small" slot="reference"
|
|
|
+ >确认发送</el-button
|
|
|
+ >
|
|
|
+ </el-popover>
|
|
|
+ </template>
|
|
|
+ <template v-else>
|
|
|
+ <el-popover
|
|
|
+ placement="top"
|
|
|
+ width="160"
|
|
|
+ v-model="sendMySelfConfirm"
|
|
|
+ >
|
|
|
+ <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="sendMySelfFn"
|
|
|
+ >确定</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
+ <el-button type="primary" size="small" slot="reference"
|
|
|
+ >自己送</el-button
|
|
|
+ >
|
|
|
+ </el-popover>
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="small"
|
|
|
+ @click="sendShipFn"
|
|
|
+ style="margin-left:15px;"
|
|
|
+ >代送</el-button
|
|
|
+ >
|
|
|
+ </template>
|
|
|
</div>
|
|
|
<div v-else>
|
|
|
<template v-if="!$util.isEmpty(item.sendInfo)">
|
|
|
@@ -119,9 +155,7 @@
|
|
|
<div class="label-list">
|
|
|
运费:¥{{ item.sendInfo.cost }}
|
|
|
</div>
|
|
|
- <div class="label-list">
|
|
|
- 小费:¥{{ item.sendInfo.tip }}
|
|
|
- </div>
|
|
|
+ <div class="label-list">小费:¥{{ item.sendInfo.tip }}</div>
|
|
|
</template>
|
|
|
<template v-else>
|
|
|
<div class="label-list">
|
|
|
@@ -134,38 +168,61 @@
|
|
|
<!-- 送达 -->
|
|
|
<template v-if="item.actionName == '送达'">
|
|
|
<div v-if="item.finishTime == 0">
|
|
|
+ <template v-if="orderData.sendType == 3">
|
|
|
+ <el-popover
|
|
|
+ placement="top"
|
|
|
+ width="210"
|
|
|
+ v-model="confirmSendVisit"
|
|
|
+ >
|
|
|
+ <p>
|
|
|
+ 此订单由快递配送,送到会自动确认,确定要手动确认?
|
|
|
+ </p>
|
|
|
+ <div style="text-align: right; margin: 0">
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ @click="confirmSendVisit = false"
|
|
|
+ >取消</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ @click="orderReachFn"
|
|
|
+ >确定</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
+ <el-button slot="reference" size="small" type="primary"
|
|
|
+ >确认送达</el-button
|
|
|
+ >
|
|
|
+ </el-popover>
|
|
|
+ </template>
|
|
|
|
|
|
-<template v-if="orderData.sendType == 3">
|
|
|
-
|
|
|
- <el-popover
|
|
|
- placement="top"
|
|
|
- width="210"
|
|
|
- v-model="confirmSendVisit">
|
|
|
- <p>此订单由快递配送,送到会自动确认,确定要手动确认?</p>
|
|
|
- <div style="text-align: right; margin: 0">
|
|
|
- <el-button size="mini" type="text" @click="confirmSendVisit = false">取消</el-button>
|
|
|
- <el-button type="primary" size="mini" @click="orderReachFn">确定</el-button>
|
|
|
- </div>
|
|
|
- <el-button slot="reference" size="small" type="primary" >确认送达</el-button>
|
|
|
- </el-popover>
|
|
|
-
|
|
|
-</template>
|
|
|
-
|
|
|
-<template v-else>
|
|
|
-
|
|
|
- <el-popover
|
|
|
- placement="top"
|
|
|
- width="160"
|
|
|
- v-model="confirmSendVisit">
|
|
|
- <p>确认已送达?</p>
|
|
|
- <div style="text-align: right; margin: 0">
|
|
|
- <el-button size="mini" type="text" @click="confirmSendVisit = false">取消</el-button>
|
|
|
- <el-button type="primary" size="mini" @click="orderReachFn">确定</el-button>
|
|
|
- </div>
|
|
|
- <el-button slot="reference" size="small" type="primary" >确认送达</el-button>
|
|
|
- </el-popover>
|
|
|
-
|
|
|
-</template>
|
|
|
+ <template v-else>
|
|
|
+ <el-popover
|
|
|
+ placement="top"
|
|
|
+ width="160"
|
|
|
+ v-model="confirmSendVisit"
|
|
|
+ >
|
|
|
+ <p>确认已送达?</p>
|
|
|
+ <div style="text-align: right; margin: 0">
|
|
|
+ <el-button
|
|
|
+ size="mini"
|
|
|
+ type="text"
|
|
|
+ @click="confirmSendVisit = false"
|
|
|
+ >取消</el-button
|
|
|
+ >
|
|
|
+ <el-button
|
|
|
+ type="primary"
|
|
|
+ size="mini"
|
|
|
+ @click="orderReachFn"
|
|
|
+ >确定</el-button
|
|
|
+ >
|
|
|
+ </div>
|
|
|
+ <el-button slot="reference" size="small" type="primary"
|
|
|
+ >确认送达</el-button
|
|
|
+ >
|
|
|
+ </el-popover>
|
|
|
+ </template>
|
|
|
|
|
|
<div class="prompt-text">确认后会自动通知客户</div>
|
|
|
</div>
|
|
|
@@ -239,7 +296,14 @@
|
|
|
@select="addressFn"
|
|
|
size="small"
|
|
|
style="width: 100%"
|
|
|
- ></el-autocomplete>
|
|
|
+ >
|
|
|
+ <template slot-scope="{ item }">
|
|
|
+ <p style="line-height: 30px">{{ item.address }}</p>
|
|
|
+ <p style="line-height: 20px;font-size: 12px;color: #999">
|
|
|
+ {{ item.title }}
|
|
|
+ </p>
|
|
|
+ </template>
|
|
|
+ </el-autocomplete>
|
|
|
<!-- <el-input
|
|
|
type="textarea"
|
|
|
v-model="orderForm.receiveFullAddress"
|
|
|
@@ -508,8 +572,8 @@ export default {
|
|
|
// dialog
|
|
|
// 打单信息
|
|
|
relateData: {},
|
|
|
- confirmSendVisit:false,
|
|
|
- orderDialog: false,
|
|
|
+ confirmSendVisit: false,
|
|
|
+ orderDialog: true,
|
|
|
orderForm: {
|
|
|
receiveUserName: '', // 收花人姓名;到店自提的姓名
|
|
|
receiveMobile: '', // 收花人手机;到店自提的电话;
|
|
|
@@ -531,7 +595,7 @@ export default {
|
|
|
},
|
|
|
addressArr: [],
|
|
|
ruleForm: {},
|
|
|
- sendMySelfConfirm:false,
|
|
|
+ sendMySelfConfirm: false,
|
|
|
addressOptions: [],
|
|
|
addressProps: {
|
|
|
label: 'name',
|
|
|
@@ -614,11 +678,11 @@ export default {
|
|
|
},
|
|
|
// dialog
|
|
|
querySearchAsync(queryString, cb) {
|
|
|
- if (!this.orderForm.receiveCity) {
|
|
|
- this.$message.error('请先选择收花人地址');
|
|
|
- cb([]);
|
|
|
- return false;
|
|
|
- }
|
|
|
+ // if (!this.orderForm.receiveCity) {
|
|
|
+ // this.$message.error('请先选择收花人地址');
|
|
|
+ // cb([]);
|
|
|
+ // return false;
|
|
|
+ // }
|
|
|
if (!queryString) {
|
|
|
cb([]);
|
|
|
return false;
|
|
|
@@ -676,9 +740,9 @@ export default {
|
|
|
},
|
|
|
// =========================
|
|
|
//有配送单
|
|
|
- hasDeliver(){
|
|
|
- this.$service.single.printOrder({ id: this.orderData.id, option: 1 }).then(res =>{
|
|
|
- this.getDet();
|
|
|
+ hasDeliver() {
|
|
|
+ this.$service.single.printOrder({ id: this.orderData.id, option: 1 }).then(res => {
|
|
|
+ this.getDet();
|
|
|
});
|
|
|
},
|
|
|
//打单
|
|
|
@@ -687,26 +751,26 @@ export default {
|
|
|
this.getDet();
|
|
|
this.$service.order.getDeliverDetail({ id: this.orderData.id }).then(res => {
|
|
|
this.deliver.data = res;
|
|
|
- this.printOrder();
|
|
|
+ this.printOrder();
|
|
|
});
|
|
|
},
|
|
|
//重打
|
|
|
- rePrintOrderFn(){
|
|
|
- this.printOrder();
|
|
|
+ rePrintOrderFn() {
|
|
|
+ this.printOrder();
|
|
|
},
|
|
|
// 填单
|
|
|
fillFormFn() {
|
|
|
this.orderDialog = true;
|
|
|
},
|
|
|
//确认发货 自己送
|
|
|
- sendMySelfFn(){
|
|
|
- this.sendMySelfConfirm=false;
|
|
|
- this.shipForm.sendType=2;
|
|
|
+ sendMySelfFn() {
|
|
|
+ this.sendMySelfConfirm = false;
|
|
|
+ this.shipForm.sendType = 2;
|
|
|
this.$service.single
|
|
|
.orderDeliver({ id: this.orderData.id, option: 1, ...this.shipForm })
|
|
|
.then(res => {
|
|
|
-
|
|
|
- this.$message.success('已确认!');
|
|
|
+ this.$message.success('已确认!');
|
|
|
+ this.$emit('song-success');
|
|
|
|
|
|
this.getDet();
|
|
|
// this.shipDialog = false;
|
|
|
@@ -719,17 +783,15 @@ export default {
|
|
|
},
|
|
|
//确认发货 代送 确认
|
|
|
submitShipFn() {
|
|
|
-
|
|
|
- if(this.shipForm.sendTime==''){
|
|
|
- this.$message.error('请选择时间');
|
|
|
- return false;
|
|
|
- }
|
|
|
- this.shipForm.sendType=3;
|
|
|
+ if (this.shipForm.sendTime == '') {
|
|
|
+ this.$message.error('请选择时间');
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ this.shipForm.sendType = 3;
|
|
|
this.$service.single
|
|
|
.orderDeliver({ id: this.orderData.id, option: 1, ...this.shipForm })
|
|
|
.then(res => {
|
|
|
-
|
|
|
- this.$message.success('已提交!');
|
|
|
+ this.$message.success('已提交!');
|
|
|
|
|
|
this.getDet();
|
|
|
// this.shipDialog = false;
|
|
|
@@ -741,8 +803,8 @@ export default {
|
|
|
this.$service.single.orderReach({ id: this.orderData.id, option: 1 }).then(res => {
|
|
|
this.$message.success('已确认!');
|
|
|
this.getDet();
|
|
|
- this.confirmSendVisit=false;
|
|
|
- //操作栏置空
|
|
|
+ this.confirmSendVisit = false;
|
|
|
+ //操作栏置空
|
|
|
this.$set(this.orderData, 'status', '5');
|
|
|
this.$set(this.orderData, 'currentFlow', this.orderData.totalFlow);
|
|
|
});
|
|
|
@@ -882,8 +944,8 @@ export default {
|
|
|
.ship-draw-wrap {
|
|
|
.el-drawer__header {
|
|
|
margin-bottom: 20px;
|
|
|
- span{
|
|
|
- outline:none;
|
|
|
+ span {
|
|
|
+ outline: none;
|
|
|
}
|
|
|
}
|
|
|
}
|