1、子单详情中展示售后情况

2、修复未约未排中的主单派单完成后仍出现在未约未排栏的问题
3、监控单不展示自己承接的主单
4、未全部派完的主单调整为展示在未约未排及监控单两栏

pages/order-manage/dispatch-order.vue

@@ -20,7 +20,7 @@
 				</view>
 			</view>
 			<view class="padding-top-sm padding-bottom-xs flex justify-between align-center">
-				<text class="margin-right-sm">本单任务金额：<text class="text-red text-lg">{{totalMoney}}</text></text>
+				<text class="margin-right-sm">本单可派任务金额：<text class="text-red text-lg">{{totalMoney}}</text></text>
 			</view>
 			<view class="padding-bottom-sm solid-bottom flex justify-between align-center">
 				<text class="margin-right-sm" style="width: 150rpx;">派单价格</text>
@@ -120,6 +120,8 @@
 			},
 			resetData() {
 				this.dispatchTotalPrice = null;
+				this.pickedList = [];
+				this.curOrder = {};
 			},
 			loadData(order) {
 				this.resetData();
@@ -137,7 +139,6 @@
 				let goodsToAssign = [];
 				// 标识是否派完所有goods，1为派完，0为未派完
 				let isAll = 1;
-				console.log(this.pickedList)
 				this.pickedList.forEach((item) => {
 					if (item.goodsNum !== item.toAssignNum) {
 						isAll = 0;

pages/order-manage/order-manage.vue

@@ -583,7 +583,7 @@
 					} else if (this.stateList[this.stateCur].code === 105) {
 						// 监控单
 						// params.orderStatuses = "2,3,4,5";
-						params.filterOnlyServOrder = true;
+						params.isMonitoredOrder = true;
 					}
 				}
 				try {

pages/order-manage/serv-detail.vue

@@ -119,6 +119,139 @@
 				<text>备注：{{servDetail.workerRemark}}</text>
 			</view>
 		</view>
+		<view class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm">
+			<view class="cu-bar solid-bottom">
+				<view class="action bar-first-action">
+					<text class="cuIcon-titles text-main-color"></text> 售后记录
+				</view>
+			</view>
+			<view v-for="(afterServiceRecord, afterServiceRecordIndex) in servDetail.afterServiceRecordList" v-if="servDetail.orderDetailId != null">
+				<view v-if="afterServiceRecord.createBy == 1" class="padding-tb-sm solid-top">
+					<view class='cu-tag bg-main-color radius light'>售后发起中</view>
+					<view v-if="afterServiceRecord.operType === 1">
+						<view class="text-gray text-sm margin-bottom-xs">退单退款已提交至商家，其最大时限24小时内需完成操作！</view>
+						<view class="flex justify-start align-end">
+							<text>退款申请：</text>
+							<uni-countdown :show-colon="false" :backgroundColor="'#eee'"
+								:day="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).day"
+								:hour="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).hour"
+								:minute="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).min"
+								:second="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).seconds">
+							</uni-countdown>
+						</view>
+						<view>
+							<text>退款金额：</text>
+							<text>{{afterServiceRecord.refund}}</text>
+						</view>
+						<view>
+							<text>退款原因：</text>
+							<text>{{afterServiceRecord.customerReason}}</text>
+						</view>
+						<view class="grid col-3 grid-square flex-sub margin-top-sm">
+							<view class="bg-img" v-for="(imgObj, imgIndex) in afterServiceRecord.imgsList"
+								:key="imgIndex" v-if="imgObj.imgUploadBy === 1">
+								<image :src="imgObj.imgUrl" @tap="viewImage($event, [imgObj.imgUrl])"
+									:data-url="imgObj.imgUrl" mode="aspectFill"></image>
+							</view>
+						</view>
+						<view>
+							<text class="text-red" v-if="!item.isOnlyServ && item.payMoney < afterServiceRecord.refund">警报：退单金额大于该师傅接单金额，但客户发起的退款金额有效，您需介入处理，如让接单师傅系统上操作同意退款，系统最大按该单派单额退回客户，其余需人工处理！如属于师傅责任引起的退单，建议重做，重做后让客户撤消退单！</text>
+						</view>
+					</view>
+					<view v-else-if="afterServiceRecord.operType === 2">
+						<view class="text-gray text-sm margin-bottom-xs">售后已提交至商家，其最大时限24小时内需完成操作！</view>
+						<view class="flex justify-start align-end">
+							<text>待处理售后：</text>
+							<uni-countdown :show-colon="false" :backgroundColor="'#eee'"
+								:day="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).day"
+								:hour="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).hour"
+								:minute="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).min"
+								:second="$dateUtil.countDownDiff($dateUtil.addHours(afterServiceRecord.createTime, 24)).seconds">
+							</uni-countdown>
+						</view>
+						<view>
+							<text>售后原因：</text>
+							<text>{{afterServiceRecord.customerReason}}</text>
+						</view>
+						<view class="grid col-3 grid-square flex-sub margin-top-sm">
+							<view class="bg-img" v-for="(imgObj, imgIndex) in afterServiceRecord.imgsList"
+								:key="imgIndex" v-if="imgObj.imgUploadBy === 1">
+								<image :src="imgObj.imgUrl" @tap="viewImage($event, [imgObj.imgUrl])"
+									:data-url="imgObj.imgUrl" mode="aspectFill"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="afterServiceRecord.updateBy == 2" class="padding-tb-sm solid-top">
+					<view class='cu-tag bg-main-color radius light'>师傅反馈</view>
+					<view v-if="afterServiceRecord.operType === 1">
+						<view class="margin-top-xs">
+							<text>师傅反馈结果：</text>
+							<text>{{afterServiceRecord.workerFeedbackResult === 1 ? '同意' : '拒绝'}}</text>
+						</view>
+						<view v-if="afterServiceRecord.workerFeedbackResult === 1">
+							<text>同意退款金额：</text>
+							<text>{{afterServiceRecord.agreedRefund ? afterServiceRecord.agreedRefund : afterServiceRecord.refund}}</text>
+						</view>
+						<view>
+							<text>师傅反馈：</text>
+							<text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text>
+							<text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text>
+							<text v-else>其他</text>
+							<text
+								v-if="afterServiceRecord.workerFeedbackReason">{{"，" + afterServiceRecord.workerFeedbackReason}}</text>
+						</view>
+						<view class="grid col-3 grid-square flex-sub margin-top-sm">
+							<view class="bg-img" v-for="(imgObj, imgIndex) in afterServiceRecord.imgsList"
+								:key="imgIndex" v-if="imgObj.imgUploadBy === 2">
+								<image :src="imgObj.imgUrl" @tap="viewImage($event, [imgObj.imgUrl])"
+									:data-url="imgObj.imgUrl" mode="aspectFill"></image>
+							</view>
+						</view>
+					</view>
+					<view v-else-if="afterServiceRecord.operType === 2">
+						<view class="margin-top-xs">
+							<text>师傅反馈结果：</text>
+							<text>{{afterServiceRecord.workerFeedbackResult === 1 ? '同意' : '拒绝'}}</text>
+						</view>
+						<view>
+							<text>师傅反馈：</text>
+							<text v-if="afterServiceRecord.workerFeedbackReasonType === 1">客户原因</text>
+							<text v-else-if="afterServiceRecord.workerFeedbackReasonType === 2">师傅原因</text>
+							<text v-else>其他</text>
+							<text
+								v-if="afterServiceRecord.workerFeedbackReason">{{"，" + afterServiceRecord.workerFeedbackReason}}</text>
+						</view>
+						<view class="grid col-3 grid-square flex-sub margin-top-sm">
+							<view class="bg-img" v-for="(imgObj, imgIndex) in afterServiceRecord.imgsList"
+								:key="imgIndex" v-if="imgObj.imgUploadBy === 2">
+								<image :src="imgObj.imgUrl" @tap="viewImage($event, [imgObj.imgUrl])"
+									:data-url="imgObj.imgUrl" mode="aspectFill"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-if="afterServiceRecord.customerFinalCheck != null" class="padding-tb-sm solid-top">
+					<view class='cu-tag bg-main-color radius light'>客户最终确认</view>
+					<view class="margin-top-xs">{{afterServiceRecord.customerFinalCheck === 1 ? '同意' : '不同意'}}
+					</view>
+					<view class="text-red" v-if="afterServiceRecord.customerFinalCheck === 0">订单交由平台协商处理</view>
+					<view v-else-if="afterServiceRecord.customerFinalCheck === 1">
+						<view v-if="afterServiceRecord.originalRefund > 0">
+							<view>
+								<text>本单退款，系统已发起按客户支付的帐户原路退回</text>
+								<text class="text-red">{{afterServiceRecord.originalRefund}}</text>
+								<text>元，银行按工作日退款，节假日顺延到帐。遇客户问询，请其耐心等待，到账时会在客户端”客户最终确认“处有到账时间。</text>
+							</view>
+							<view>退款支付到账：{{afterServiceRecord.refundApplyTime}}</view>
+						</view>
+						<view v-else-if="afterServiceRecord.originalRefund == 0 && servDetail.payStatus == 0">
+							<text>本单未支付，实际退回0.00元</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
 		<!-- 完成记录 主单详情展示 -->
 		<view v-if="servDetail.orderDetailId == null" class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm" v-for="(item, index) in servDetail.orderStandardDetailList">
 			<view class="cu-bar solid-bottom">