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

1、主单中展示服务金额 

2、派单弹窗中可派金额需要随着派出变化
3、监控单中的未派完的主单只保留一个“查看”的功能按钮
4、串单问题修复
5、加价跟退款弹窗的输入框输入不了的问题修复
This commit is contained in:
donqi 2022-11-09 01:07:15 +08:00
parent 245b34da43
commit d55464a7a6
5 changed files with 52 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pages/order-manage/dispatch-order.vue
View File

@ -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">{{curOrder.serverMoney}}</text></text>
</view>
<view class="padding-bottom-sm solid-bottom flex justify-between align-center">
<text class="margin-right-sm" style="width: 150rpx;">派单价格</text>
@ -93,10 +93,6 @@
orderNow: {
type: Boolean,
default: false
},
totalMoney: {
type: Number,
default: null
}
},
data() {
@ -128,11 +124,16 @@
this.getCanAssignList(order);
},
async getCanAssignList(order) {
// 获取最新的订单信息
let getOrderRes = await this.$request.getOrderMasterDetail({
id: order.orderMasterId
});
let res = await this.$request.getCanAssignList({
orderMasterId: order.orderMasterId
});
let pickedList = res.data;
this.curOrder = order;
this.curOrder = getOrderRes.data;
this.pickedList = pickedList;
},
assignWork(member) {

4
pages/order-manage/modal/agree-after-sale.vue
View File

@ -17,7 +17,7 @@
</view>
<view class="text-lg padding-top flex justify-start align-center">
<text>更改退款金额：</text>
<input class="radius-input inline-input" v-model="agreedRefund"></input>
<input type="digit" class="radius-input inline-input" v-model="agreedRefund"></input>
<text class="margin-left-xs">元</text>
</view>
<view class="padding-top">
@ -39,7 +39,7 @@
</radio-group>
</view>
<view class="margin-top">
<textarea style="width: 100%; height: 200rpx;" class="solid radius text-left padding-sm"
<textarea style="width: 100%; height: 200rpx;" fixed="true" class="solid radius text-left padding-sm"
v-model="remark" maxlength="-1"
placeholder="请输入同意原因或更改金额原因（更改退单金额需与客户协商一致，或请订单详情处“派单公司”介入，否则可能被拒绝或引起客诉升级）"></textarea>
</view>

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

@ -184,12 +184,15 @@
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" v-if="order.orderDetailId == null" @click="rejectMasterOrder(order)">拒绝接单</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" v-else @click="rejectDetailOrder(order)">拒绝接单</button>
</view>
<view v-if="order.orderStatus === 1">
<view v-if="order.orderStatus === 1 && tabCur === 0">
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="showServOrderDetail(order)">查看</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-popup="dispatchOrderPopup" @click="getCanAssignList(order)" @tap="togglePopup($event, order)" v-show="order.orderDetailId == null">派单</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="assignWork2MySelf(order)" v-show="order.orderDetailId == null">自己承接</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showTimeArrangeModal" @tap="showModal($event, order)">预约时间</button>
</view>
<view v-else-if="order.orderStatus === 1">
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="showServOrderDetail(order)">查看</button>
</view>
<view v-if="order.orderStatus === 2">
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="showServOrderDetail(order)">查看</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="makePhoneCall(order.customerPhone)">联系客户</button>
@ -352,20 +355,22 @@
<load-status-bar v-show="tabCur === 5 || (stateCur != null && stateList[stateCur].code === 105)" ref="loadStatusBar" @loadMore="loadMasterOrderPage"></load-status-bar>
<view v-show="tabCur !== 5 && stateCur !== 0" class="cu-tabbar-height"></view>
<!-- 模态框 -->
<time-arrange :show="showTimeArrangeModal" :data="curOrder" :curDate="curDate" @showArrangeFailTime="showArrangeFailTime" @editServTime="editServTime"></time-arrange>
<time-arrange-fail :show="showArrangeFailTimeModal" :data="curOrder"></time-arrange-fail>
<new-serv-price-online ref="newServPriceOnline" :show="showNewServPriceOnlineModal" :data="curOrder" @finishOrder="finishOrder"></new-serv-price-online>
<new-serv-price-offline ref="newServPriceOffline" :show="showNewServPriceOfflineModal" :data="curOrder" @finishOrder="finishOrder"></new-serv-price-offline>
<pay-qrcode ref="payQrcode" :show="showPayQrcodeModal" :data="curOrder" @finishQrPay="finishQrPay"></pay-qrcode>
<edit-time-arrange :show="showEditTimeArrangeModal" :data="curOrder" :curDate="curDate" @showArrangeFailTime="showArrangeFailTime" @editServTime="editServTime" :ifRollback2WS="true"></edit-time-arrange>
<urgent-msg :show="sendUrgentMsgModal" @hideModal="hideModal"></urgent-msg>
<agree-after-sale v-if="agreeAfterSale" :show="agreeAfterSale" :data="curOrder" @confirmFeedback="reloadMasterOrderPage"></agree-after-sale>
<reject-after-sale v-if="rejectAfterSale" :show="rejectAfterSale" :data="curOrder" @confirmFeedback="reloadMasterOrderPage"></reject-after-sale>
<time-arrange v-if="showTimeArrangeModal" :show="showTimeArrangeModal" :data="curOrder" :curDate="curDate" @showArrangeFailTime="showArrangeFailTime" @editServTime="editServTime"></time-arrange>
<time-arrange-fail v-if="showArrangeFailTimeModal" :show="showArrangeFailTimeModal" :data="curOrder"></time-arrange-fail>
<new-serv-price-online v-if="showNewServPriceOnlineModal" ref="newServPriceOnline" :show="showNewServPriceOnlineModal" :data="curOrder" @finishOrder="finishOrder"></new-serv-price-online>
<new-serv-price-offline v-if="showNewServPriceOfflineModal" ref="newServPriceOffline" :show="showNewServPriceOfflineModal" :data="curOrder" @finishOrder="finishOrder"></new-serv-price-offline>
<pay-qrcode v-if="showPayQrcodeModal" ref="payQrcode" :show="showPayQrcodeModal" :data="curOrder" @finishQrPay="finishQrPay"></pay-qrcode>
<edit-time-arrange v-if="showEditTimeArrangeModal" :show="showEditTimeArrangeModal" :data="curOrder" :curDate="curDate" @showArrangeFailTime="showArrangeFailTime" @editServTime="editServTime" :ifRollback2WS="true"></edit-time-arrange>
<urgent-msg v-if="sendUrgentMsgModal" :show="sendUrgentMsgModal" @hideModal="hideModal"></urgent-msg>
<pic-modal ref="showPicModal" :imgList="picModalImgList"></pic-modal>
<!-- popup -->
<uni-popup ref="dispatchOrderPopup" type="bottom" @change="changePopupState">
<view class="text-bold text-gray text-lg text-center left-top-sm-bar" data-popup="dispatchOrderPopup" @click="togglePopup"><text
class="cuIcon-close"></text></view>
<view class="bg-white padding" style="padding-top: 74rpx; min-height: 600rpx;">
<dispatch-order ref="dispatchOrder" v-if="myTeamMembers && myTeamMembers.length > 0" @assignWork="assignWork" :members="myTeamMembers" :totalMoney="curOrder.totalMoney"></dispatch-order>
<dispatch-order ref="dispatchOrder" v-if="myTeamMembers && myTeamMembers.length > 0" @assignWork="assignWork" :members="myTeamMembers" :totalMoney="curOrder.serverMoney"></dispatch-order>
<view v-else class="align-center-view text-xl">无可指派的师傅</view>
</view>
<!-- 底部占位 -->
@ -373,9 +378,7 @@
</uni-popup>
<!-- 账户及实名弹窗 -->
<vertify-bank-bind ref="vertifyBankBind"></vertify-bank-bind>
<vertify-certify ref="vertifyCertify"></vertify-certify>
<agree-after-sale :show="agreeAfterSale" :data="curOrder" @confirmFeedback="reloadMasterOrderPage"></agree-after-sale>
<reject-after-sale :show="rejectAfterSale" :data="curOrder" @confirmFeedback="reloadMasterOrderPage"></reject-after-sale>
<vertify-certify ref="vertifyCertify"></vertify-certify>
</view>
</template>
@ -584,15 +587,27 @@
// 监控单
// params.orderStatuses = "2,3,4,5";
params.isMonitoredOrder = true;
} else if (this.stateList[this.stateCur].code === 103) {
// 超时单
params.isMonitoredOrder = true;
}
} else if (this.tabCur != null && this.tabCur === 4) {
// 售后中的单
params.isMonitoredOrder = true;
}
try {
let res = null;
let tmpStateCur = this.stateCur;
let tmpTabCur = this.tabCur;
// 不同状态的单需要请求不同接口
if (this.stateCur != null && [105].indexOf(this.stateList[this.stateCur].code) >= 0) {
// 只查询主单，需要进行分页处理
this.$refs.loadStatusBar.showLoading();
res = await this.$request.qryMasterOrderPage(params);
// 如果选中的状态栏已经切换，则直接返回
if (this.stateCur !== tmpStateCur || this.tabCur !== tmpTabCur) {
return;
}
if (res && res.rows) {
let rowsLength = res.rows.length;
if (rowsLength > 0) {
@ -616,6 +631,10 @@
funName = "qryMixAfterList";
}
res = await this.$request[funName](params);
// 如果选中的状态栏已经切换，则直接返回
if (this.stateCur !== tmpStateCur || this.tabCur !== tmpTabCur) {
return;
}
if (res && res.data) {
this.orderList = res.data;
}
@ -627,6 +646,10 @@
funName = "getAfterList";
}
res = await this.$request[funName](params);
// 如果选中的状态栏已经切换，则直接返回
if (this.stateCur !== tmpStateCur || this.tabCur !== tmpTabCur) {
return;
}
if (res && res.rows) {
let rowsLength = res.rows.length;
if (rowsLength > 0) {
@ -1093,8 +1116,8 @@
async changePrice(e, order) {
let priceObj = await this.getChangedPrice(order);
let refName = e.currentTarget.dataset.ref;
this.$refs[refName].init(priceObj);
this.showModal(e, order);
this.$refs[refName].init(priceObj);
},
viewImage(e, imgList) {
uni.previewImage({

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

@ -80,8 +80,7 @@
<text class="cuIcon-moneybag text-main-color margin-right-xs"></text>
<text>服务金额：</text>
<text class="text-price" v-if="servDetail.orderDetailId != null">{{servDetail.payMoney}}</text>
<text class="text-price" v-else-if="servDetail.orderDetailId == null && servDetail.payMoney == 0">0</text>
<text class="text-price" v-else>{{servDetail.finalRecvMoney}}</text>
<text class="text-price" v-else>{{servDetail.serverMoney}}</text>
</view>
<view class="margin-top-sm" v-if="servDetail.customerRemark">
<text class="cuIcon-message text-main-color margin-right-xs"></text>
@ -264,6 +263,7 @@
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="item.orderStatus === 3">服务中</view>
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="item.orderStatus === 2">待上门</view>
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="item.orderStatus === 1">未约/未排</view>
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="item.orderStatus === 0">待接单</view>
</view>
<!-- <view class='cu-tag bg-purple radius light margin-right-sm' v-if="item.orderStatus > 3">{{item.workFinishTime}}</view> -->
</view>
@ -288,6 +288,10 @@
<text class="margin-right-xs">联系方式：{{item.workerPhone}}</text>
<button class="cu-btn line-main-color sm" @click="makePhoneCall(item.workerPhone)">拨打</button>
</view>
<view class="margin-top-sm">
服务金额：
<text class="text-price">{{item.payMoney}}</text>
</view>
<view class="margin-top-sm" v-if="item.expectTimeEndFront">预约时间：{{item.expectTimeStartFront + '~' + item.expectTimeEndFront}}</view>
<view class="margin-top-sm" v-else>预约时间：{{item.expectTimeStartFront}}</view>
<view class="margin-top-sm" v-if="item.orderStatus >= 3">上门时间：{{item.workBeginTime}}</view>

2
style/default.css
View File

@ -17,7 +17,7 @@
position: relative;
z-index: 1;
}
.nav-li::after {
content: "";
position: absolute;