|
|
@@ -22,11 +22,12 @@
|
|
|
<view class="msg-list express-progress-row">
|
|
|
<view class="label">配送进度:</view>
|
|
|
<view class="value">
|
|
|
- {{ orderInfo.sendStatus==-1?'已取消': orderInfo.sendStatus==0?'订单生成':orderInfo.sendStatus==1?'跑腿已接单':orderInfo.sendStatus==2?'派单中':orderInfo.sendStatus==3?'待取货':orderInfo.sendStatus==4?'配送中':orderInfo.sendStatus==5?'已送达':orderInfo.sendStatus==10?'改派中':orderInfo.sendStatus==20?'已分配骑手':orderInfo.sendStatus==30?'骑手已到店':'未知'}}
|
|
|
+ {{ getSendStatusText(orderInfo.sendStatus) }}
|
|
|
</view>
|
|
|
<view class="express-actions">
|
|
|
- <button class="admin-button-com mini-btn btn-danger" v-if="['0', '1', '2', '3', '4', '10', '20', '30'].includes(String(orderInfo.sendStatus))" @click.stop="cancelMyExpress(orderInfo.id, orderInfo.deliveryId)">取消跑腿</button>
|
|
|
- <button class="admin-button-com mini-btn" v-if="orderInfo.sendStatus == '-1'" @click.stop="openExpressPage(orderInfo.id)">重叫跑腿</button>
|
|
|
+ <button class="admin-button-com mini-btn btn-danger" v-if="[0, 1, 2, 3, 4, 10, 20, 30].includes(Number(orderInfo.sendStatus))" @click.stop="cancelMyExpress(orderInfo.id, orderInfo.deliveryId)">取消跑腿</button>
|
|
|
+
|
|
|
+ <button class="admin-button-com mini-btn" v-if="[-1, -2].includes(Number(orderInfo.sendStatus))" @click.stop="openExpressPage(orderInfo.id)">重叫跑腿</button>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -368,7 +369,7 @@
|
|
|
<button class="admin-button-com middle" @click.stop="sendWork(orderInfo)" v-if="orderInfo.payStatus == 1 && (orderInfo.hasWork == 0 || orderInfo.hasWork == 2)">通知制作</button>
|
|
|
<button class="admin-button-com middle" @click.stop="cancelFn(orderInfo)" v-if="orderInfo.status == 1"> 取消 </button>
|
|
|
<button class="admin-button-com middle" @click.stop="goScan(orderInfo)" v-if="orderInfo.status == 1"> 扫码收款 </button>
|
|
|
- <button class="admin-button-com middle" v-if="orderInfo.sendStatus == '-4' && orderInfo.payStatus == 1" @click.stop="openExpressPage(orderInfo.id)">呼叫跑腿</button>
|
|
|
+ <button class="admin-button-com middle" v-if="orderInfo.sendStatus == -4 && orderInfo.payStatus == 1" @click.stop="openExpressPage(orderInfo.id)">呼叫跑腿</button>
|
|
|
<button class="admin-button-com middle" @click.stop="printOrder(orderInfo)" v-if="orderInfo.payStatus == 1"> 打印 </button>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -435,7 +436,7 @@ const commonUtil = require("@/utils/common.js");
|
|
|
import { confirmSettle } from "@/api/settle/index"
|
|
|
import { refundAmount } from "@/api/refund";
|
|
|
import { expressDetail } from "@/api/express";
|
|
|
-import { cancelExpressOrder,mockNotify } from '@/api/shop-express'
|
|
|
+import { cancelExpressOrder, mockNotify } from '@/api/shop-express'
|
|
|
import { cancelDeliveryOrder, getCancelReason, addTip as addTipApi } from '@/api/express/delivery'
|
|
|
import { needWork } from "@/api/work"
|
|
|
import { CURRENT_ENV } from "@/config"
|
|
|
@@ -503,6 +504,26 @@ export default {
|
|
|
}
|
|
|
return platformMap[platform] || platform
|
|
|
},
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 转换配送状态为中文显示
|
|
|
+ */
|
|
|
+ getSendStatusText(status) {
|
|
|
+ const statusStr = String(status);
|
|
|
+ const statusMap = {
|
|
|
+ '-1': '已取消',
|
|
|
+ '0': '跑腿订单生成',
|
|
|
+ '1': '跑腿已接单',
|
|
|
+ '2': '派单中',
|
|
|
+ '3': '待取货',
|
|
|
+ '4': '配送中',
|
|
|
+ '5': '已送达',
|
|
|
+ '10': '改派中',
|
|
|
+ '20': '已分配骑手',
|
|
|
+ '30': '骑手已到店',
|
|
|
+ }
|
|
|
+ return statusMap[statusStr] || '未知';
|
|
|
+ },
|
|
|
|
|
|
goPreOrder(info) {
|
|
|
if (!this.$util.isEmpty(info.forwardMap)) {
|