提交

lichao
1 parent 932941fd
Showing 3 changed files with 309 additions and 89 deletions
garbage-removal/src/apis/order.js
garbage-removal/src/pages/order-info/order-driver/detail/index.vue
garbage-removal/src/pages/order-info/order-other/detail/index.vue
@@ -188,3 +188,19 @@ export async function queryBadgeByType(type) {
 export async function queryByCarCode(carCode) {
   return await request.get(`/order/queryByCarCode/${carCode}`);
 }
+
+export async function queryGarRealCarCountByGarOrderNo(orderNo) {
+  return await request.get(`/order/queryGarRealCarCountByGarOrderNo/${orderNo}`);
+}
+
+export async function queryByOrderNo(orderNo) {
+  return await request.get(`/order/queryByOrderNo/${orderNo}`);
+}
+
+export async function queryByOrderNoDriver(orderNo) {
+  return await request.get(`/order/queryByOrderNoDriver/${orderNo}`);
+}
+
+export async function updateCarCount(params) {
+  return await request.post(`/order/updateCarCount`, params);
+}
@@ -75,12 +75,13 @@
           车辆信息
         </view>
         <view class="order-detail-container-header-item" style="justify-content: space-between;"
-          v-for="(item) in dataGram.garCarInfoList" :key="item.garId">
-          <text class="order-detail-container-header-title" style="color: #303133;">{{ item.garOrderCarType }}
+              v-for="(item) in handlerList">
+          <text class="order-detail-container-header-title" style="color: #303133;">
+            {{item.garOrderHandlerName}}/{{ item.garHandlerCarCode }}/{{item.garOrderContainerVolume}}
           </text>
           <view class="order-detail-container-header-content">
             <text class="order-detail-container-header-title">
-              {{ cleanStatus(dataGram.garOrderHandlerStatus) }}
+              趟次:{{item.garCarCount}}车
             </text>
           </view>
         </view>
@@ -227,7 +228,7 @@
 <script setup>
 import {
-  createHandlerQrCode, queryErrType,
+  createHandlerQrCode, queryByOrderNo, queryByOrderNoDriver, queryErrType,
   queryGarOrderMatchAsk,
   queryGarOrderMatchAsks,
   queryOrderDetail,
@@ -251,6 +252,7 @@ const putOnImagesGrouped = ref([])  // 新增这个变量
 const putDownImages = ref([])
 const emptyBase64Image = ref(zStatic.base64Empty)
 const showUQRcode = ref(false)
+const handlerList = ref([])
 const spaceStr = ref("")
 const cancelShow = ref(false)
 const currentCancelName = ref("")
@@ -468,6 +470,7 @@ const createQrCodeValid = (val) =&gt; {
  * @param {string} putType
  */
+
 const handleUploadImage = (orderId, putType) => {
   const data = dataGram.value;
@@ -482,6 +485,16 @@ const handleUploadImage = (orderId, putType) =&gt; {
         // 检查当前要上传的是第几趟
         const currentGroupIndex = putOnImagesGrouped.value.length + 1;
+
+        // 如果handlerList中有数据且其garCarCount小于或等于图片列表长度，提示订单趟次已完成
+        if (handlerList.value && handlerList.value.length > 0 && handlerList.value[0].garCarCount !== undefined) {
+          const totalTrips = parseInt(handlerList.value[0].garCarCount);
+          if (putOnImagesGrouped.value.length >= totalTrips) {
+            uni.$u.toast('当前订单趟次已经运完');
+            return;
+          }
+        }
+
         if(number !== 0){
           await queryGarOrderMatchAsks(orderId).then(res => {
             if (res.data.data === 0) {
@@ -549,6 +562,13 @@ onShow(() =&gt; {
   } catch (error) {
     console.log(error);
   }
+  queryByOrderNoDriver(orderId.value).then(res => {
+    if (res.data.success) {
+      handlerList.value = res.data.data
+    }
+  }).catch(err => {
+    console.error('获取订单信息失败:', err);
+  })
 })
 </script>
@@ -120,6 +120,9 @@
 					<view class="order-detail-container-header-card-uicon"></view>
 					车辆信息
 				</view>
+        <view style="margin-bottom: 8px">
+          当前订单总计需发车次数:{{realCarCount}}
+        </view>
         <view class="order-detail-container-box-card" v-if="driverList.length > 0">
           <view class="driver-info-container">
             <view class="driver-info-row" v-for="(driver, index) in driverList" :key="index">
@@ -130,27 +133,43 @@
           </view>
         </view>
 				<view class="order-detail-container-header-item" style="justify-content: space-between;"
-					v-for="(item) in dataGram.garCarInfoList" :key="item.garId">
-					<text class="order-detail-container-header-title" style="color: #303133;">{{ item.garOrderCarType }}
+					v-for="(item) in handlerList">
+					<text class="order-detail-container-header-title" style="color: #303133;">
+            {{item.garOrderHandlerName}}/{{ item.garHandlerCarCode }}/{{item.garOrderContainerVolume}}
 					</text>
 					<view class="order-detail-container-header-content">
 						<text class="order-detail-container-header-title">
-							{{dataGram.garHandlerCarCode}}{{ cleanStatus(dataGram.garOrderHandlerStatus) }}
+							趟次:{{item.garCarCount}}车
 						</text>
 					</view>
 				</view>
+
         <view v-if="userType == '运输企业负责人'" class="order-detail-container-header-item" style="justify-content: space-between; align-items: center;">
-          <text class="order-detail-container-header-title" style="color: #303133;">新增趟次:</text>
+          <text class="order-detail-container-header-title" style="color: #303133;">分配趟次:</text>
+
+          <select v-model="selectedHandlerTel" style="margin-left: 20rpx; width: 160rpx; height: 46rpx; border: 1px solid #DCDFE6; border-radius: 4px; padding: 0 10px; outline: none;">
+            <option value="">请选择分配人员</option>
+            <option value="ADD_TOTAL_TRIPS">新增总趟次</option>
+            <option
+                v-for="handler in handlerList"
+                :key="handler.garOrderHandlerTel"
+                :value="handler.garOrderHandlerTel">
+              {{ handler.garOrderHandlerName }}
+            </option>
+          </select>
+
+
           <view class="order-detail-container-header-content" style="display: flex; align-items: center;">
             <u-number-box
-                v-model="totalCarNumber"
+                v-model="carCount"
                 :min="0"
                 :max="999"
                 integer
                 buttonSize="46"
-                inputWidth="100">
+                inputWidth="70">
             </u-number-box>
-            <u-button type="primary" color="#19a97c" style="margin-left: 20rpx; height: 46rpx; width: 120rpx;" @click="confirmAddVehicle">确定</u-button>
+<!--            :disabled="!isDriverAssigned"-->
+            <u-button type="primary" color="#19a97c" style="margin-left: 20rpx; height: 46rpx; width: 120rpx;" @click="confirmAddVehicle" >确定</u-button>
           </view>
         </view>
 			</view>
@@ -250,35 +269,31 @@
               v-if="dataGram.garOrderScanHandlerFlag === 0 && userType == '用户' && dataGram.garOrderHandlerStatus != 3 && dataGram.garAskStatus != '1'"
               @click="handlerUpdateOrderClick()" shape="square" color="#19a97c" text="修改车辆数"></u-button>
         </view>
-
-        <view class="order-detail-bottom-center" v-if="dataGram.garOrderHandlerStatus === 0 && userType == '运输企业负责人' && dataGram.handleFlag && dataGram.garCancelFlag === 0">
-          <view class="button-group">
+        <view class="order-detail-bottom-center" v-show="showCenterButtons">
+          <!-- 修改按钮组容器类名和结构 -->
+          <view class="button-group-wrap" v-if="dataGram.garOrderHandlerStatus === 0 && userType == '运输企业负责人' && dataGram.handleFlag && dataGram.garCancelFlag === 0">
             <u-button @click="handleOrderDispatchClick(orderId)" shape="square" color="#19a97c" text="分配驾驶员"></u-button>
             <u-button @click="handleDisposalDispatchClick(orderId)" shape="square" color="#19a97c" text="分配处置场所"></u-button>
             <u-button
                 @click="handleOrder(orderId)"
                 shape="square"
                 color="#19a97c"
-                text="处理订单"
+                text="开始运输"
                 :disabled="!isDriverAndDisposalAssigned()">
             </u-button>
           </view>
-        </view>
-        <view class="order-detail-bottom-center" v-else-if="dataGram.garOrderHandlerStatus === 1 && userType == '运输企业负责人'">
-          <view class="button-group">
-            <u-button @click="handleOrderDispatchClick(orderId)" shape="square" color="#19a97c" text="重新分配驾驶员"></u-button>
-            <u-button @click="handleDisposalDispatchClick(orderId)" shape="square" color="#19a97c" text="重新分配处置场所"></u-button>
+          <view class="button-group-spread" v-else-if="!isAllTripsCompleted()">
+            <u-button class="btn-left" @click="handleOrderDispatchClick(orderId)" shape="square" color="#19a97c" text="重新分配驾驶员"></u-button>
+            <u-button class="btn-right" @click="handleDisposalDispatchClick(orderId)" shape="square" color="#19a97c" text="重新分配处置场所"></u-button>
           </view>
-        </view>
-
-
-        <view class="order-detail-bottom-center" v-else-if="dataGram.garOrderHandlerStatus === 1 && userType == '运输企业负责人' && isAllTripsCompleted()">
-          <u-button @click="handleSubmitSuccess(orderId)" shape="square" color="#19a97c" text="完成订单"></u-button>
+          <view v-else-if="dataGram.garOrderHandlerStatus === 1 && userType == '运输企业负责人' && isAllTripsCompleted()">
+            <u-button @click="handleSubmitSuccess(orderId)" shape="square" color="#19a97c" text="完成订单"></u-button>
+          </view>
         </view>
-        <view class="order-detail-bottom-right">
+        <view class="order-detail-bottom-right" v-show="showRightButtons">
           <u-button
               v-if="dataGram.garOrderHandlerStatus === 0 && userType == '用户' && dataGram.garCancelFlag === 0"
               @click="handleOderCancelClick()" shape="square" color="#19a97c" text="取消订单"></u-button>
@@ -340,7 +355,7 @@
     queryOrderDetail,
     queryOrderDispatch, sendToDriver, updateGarRealCarCount,
     updateOrder,
-    queryCarCode
+    queryCarCode, queryByOrderNo, updateCarCount, queryGarRealCarCountByGarOrderNo
   } from "@/apis/order.js";
 	import {
 		createQrCode
@@ -356,9 +371,9 @@
 		onLoad,
 		onShow
 	} from '@dcloudio/uni-app';
-	import {
-		computed
-	} from 'vue';
+  import {
+    computed, watch
+  } from 'vue';
   import { ref } from 'vue';
 	const paramFrom = ref({
 		carNumber: 0,
@@ -375,6 +390,12 @@
 	const clashDisposalDispatchRef = ref()
 	const driverPersonnelList = ref([])
 	const disposalPersonnelList = ref([])
+  const handlerList = ref([])
+  const orderNo = ref(null)
+  const carCount = ref(null)
+  const tel = ref(null)
+  const selectedHandlerTel = ref("")
+  const realCarCount = ref(null)
 	const store = useMainStore();
 	const userType = computed(() => store.userType)
 	const dataGram = ref();
@@ -394,7 +415,7 @@
 	const garCarLabelInfoList = ref({})
 	const garCarLabelInfoNow = ref()
   const driverAssigned = ref(false);  // 添加这行，跟踪驾驶员是否已分配
-const disposalAssigned = ref(false);  // 添加这行，跟踪处置场所是否已分配
+  const disposalAssigned = ref(false);  // 添加这行，跟踪处置场所是否已分配
 	const list = computed(() => {
 		let reason = [{
@@ -421,6 +442,10 @@ const disposalAssigned = ref(false);  // 添加这行，跟踪处置场所是否
 		return reason
 	})
+  const isDriverAssigned = computed(() => {
+    // 检查是否有分配的驾驶员
+    return driverList.value && driverList.value.length > 0;
+  });
   const isDriverAndDisposalAssigned = () => {
     // 直接使用已有的响应式变量来判断分配状态
     const hasDrivers = driverAssigned.value;
@@ -442,6 +467,7 @@ const disposalAssigned = ref(false);  // 添加这行，跟踪处置场所是否
 		const completedTrips = putOnImagesGrouped.value.length;
 		// 如果完成的趟次数大于等于要求的趟次数，则表示全部运完
+    console.log("实际完成次数" + completedTrips + "要求次数" + requiredTrips)
 		return completedTrips >= requiredTrips;
 	}
@@ -461,27 +487,104 @@ const disposalAssigned = ref(false);  // 添加这行，跟踪处置场所是否
     });
   };
+  watch(selectedHandlerTel, (newVal) => {
+    tel.value = newVal;
+  });
+
+  const refreshOrderData = () => {
+    // 刷新处理人员列表
+    queryByOrderNo(orderNo.value).then(res => {
+      if (res.data.success) {
+        handlerList.value = res.data.data
+      }
+    }).catch(err => {
+      console.error('获取订单信息失败:', err);
+    })
+
+    // 刷新总趟次数
+    queryGarRealCarCountByGarOrderNo(orderNo.value).then(res => {
+      if (res.data.success) {
+        realCarCount.value = res.data.data
+      }
+    })
+  };
+
+
+
   const confirmAddVehicle = () => {
-    console.log('新增车辆数量:', totalCarNumber.value);
+    console.log('新增车辆数量:', carCount.value);
+    console.log('选中处理人员电话:', tel.value);
+
+    // 检查必填字段
+    if (!carCount.value) {
+      uni.$u.toast(`请选择分配的趟次!`);
+      return;
+    }
+    if (!tel.value) {
+      uni.$u.toast(`请选择分配人员!`);
+      return;
+    }
+
+
+    if (selectedHandlerTel.value === 'ADD_TOTAL_TRIPS') {
+      const newTotalTrips = (realCarCount.value || 0) + carCount.value;
+      updateGarRealCarCount(orderId.value, carCount.value)
+          .then(res => {
+            if (res.data.success) {
+              uni.$u.toast(`总趟次更新成功!`);
+              // 刷新订单详情
+              handleOrderDetail(orderId.value);
+              refreshOrderData()
+            } else {
+              uni.$u.toast(`总趟次更新失败!`);
+            }
+          })
+          .catch(err => {
+            uni.$u.toast('总趟次更新请求失败');
+            console.error('总趟次更新失败:', err);
+          });
+      return;
+    }
+
+    // 检查已分配趟次总和是否超过订单要求的总发车次数
+    const allocatedTrips = handlerList.value.reduce((sum, handler) => sum + parseInt(handler.garCarCount || 0), 0);
+    const totalRequiredTrips = realCarCount.value || 0;
+
+    console.log('已分配趟次总和:', allocatedTrips);
+    console.log('总需求趟次:', totalRequiredTrips);
+
+    if (allocatedTrips >= totalRequiredTrips) {
+      uni.$u.toast(`全部趟次已分配完成，无需再分配!`);
+      return;
+    }
+
+    // 检查本次分配后是否会超过总发车次数
+    if (allocatedTrips + carCount.value > totalRequiredTrips) {
+      uni.$u.toast(`分配趟次过多，最多只能再分配${totalRequiredTrips - allocatedTrips}趟!`);
+      return;
+    }
     // 调用API传递订单ID和新增车辆数量
-    updateGarRealCarCount(orderId.value, totalCarNumber.value)
+    const params = {
+      carCount: carCount.value,
+      tel: tel.value
+    };
+
+    updateCarCount(params)
         .then(res => {
           if (res.data.success) {
-            uni.$u.toast(`成功新增${totalCarNumber.value}辆车`);
-            getGarOrderMatchHandlers(orderId.value).then(res => {
-              console.log('司机列表:', res.data);
-              if (res.data.success && res.data.data && res.data.data.length > 0) {
-                driverListForAssignment.value = res.data.data;
-                driverListPopupShowFlag.value = true;
-              }
-            })
-            // 重置输入框
-            totalCarNumber.value = 0;
+            uni.$u.toast(`分配成功!`);
             // 刷新订单详情
             handleOrderDetail(orderId.value);
+            queryByOrderNo(orderNo.value).then(res => {
+              if (res.data.success) {
+                handlerList.value = res.data.data
+              }
+            }).catch(err => {
+              console.error('获取订单信息失败:', err);
+            })
           } else {
-            uni.$u.toast(res.data.msg || '新增车辆失败');
+            uni.$u.toast(`分配失败!`);
           }
         })
         .catch(err => {
@@ -944,13 +1047,33 @@ const handleDriverDispatchConfirm = (val) =&gt; {
 			}
 		});
 	}
+  const showLeftButtons = computed(() => {
+    return (dataGram.value?.garOrderHandlerStatus === 0 && userType.value == '运输企业负责人' && dataGram.value?.garCancelFlag === 0) ||
+        (dataGram.value?.garOrderScanHandlerFlag === 0 && userType.value == '用户' && dataGram.value?.garOrderHandlerStatus != 3 && dataGram.value?.garAskStatus != '1');
+  });
+
+  const showCenterButtons = computed(() => {
+    return (dataGram.value?.garOrderHandlerStatus === 0 && userType.value == '运输企业负责人' && dataGram.value?.handleFlag && dataGram.value?.garCancelFlag === 0) ||
+        (dataGram.value?.garOrderHandlerStatus === 1 && userType.value == '运输企业负责人') ||
+        (dataGram.value?.garOrderHandlerStatus === 1 && userType.value == '运输企业负责人' && isAllTripsCompleted());
+  });
+
+  const showRightButtons = computed(() => {
+    return (dataGram.value?.garOrderHandlerStatus === 0 && userType.value == '用户' && dataGram.value?.garCancelFlag === 0) ||
+        (dataGram.value?.garEvaluateFlag === 0 && userType.value === '用户') ||
+        (dataGram.value?.garHandlerEvaluateFlag === 0 && userType.value === '运输企业负责人' && dataGram.value?.haveEvaluateOfClient == 1) ||
+        (dataGram.value?.garHandlerEvaluateFlag === 1 && userType.value === '运输企业负责人' && dataGram.value?.haveEvaluateOfClient == 1) ||
+        (dataGram.value?.garEvaluateFlag === 1 && userType.value === '用户');
+  });
 	/**
 	 * 初始化信息
 	 */
 	onLoad((options) => {
 		orderId.value = options.orderId
+    orderNo.value = options.orderId
 		handleOrderDetail(orderId.value)
+    refreshOrderData()
 	})
 	onShow(() => {
@@ -997,6 +1120,7 @@ const handleDriverDispatchConfirm = (val) =&gt; {
       flex: 1;
       display: flex;
       justify-content: center;
+      width: 100%; // 确保占满可用宽度
       .button-group {
         display: flex;
@@ -1007,6 +1131,30 @@ const handleDriverDispatchConfirm = (val) =&gt; {
           white-space: nowrap;
         }
       }
+
+      // 修复重新分配按钮的样式（重点修改这里）
+      .button-group-spread {
+        display: flex;
+        justify-content: space-between; // 两端对齐
+        align-items: center; // 垂直居中
+        width: 100%; // 占满父容器宽度
+        padding: 0; // 移除左右内边距，让按钮更贴边
+        gap: 40rpx; // 中间间距（可根据需要调整大小）
+
+        .btn-left {
+          margin-right: auto; // 强制靠左
+        }
+
+        .btn-right {
+          margin-left: auto; // 强制靠右
+        }
+
+        u-button {
+          min-width: 220rpx; // 固定最小宽度，确保按钮宽度一致
+          white-space: nowrap;
+          padding: 0 30rpx; // 按钮内部左右 padding，让按钮更舒展
+        }
+      }
     }
     .order-detail-bottom-right {
@@ -1098,56 +1246,92 @@ const handleDriverDispatchConfirm = (val) =&gt; {
 		}
-		.order-detail-bottom {
-			position: absolute;
-			width: 100%;
-			// height: 100%;
-			bottom: 0;
-			left: 0;
-
-			.movableAreaDetail {
-				pointer-events: none;
-				position: fixed;
-				left: 0;
-				top: 0;
-				width: 100%;
-				height: calc(100% - $custom-bottom-height);
-				z-index: 999;
+    .order-detail-bottom {
+      position: fixed; // 改为fixed定位，确保始终在底部
+      width: 100%;
+      bottom: 0;
+      left: 0;
+      background-color: #fff; // 添加背景色，避免穿透
+      box-shadow: 0 -2rpx 10rpx rgba(0,0,0,0.05); // 添加阴影，提升层次感
+      padding: 20rpx $custom-page-padding; // 上下内边距，左右和页面一致
+      box-sizing: border-box;
-				.movableView {
-					pointer-events: auto;
-					min-height: 60rpx;
-					min-width: 60rpx;
+      .order-detail-bottom-box {
+        height: auto; // 取消固定高度，自适应内容
+        padding: 0; // 移除原有内边距
+        display: flex;
+        flex-wrap: wrap; // 允许换行
+        gap: 16rpx; // 按钮之间统一间距
+        align-items: center;
+      }
-					.order-detail-call-box-container {
-						min-height: 60rpx;
-						min-width: 60rpx;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						background-color: #19a97c;
-						border-radius: 100%;
-					}
-				}
-			}
+      // 左中右三个区域统一处理
+      .order-detail-bottom-left,
+      .order-detail-bottom-center,
+      .order-detail-bottom-right {
+        min-width: auto; // 取消最小宽度限制
+        flex: 1; // 三个区域平均分配宽度
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
-			.order-detail-bottom-box {
-				height: $custom-bottom-height;
-				padding: 50rpx;
-				box-sizing: border-box;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
+      // 左侧区域单独处理（取消订单按钮）
+      .order-detail-bottom-left {
+        justify-content: flex-start;
+      }
-				.order-detail-bottom-left {
-					min-width: 200rpx;
-				}
+      // 右侧区域单独处理（评价相关按钮）
+      .order-detail-bottom-right {
+        justify-content: flex-end;
+      }
+    }
-				.order-detail-bottom-right {
-					min-width: 200rpx;
-				}
-			}
-		}
+    // 中间按钮组优化（分配/处理订单按钮）
+    .order-detail-bottom-center {
+      .button-group-wrap {
+        display: flex;
+        flex-wrap: wrap; // 超出时自动换行
+        gap: 16rpx; // 按钮之间间距
+        justify-content: center;
+        width: 100%;
+      }
+
+      // 单个按钮样式统一优化
+      u-button {
+        flex: 0 0 auto; // 不自动拉伸
+        min-width: 180rpx; // 最小宽度，确保按钮不会太窄
+        max-width: 240rpx; // 最大宽度，避免过宽
+        height: 72rpx; // 统一按钮高度
+        line-height: 72rpx; // 垂直居中
+        font-size: 26rpx; // 字体大小优化
+        padding: 0 20rpx;
+        border-radius: 36rpx; // 圆角优化，更美观
+      }
+
+      // 重新分配按钮组样式
+      .button-group-spread {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        width: 100%;
+        gap: 16rpx; // 中间间距
+      }
+    }
+
+    // 适配小屏幕，当按钮过多时自动换行
+    @media (max-width: 375px) {
+      .order-detail-bottom-box {
+        gap: 12rpx;
+      }
+
+      .order-detail-bottom-center u-button {
+        min-width: 160rpx;
+        font-size: 24rpx;
+        height: 68rpx;
+        line-height: 68rpx;
+      }
+    }
 	}
 	.mask-container {