clunt
/
dingdong-master
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

急报/超时/售后三个状态不出现全部自己承接的监控单；确认中增加分账倒计时；

This commit is contained in:
donqi 2022-11-21 01:01:40 +08:00
parent a03637bb95
commit 2ad8087bfd
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pages/order-manage/order-manage.vue
View File

@ -163,14 +163,14 @@
<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text> <text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
<text>完成时间：{{order.workFinishTime}}</text> <text>完成时间：{{order.workFinishTime}}</text>
</view> </view>
<view class="margin-top-sm flex justify-start align-center" v-if="order.subState === 4 && order.chargeReachDate"> <view class="margin-top-sm flex justify-start align-center" v-if="order.orderDetailId != null && tabCur === 3">
<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text> <text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
<text>距到帐：</text> <text>距完单分帐：</text>
<uni-countdown :show-colon="false" :backgroundColor="'#eee'" <uni-countdown :show-colon="false" :backgroundColor="'#e35b33'" :color="'#faf3f0'"
:day="$dateUtil.countDownDiff(order.chargeReachDate).day" :day="$dateUtil.countDownDiff($dateUtil.addHours(order.updateTime, 12)).day"
:hour="$dateUtil.countDownDiff(order.chargeReachDate).hour" :hour="$dateUtil.countDownDiff($dateUtil.addHours(order.updateTime, 12)).hour"
:minute="$dateUtil.countDownDiff(order.chargeReachDate).min" :minute="$dateUtil.countDownDiff($dateUtil.addHours(order.updateTime, 12)).min"
:second="$dateUtil.countDownDiff(order.chargeReachDate).seconds"> :second="$dateUtil.countDownDiff($dateUtil.addHours(order.updateTime, 12)).seconds">
</uni-countdown> </uni-countdown>
</view> </view>
<!-- 不同状态订单支持不同操作按钮 --> <!-- 不同状态订单支持不同操作按钮 -->
@ -583,6 +583,8 @@
} else if (this.stateList[this.stateCur].code === 104) { } else if (this.stateList[this.stateCur].code === 104) {
// 搁置单 // 搁置单
params.shelveStatus = 1; params.shelveStatus = 1;
params.isMonitoredOrder = true;
params.allSelfAssigned = 0;
} else if (this.stateList[this.stateCur].code === 105) { } else if (this.stateList[this.stateCur].code === 105) {
// 监控单 // 监控单
// params.orderStatuses = "2,3,4,5"; // params.orderStatuses = "2,3,4,5";
@ -590,10 +592,19 @@
} else if (this.stateList[this.stateCur].code === 103) { } else if (this.stateList[this.stateCur].code === 103) {
// 超时单 // 超时单
params.isMonitoredOrder = true; params.isMonitoredOrder = true;
params.allSelfAssigned = 0;
}
// else if (this.stateList[this.stateCur].code === 100) {
// // 急报单
// params.isMonitoredOrder = true;
// params.allSelfAssigned = 0;
// }
} else if (this.tabCur != null) {
if (this.tabCur === 4) {
// 售后中的单
params.isMonitoredOrder = true;
params.allSelfAssigned = 0;
} }
} else if (this.tabCur != null && this.tabCur === 4) {
// 售后中的单
params.isMonitoredOrder = true;
} }
try { try {
let res = null; let res = null;

2
pages/order-manage/serv-detail.vue
View File

@ -33,7 +33,7 @@
<view class="flex align-center"> <view class="flex align-center">
<text class="text-xl margin-right">{{servDetail.goodsName}}</text> <text class="text-xl margin-right">{{servDetail.goodsName}}</text>
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 5">已完成</view> <view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 5">已完成</view>
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 4">待确认</view> <view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 4">确认中</view>
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 3">服务中</view> <view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 3">服务中</view>
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 2">待上门</view> <view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 2">待上门</view>
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 1">未约/未排</view> <view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 1">未约/未排</view>