uu

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, {})

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`, // 获取汇率
   

pages/tabBar/order/order.vue

@@ -75,6 +75,8 @@
 												:plain="true" custom-style="height: 54rpx;margin-left: 12rpx;">进仓单</u-button>
 
 											<template v-if="item.orderStatus == 0">
+												<u-button v-if="item.pickupMethod == 2" @click="handleDealItem(item, { type: 7 })" shape="circle"
+													type="primary" :plain="true" custom-style="height: 54rpx;margin-left: 12rpx;">转单</u-button>
 												<u-button @click="handleDealItem(item, { type: 2 })" shape="circle"
 													type="primary" :plain="true" custom-style="height: 54rpx;margin-left: 12rpx;">接单</u-button>
 												<u-button @click="handleDealItem(item, { type: 3 })" shape="circle"
@@ -102,13 +104,25 @@
 			</template>
 		</tpx-layout>
 
-		<tpx-com-dialog v-model:show="cancelModal.show" ref="cancelRef" title="确认取消">
+		<tpx-com-dialog v-model:show="cancelModal.show" ref="cancelRef" title="取消">
 			<template v-slot:body>
 				<u-textarea v-model="cancelModal.data.orderRemark" border="surround" height="120" placeholder="请输入"
 					maxlength="300" count></u-textarea>
 			</template>
 		</tpx-com-dialog>
 		
+		<tpx-com-dialog v-model:show="zhuanDanModal.show" ref="zhuanDanRef" title="转单">
+			<template v-slot:body>
+				<u-row justify="between" custom-style="margin-top:20rpx;">
+					<view style="width: 130rpx;">取件员</view>
+					<view style="width: 300rpx;">
+						<tpx-select v-model:value="zhuanDanModal.data.takePieceEmployeeCode" placeholder="请选择取件员" mode="drop" 
+							:isWhite="true" v-model:resObject="shoupaiRes" :getListFun="getRSDStaffList" :transKeyVal="{valKey: 'empCode',titleKey: 'empName'}" 
+						></tpx-select>
+					</view>
+				</u-row>
+			</template>
+		</tpx-com-dialog>
 	</tpx-page>
 </template>
 
@@ -179,14 +193,19 @@
 					commStat: {},
 					orderStat: {},
 				},
-				resData: {
+				resData: { list: [] },
-					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;
 				}