diff --git a/common/api/order.js b/common/api/order.js index 3a35c5a..4968417 100644 --- a/common/api/order.js +++ b/common/api/order.js @@ -188,6 +188,11 @@ export const cancelOrder = (data = {})=> { return coreRequest(url.cancelOrder, data, {}) } +// 转单 +export const assignTakeMan = (data = {})=> { + return coreRequest(url.assignTakeMan, data, {}) +} + // 获取新进仓单号 export const getWareHouseInNo = (data = {})=> { return coreRequest(url.getWareHouseInNo, data, {}) diff --git a/common/api/url.js b/common/api/url.js index ec906ce..37795a7 100644 --- a/common/api/url.js +++ b/common/api/url.js @@ -59,6 +59,7 @@ export default { getCarNoList: `/emis/emisTmsCar/listSimple`, // 获取车牌号列表 confirmOrder: `/emis/emisWaybill/confirmOrder`, // 确认接单 cancelOrder: `/emis/emisWaybill/cancelOrder`, // 取消订单 + assignTakeMan: `/emis/emisWaybill/assignTakeMan`, // 转单 getWareHouseInNo: `/emis/common/getWareHouseInNo`, // 获取新进仓单号 getValidExchangeRate: `/emis/emisExchangeRate/getValidExchangeRate`, // 获取汇率 diff --git a/pages/tabBar/order/order.vue b/pages/tabBar/order/order.vue index 27a9c14..612844b 100644 --- a/pages/tabBar/order/order.vue +++ b/pages/tabBar/order/order.vue @@ -75,6 +75,8 @@ :plain="true" custom-style="height: 54rpx;margin-left: 12rpx;">进仓单 @@ -179,14 +193,19 @@ commStat: {}, orderStat: {}, }, - resData: { - list: [] - }, + resData: { list: [] }, + shoupaiRes: { list: [] }, cancelModal: { show: false, data: { orderRemark: '' } + }, + zhuanDanModal: { + show: false, + data: { + takePieceEmployeeCode: '' + } } } }, @@ -205,6 +224,7 @@ }, onUnload() {}, methods: { + getRSDStaffList: apiService.getRSDStaffList, transSearchPm(param) { let cpParam = JSON.parse(JSON.stringify(param)) cpParam.params.beginDate = cpParam?._date?.[0] @@ -270,8 +290,10 @@ if (canBl) { await apiService.cancelOrder({ orderSn: item.orderSn, - ...this.cancelModal.data + ...this.cancelModal.data, + _loading: true }) + this.showToast('操作成功') this.triggerListReload() } this.cancelModal.data = {} @@ -286,7 +308,19 @@ case 6: // 进仓单详情 this.goto(`warehousing/detail${itemQuery}&inNo=${item.intoWarehouseBillCode}`) break; - + case 7: // 转单 + let zhdBl = await this.$refs.zhuanDanRef.getConfirmResult() + if (zhdBl) { + await apiService.assignTakeMan({ + orderSn: item.orderSn, + ...this.zhuanDanModal.data, + _loading: true + }) + this.showToast('操作成功') + this.triggerListReload() + } + this.zhuanDanModal.show = false + break; default: break; }