问题修复
This commit is contained in:
donqi
parent
222a0fabb0
commit
07b45468df
|
|
@ -13,8 +13,8 @@ export default {
|
|||
})
|
||||
let userInfo = _this.getCurUserInfo();
|
||||
// request 触发前拼接 url
|
||||
args.url = 'https://www.opsoul.com' + args.url;
|
||||
// args.url = 'http://127.0.0.1:80' + args.url;
|
||||
// args.url = 'https://www.opsoul.com' + args.url;
|
||||
args.url = 'http://127.0.0.1:80' + args.url;
|
||||
// args.url = 'http://192.168.2.42:80' + args.url;
|
||||
|
||||
if (!args.data) {
|
||||
|
|
@ -492,5 +492,13 @@ export default {
|
|||
data: params.orderMasterId
|
||||
})
|
||||
return res[1].data;
|
||||
},
|
||||
async updateMasterOrder(params = {}) {
|
||||
let res = await uni.request({
|
||||
url: '/order/master/editOrderMaster',
|
||||
method: 'POST',
|
||||
data: params
|
||||
})
|
||||
return res[1].data;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@
|
|||
},
|
||||
confirm() {
|
||||
this.$emit('confirm', {
|
||||
leaderTeamRate: this.rate,
|
||||
leaderTeamRate: this.rate ? this.rate/100 : 0,
|
||||
leaderTeamMoney: this.amount
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,12 +42,12 @@
|
|||
<view class="cu-bar bg-white tabbar border shop fixed-bottom-bar">
|
||||
<view class="left-grid text-center" data-modal="takeRateSet" @click="showModalByRef('setTakeRateModal')">
|
||||
<view>设置扣点</view>
|
||||
<view v-if="curUserInfo.leaderTeamRate">(扣点：<text class="text-red">{{curUserInfo.leaderTeamRate}}%</text>)</view>
|
||||
<view v-if="curUserInfo.leaderTeamRate">(扣点：<text class="text-red">{{Number(curUserInfo.leaderTeamRate)*100}}%</text>)</view>
|
||||
</view>
|
||||
<view class="bg-main-color submit" @click="showModalByRef('inviteMasterModal')">邀请团队</view>
|
||||
</view>
|
||||
|
||||
<set-take-rate ref="setTakeRateModal" :leaderTeamRate="curUserInfo.leaderTeamRate" :leaderTeamMoney="curUserInfo.leaderTeamMoney" @confirm="applySetTakeRate"></set-take-rate>
|
||||
<set-take-rate ref="setTakeRateModal" :leaderTeamRate="Number(curUserInfo.leaderTeamRate)*100" :leaderTeamMoney="curUserInfo.leaderTeamMoney" @confirm="applySetTakeRate"></set-take-rate>
|
||||
<invite-master ref="inviteMasterModal" @confirm="inviteMaster"></invite-master>
|
||||
</view>
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -126,7 +126,12 @@
|
|||
},
|
||||
assignWork(member) {
|
||||
let goodsToAssign = [];
|
||||
// 标识是否派完所有goods，1为派完，0为未派完
|
||||
let isAll = 1;
|
||||
this.pickedList.forEach((item) => {
|
||||
if (item.goodsNum !== item.toAssignNum) {
|
||||
isAll = 0;
|
||||
}
|
||||
if (item.toAssignNum) {
|
||||
goodsToAssign.push({
|
||||
goodsStandardId: item.goodsStandardId,
|
||||
|
|
@ -139,8 +144,10 @@
|
|||
goodsList: goodsToAssign,
|
||||
workerId: member.workerId,
|
||||
totalPay: this.dispatchTotalPrice,
|
||||
orderMasterId: this.curOrder.orderMasterId
|
||||
orderMasterId: this.curOrder.orderMasterId,
|
||||
isAll: isAll
|
||||
}
|
||||
console.log(params)
|
||||
this.$emit('assignWork', params);
|
||||
} else {
|
||||
uni.showToast({
|
||||
|
|
|
|||
|
|
@ -79,8 +79,8 @@
|
|||
<view v-else-if="order.orderStatus === 1" class="right-tag padding-lr-sm padding-tb-xs bg-main-color">未</view>
|
||||
<view v-else-if="order.orderStatus === 2" class="right-tag padding-lr-sm padding-tb-xs bg-yellow">待</view>
|
||||
<view v-else-if="order.orderStatus === 3" class="right-tag padding-lr-sm padding-tb-xs bg-purple">服</view>
|
||||
<view v-else-if="order.orderStatus === 6" class="right-tag padding-lr-sm padding-tb-xs bg-orange">确</view>
|
||||
<view v-else-if="order.orderStatus === 4" class="right-tag padding-lr-sm padding-tb-xs bg-green">完</view>
|
||||
<view v-else-if="order.orderStatus === 4" class="right-tag padding-lr-sm padding-tb-xs bg-orange">确</view>
|
||||
<view v-else-if="order.orderStatus === 5" class="right-tag padding-lr-sm padding-tb-xs bg-green">完</view>
|
||||
</view>
|
||||
<view>
|
||||
<view v-for="(tag, index1) in order.tags" v-if="tag.level === 'error'" class='cu-tag margin-right-xs radius line-red margin-top-xs'>{{tag.content}}</view>
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
|
||||
<text>服务时间：{{order.expectTimeStart + '~' + order.expectTimeEnd}}</text>
|
||||
</view>
|
||||
<view class="margin-top-sm" v-if="tabCur !== 0 && tabCur !== 1">
|
||||
<view class="margin-top-sm" v-if="[0,1,2].indexOf(order.orderStatus) === -1">
|
||||
<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
|
||||
<text>上门时间：{{order.workBeginTime}}</text>
|
||||
</view>
|
||||
|
|
@ -125,10 +125,10 @@
|
|||
</view>
|
||||
<!-- 不同状态订单支持不同操作按钮 -->
|
||||
<view v-if="order.orderStatus === 0">
|
||||
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-popup="dispatchOrder" @click="getCanAssignList(order)" @tap="togglePopup($event, order)">派单</button>
|
||||
<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-popup="dispatchOrder" @click="getCanAssignList(order)" @tap="togglePopup($event, order)">派单</button>
|
||||
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm">改价</button>
|
||||
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm">转发</button>
|
||||
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm">确认接单</button>
|
||||
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm">转发</button> -->
|
||||
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="updateMasterOrder(order, 1)">确认接单</button>
|
||||
</view>
|
||||
<view v-if="order.orderStatus === 1">
|
||||
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-popup="dispatchOrder" @click="getCanAssignList(order)" @tap="togglePopup($event, order)">派单</button>
|
||||
|
|
@ -146,7 +146,7 @@
|
|||
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showNewServPriceModal" @tap="showModal($event, order)">改价</button>
|
||||
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="makePhoneCall(order.customerPhone)">联系客户</button>
|
||||
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showEditTimeArrangeModal" @tap="showModal($event, order)">重新排期</button>
|
||||
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="finishOrder(order)">发起完单</button>
|
||||
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="finishOrder(order)" v-if="order.payStatus === 1">发起完单</button>
|
||||
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showPayQrcodeModal" v-if="order.payStatus === 0" @tap="makePayQrcode($event, order)">生成付款码</button>
|
||||
</view>
|
||||
<!-- <view v-if="order.orderStatus === 4">
|
||||
|
|
@ -269,16 +269,16 @@
|
|||
categoryList: [],
|
||||
categoryMultiIndex: [0, 0, 0],
|
||||
stateList: [{
|
||||
code: 1,
|
||||
code: -1,
|
||||
name: '超时单'
|
||||
}, {
|
||||
code: 2,
|
||||
code: -1,
|
||||
name: '今日单'
|
||||
}, {
|
||||
code: 3,
|
||||
code: -1,
|
||||
name: '明日单'
|
||||
}, {
|
||||
code: 4,
|
||||
code: -1,
|
||||
name: '急报单'
|
||||
}, {
|
||||
code: 0,
|
||||
|
|
@ -294,20 +294,22 @@
|
|||
code: 3,
|
||||
name: '服务中'
|
||||
}, {
|
||||
code: 6,
|
||||
name: '确认中'
|
||||
code: 4,
|
||||
name: '待确认'
|
||||
},
|
||||
// {
|
||||
// code: '-',
|
||||
// name: '售后中'
|
||||
// },
|
||||
{
|
||||
code: 4,
|
||||
code: 5,
|
||||
name: '已完成'
|
||||
}],
|
||||
myOrders: {},
|
||||
orderList: [],
|
||||
pageParams: [],
|
||||
// pageParams: [],
|
||||
pageNum: 0,
|
||||
pageSize: 0,
|
||||
curOrder: {},
|
||||
myTeamMembers: [],
|
||||
scrollLeft: 0,
|
||||
|
|
@ -343,11 +345,11 @@
|
|||
// this.categoryList = await this.$api.data('categoryList');
|
||||
|
||||
// 初始化分页参数
|
||||
for(let i = 0; i < this.subStateList.length; i++) {
|
||||
this.pageParams.push({
|
||||
pageNum: 0
|
||||
});
|
||||
}
|
||||
// for(let i = 0; i < this.subStateList.length; i++) {
|
||||
// this.pageParams.push({
|
||||
// pageNum: 0
|
||||
// });
|
||||
// }
|
||||
// 初始化订单列表
|
||||
this.loadMasterOrderPage({
|
||||
orderStatus: this.subStateList[0].code
|
||||
|
|
@ -361,25 +363,32 @@
|
|||
this.curUserInfo = this.getCurUserInfo();
|
||||
},
|
||||
reloadMasterOrderPage(params = {}) {
|
||||
this.pageParams = [];
|
||||
for(let i = 0; i < this.subStateList.length; i++) {
|
||||
this.pageParams.push({
|
||||
pageNum: 0
|
||||
});
|
||||
}
|
||||
// this.pageParams = [];
|
||||
// for(let i = 0; i < this.subStateList.length; i++) {
|
||||
// this.pageParams.push({
|
||||
// pageNum: 0
|
||||
// });
|
||||
// }
|
||||
this.pageNum = 0;
|
||||
this.orderList = [];
|
||||
this.$refs.loadStatusBar.showLoadMore();
|
||||
this.loadMasterOrderPage();
|
||||
},
|
||||
async loadMasterOrderPage(params = {}) {
|
||||
params.pageSize = this.$globalData.initPageSize;
|
||||
params.orderStatus = this.subStateList[this.tabCur].code;
|
||||
params.pageNum = this.pageParams[this.tabCur].pageNum;
|
||||
// params.orderStatus = this.subStateList[this.tabCur].code;
|
||||
// params.pageNum = this.pageParams[this.tabCur].pageNum;
|
||||
params.pageNum = this.pageNum;
|
||||
if (this.tabCur != null) {
|
||||
params.orderStatus = this.subStateList[this.tabCur].code;
|
||||
} else if (this.stateCur != null) {
|
||||
params.orderStatus = this.stateList[this.stateCur].code;
|
||||
}
|
||||
this.$refs.loadStatusBar.showLoading();
|
||||
try {
|
||||
let res = null;
|
||||
// 不同状态的单需要请求不同接口
|
||||
if (this.tabCur === 0) {
|
||||
if (this.tabCur === 0 || this.stateCur != null) {
|
||||
res = await this.$request.qryMasterOrderPage(params);
|
||||
} else {
|
||||
res = await this.$request.qryDetailOrderPage(params);
|
||||
|
|
@ -390,7 +399,8 @@
|
|||
this.orderList = [];
|
||||
} else if (rowsLength > 0) {
|
||||
this.orderList = this.orderList.concat(res.rows);
|
||||
this.pageParams[this.tabCur].pageNum++;
|
||||
// this.pageParams[this.tabCur].pageNum++;
|
||||
this.pageNum++;
|
||||
if (rowsLength === this.pageSize) {
|
||||
this.$refs.loadStatusBar.showLoadMore();
|
||||
return;
|
||||
|
|
@ -586,7 +596,11 @@
|
|||
if (res.code === 0) {
|
||||
let finishFlag = false;
|
||||
if (ifRollback2WS) {
|
||||
let statusUpdateRes = await this.updateOrderDetailStatus(id, 2);
|
||||
let statusUpdateRes = await this.updateOrderDetailStatus({
|
||||
id: id,
|
||||
orderStatus: 2,
|
||||
workBeginTime: ''
|
||||
});
|
||||
if (statusUpdateRes && statusUpdateRes.code === 0) {
|
||||
finishFlag = true;
|
||||
}
|
||||
|
|
@ -602,12 +616,8 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
async updateOrderDetailStatus(orderDetailId, status) {
|
||||
let res = await this.$request.updateDetailOrder({
|
||||
id: orderDetailId,
|
||||
orderStatus: status,
|
||||
workBeginTime: ''
|
||||
});
|
||||
async updateOrderDetailStatus(params = {}) {
|
||||
let res = await this.$request.updateDetailOrder(params);
|
||||
return res;
|
||||
},
|
||||
showArrangeFailTime(e) {
|
||||
|
|
@ -664,8 +674,28 @@
|
|||
// url: '/pages/order-manage/finish-order?order=' + encodeURIComponent(JSON.stringify(order))
|
||||
// })
|
||||
// },
|
||||
async updateMasterOrder(order, status) {
|
||||
let res = await this.$request.updateMasterOrder({
|
||||
id: order.orderMasterId,
|
||||
orderStatus: status,
|
||||
});
|
||||
if (res && res.code === 0) {
|
||||
this.reloadMasterOrderPage();
|
||||
uni.showToast({
|
||||
icon: 'success'
|
||||
})
|
||||
}
|
||||
},
|
||||
async finishOrder(order) {
|
||||
let res = await this.updateOrderDetailStatus(order.orderDetailId, 6);
|
||||
let curDate = new Date();
|
||||
let formatCurDate = curDate.getFullYear() + '-' + (curDate.getMonth() + 1) + '-' + curDate.getDate()
|
||||
+ ' ' + curDate.getHours() + ':' + curDate.getMinutes() + ':' + curDate.getSeconds();
|
||||
|
||||
let res = await this.updateOrderDetailStatus({
|
||||
id: order.orderDetailId,
|
||||
orderStatus: 4,
|
||||
workFinishTime: formatCurDate
|
||||
});
|
||||
if (res && res.code === 0) {
|
||||
this.reloadMasterOrderPage();
|
||||
uni.showToast({
|
||||
|
|
@ -706,6 +736,7 @@
|
|||
let res = await this.$request.assign(params);
|
||||
if (res.code === 0) {
|
||||
this.getCanAssignList(this.curOrder);
|
||||
this.reloadMasterOrderPage();
|
||||
uni.showToast({
|
||||
title: '派单成功',
|
||||
icon: 'success'
|
||||
|
|
@ -728,7 +759,8 @@
|
|||
goodsList: goodsToAssign,
|
||||
workerId: this.curUserInfo.workerId,
|
||||
totalPay: orderInfo.totalMoney,
|
||||
orderMasterId: orderInfo.orderMasterId
|
||||
orderMasterId: orderInfo.orderMasterId,
|
||||
isAll: 1
|
||||
}
|
||||
this.assignWork(params);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue