提交12-12

lichao
1 parent fbca9085
Showing 10 changed files with 345 additions and 182 deletions
garbage-removal/src/components/liu-delivery-time/liu-delivery-time.vue
garbage-removal/src/pages/home-info/address/addSite.vue
garbage-removal/src/pages/home-info/clean/index.vue
garbage-removal/src/pages/home/index.vue
garbage-removal/src/pages/order-info/order-driver/detail/index.vue
garbage-removal/src/pages/order-info/order-other/detail/index.vue
garbage-removal/src/pages/order/index.vue
garbage-removal/src/pages/order/order-disposal/swiper-list-item/index.vue
garbage-removal/src/pages/order/order-other/index.vue
garbage-removal/src/pages/order/order-other/swiper-list-item/index.vue
@@ -96,34 +96,33 @@ const init = () =&gt; {
 }
 const getFutureDays = () => {
-	const days = [];
-	for (let i = 0; i < props.day; i++) {
-		const date = new Date();
-		date.setDate(date.getDate() + i);
-		const year = date.getFullYear();
-		const month = (date.getMonth() + 1).toString().padStart(2, '0');
-		const day = date.getDate().toString().padStart(2, '0');
-		if (i === 0) {
-			let hours = date.getHours();
-			console.log(hours);
-			// if (hours >= 13) {
-			// 	continue;
-			// }
-			days.push({
-				day: `${year}-${month}-${day}`,
-				timeList: getCurrentDayTimeList(0, hours, 1)
-			});
-		} else {
-			days.push({
-				day: `${year}-${month}-${day}`,
-				timeList: getTimeList()
-			});
-		}
-	}
-	return days;
+  const days = [];
+  for (let i = 0; i < props.day; i++) {
+    const date = new Date();
+    date.setDate(date.getDate() + i);
+    const year = date.getFullYear();
+    const month = (date.getMonth() + 1).toString().padStart(2, '0');
+    const day = date.getDate().toString().padStart(2, '0');
+    if (i === 0) {
+      let hours = date.getHours();
+      let minutes = date.getMinutes();
+      console.log(hours, minutes);
+      days.push({
+        day: `${year}-${month}-${day}`,
+        timeList: getCurrentDayTimeList(0, hours, minutes, 1)
+      });
+    } else {
+      days.push({
+        day: `${year}-${month}-${day}`,
+        timeList: getTimeList()
+      });
+    }
+  }
+  return days;
 }
+
 const getTimeList = () => {
   const timeList = [{
     time: '00:00-02:00',
@@ -196,17 +195,65 @@ const getTimeList = () =&gt; {
  * @param {*} hours 当前几点
  * @param {*} skip 跳过几个
  */
-const getCurrentDayTimeList = (startTime, hours, skip) => {
-  const timeList = getTimeList();
-  // 计算当前小时所属的时间段索引
-  // 每个时间段是2小时，从00:00-02:00开始
-  let index = Math.floor(hours / 2) + 1; // 加1是为了跳过已过期的时间段
-  // 确保不会超出数组范围
-  if (index >= timeList.length) {
-    return []; // 如果没有可选时间段，返回空数组
+const getCurrentDayTimeList = (startTime, hours, minutes, skip) => {
+  const dynamicTimeList = [];
+
+  // 根据当前时间计算最早可预约的开始时间
+  let startHour = hours;
+  let startMinute = 0;
+
+  if (minutes < 30) {
+    // 如果当前分钟小于30，则最早可预约时间是当前小时+30分钟开始
+    startMinute = 30;
+  } else {
+    // 如果当前分钟大于等于30，则最早可预约时间是下一个小时开始
+    startHour += 1;
+    startMinute = 0;
   }
-  return timeList.slice(index, timeList.length)
+
+  // 生成未来的时间段，每个时间段跨度2小时
+  for (let i = 0; i < 10; i++) { // 生成10个时间段足够使用
+    let endHour = startHour + 2;
+    const endMinute = startMinute;
+
+    // 处理时间超过24小时的情况
+    const formattedEndHour = endHour > 24 ? endHour - 24 : endHour;
+    const formattedEndMinute = endMinute;
+
+    // 格式化时间字符串
+    const startStr = `${startHour.toString().padStart(2, '0')}:${startMinute.toString().padStart(2, '0')}`;
+    const endStr = endHour >= 24 ? `24:00` : `${formattedEndHour.toString().padStart(2, '0')}:${formattedEndMinute.toString().padStart(2, '0')}`;
+    const timeStr = `${startStr}-${endStr}`;
+
+    // 确定timeStr（根据原代码推测可能是时间段的标签）
+    let periodTimeStr = '';
+    if (startHour >= 7 && startHour < 22) {
+      periodTimeStr = `${startHour.toString().padStart(2, '0')}-${(startHour + 1).toString().padStart(2, '0')}`;
+    } else {
+      periodTimeStr = '22-07';
+    }
+
+    // 添加到时间列表
+    dynamicTimeList.push({
+      time: timeStr,
+      start: startStr,
+      end: endStr,
+      timeStr: periodTimeStr
+    });
+
+    // 更新下一个时间段的开始时间为当前时间段的结束时间（跨度2小时）
+    startHour += 2;
+    // 这里不需要改变分钟，因为我们是按2小时递增的
+
+    // 如果开始时间超过24小时，停止生成（当天不再生成新的时间段）
+    if (startHour >= 24) {
+      break;
+    }
+  }
+
+  return dynamicTimeList;
 }
+
 const open = () => {
 	isShow.value = true;
 	init();
@@ -165,94 +165,21 @@ const submit = () =&gt; {
  * 打开地图选择地址（自动定位到当前位置，修复 startCompass:fail 问题）
  */
 const chooseAddressDetail = () => {
-  console.log('打开地图选择地址（自动定位）');
-
-  // 1. 先获取当前位置的经纬度（关键：统一坐标系为 gcj02，关闭 altitude 避免额外权限）
-  uni.getLocation({
-    type: 'gcj02', // 必须使用 gcj02（腾讯/高德地图标准，避免坐标系不匹配）
-    altitude: false, // 关闭海拔获取，减少权限要求
-    isHighAccuracy: false, // 关闭高精度定位（降低硬件依赖）
-    success: (locationRes) => {
-      console.log('当前位置经纬度:', locationRes);
-      const { latitude, longitude } = locationRes;
-
-      // 2. 打开地图选择器（移除可能触发指南针的参数）
-      uni.chooseLocation({
-        latitude: latitude,
-        longitude: longitude,
-        scale: 16,
-        name: addressInfo.addressDetail || '',
-        address: addressInfo.addressArea || '',
-        success: (res) => {
-          addressInfo.addressDetail = res.name;
-          addressInfo.garLongitude = res.longitude;
-          addressInfo.garLatitude = res.latitude;
-        },
-        fail: (err) => {
-          console.error('地图选择失败:', err);
-          handleLocationError(err);
-        }
-      });
+  console.log('打开地图选择地址');
+
+  // 直接打开地图选择器，不进行定位
+  uni.chooseLocation({
+    success: (res) => {
+      addressInfo.addressDetail = res.name;
+      addressInfo.garLongitude = res.longitude;
+      addressInfo.garLatitude = res.latitude;
     },
     fail: (err) => {
-      console.error('获取当前位置失败:', err);
-      handleLocationError(err);
+      console.error('地图选择失败:', err);
     }
   });
 };
-/**
- * 统一处理定位/地图错误
- */
-const handleLocationError = (err) => {
-  const errMsg = err.errMsg || '';
-
-  // 1. 处理权限拒绝
-  if (errMsg.includes('auth deny') || errMsg.includes('permission denied')) {
-    uni.showModal({
-      title: '授权提示',
-      content: '需要获取您的位置权限才能自动定位，请在设置中开启',
-      confirmText: '去设置',
-      cancelText: '手动输入',
-      success: (modalRes) => {
-        if (modalRes.confirm) {
-          uni.openSetting(); // 打开系统设置
-        } else {
-          // 手动输入地址（隐藏地图选择，直接让用户输入）
-          uni.showToast({ title: '请手动输入详细地址', icon: 'none' });
-        }
-      }
-    });
-  }
-
-  // 2. 处理指南针失败（startCompass:fail）
-  else if (errMsg.includes('startCompass:fail')) {
-    uni.showModal({
-      title: '提示',
-      content: '当前设备不支持指南针功能，将为您打开地图手动选择地址',
-      showCancel: false,
-      success: () => {
-        // 降级方案：不传递初始经纬度，直接打开地图
-        uni.chooseLocation({
-          success: (res) => {
-            addressInfo.addressDetail = res.name;
-            addressInfo.garLongitude = res.longitude;
-            addressInfo.garLatitude = res.latitude;
-          },
-          fail: () => {
-            uni.showToast({ title: '地图选择失败，请手动输入地址', icon: 'none' });
-          }
-        });
-      }
-    });
-  }
-
-  // 3. 其他错误（网络/设备问题）
-  else {
-    uni.showToast({ title: '定位失败，请手动输入地址', icon: 'none' });
-  }
-};
-
 onMounted(() => {
 	proxy.$refs.addressFrom.setRules(rules)
 })
@@ -630,30 +630,31 @@
 			uni.$u.toast("请勿频繁操作")
 		}
 	}
-	const handlerSaveOrder = async (params) => {
-		await saveOrder(params).then(res => {
-			if (res.data.success) {
+  const handlerSaveOrder = async (params) => {
+    await saveOrder(params).then(res => {
+      if (res.data.success) {
         store.updateUnreadOrderCount();
-				if (userType.value != "用户") {
-					uni.$u.toast("下单成功，请切换成且角色查看订单详情")
-					uni.$u.route({
-						type: 'navigateBack',
-						url: `pages/home/index`,
-					})
-				} else {
-					uni.$u.toast('下单成功')
-					uni.$u.route({
-						type: "redirect",
-						url: `pages/order-info/order-other/detail/index`,
-						params: {
-							orderId: res.data.data
-						}
-					})
-				}
-			}
-		})
-
-	}
+        // 发送自定义事件通知订单列表更新
+        uni.$emit('orderCreated', { type: 'newOrder' });
+        if (userType.value !== "用户") {
+          uni.$u.toast("下单成功，请切换成且角色查看订单详情")
+          uni.$u.route({
+            type: 'navigateBack',
+            url: `pages/home/index`,
+          })
+        } else {
+          uni.$u.toast('下单成功')
+          uni.$u.route({
+            type: "redirect",
+            url: `pages/order-info/order-other/detail/index`,
+            params: {
+              orderId: res.data.data
+            }
+          })
+        }
+      }
+    })
+  }
 	const handlerChooseAddress = () => {
 		addressPopupRef.value.open(userAddress.value)
@@ -163,6 +163,10 @@ const dropdownOptions = ref([
     label: '湘江新区',
     value: '湘江新区'
   },
+    {
+      label: '芙蓉区',
+      value: '芙蓉区'
+    },
   {
     label: '天心区',
     value: '天心区'
@@ -190,10 +194,6 @@ const dropdownOptions = ref([
   {
     label: '宁乡市',
     value: '宁乡市'
-  },
-  {
-    label: '芙蓉区',
-    value: '芙蓉区'
   }
   ], [{
     label: '暂未开放',
@@ -45,14 +45,14 @@
           </view>
         </view>
-        
+
         <view class="order-detail-container-header-item" v-for="(disposal,index) in dataGram.disposalSites">
         <view>
             <text class="order-detail-container-header-title" v-if="index == 0" >处置场地：</text>
             <text class="order-detail-container-header-title" v-else >&emsp;&emsp;&emsp;&emsp;&emsp;</text>
         </view>
         <view class="order-detail-container-header-content" style="text-decoration: underline"  @click.stop="handlerJumpOtherApp(disposal.latitude, disposal.longitude, dataGram.garCoordinate)">
-          <text>{{ disposal.addrStr }}</text> 
+          <text>{{ disposal.addrStr }}</text>
         </view>
       </view>
@@ -90,7 +90,7 @@
       <view class="order-detail-container-box-card">
         <view class="order-detail-container-header-card-title">
           <view class="order-detail-container-header-card-uicon"></view>
-          订单人员
+          订单信息
         </view>
         <!-- <view class="order-detail-container-header-item">
           <text class="order-detail-container-header-title">订单时间：</text>
@@ -152,12 +152,12 @@
               <view v-for="group in putOnImagesGrouped" :key="group.index" class="image-group">
                 <view class="image-group-header">
                   <view class="image-group-title">{{ group.carName}}第 {{ group.index }} 趟</view>
-                  <!-- 根据group.index与真实发车数比较显示状态 -->
+                  <!-- 根据group.carStatus显示状态 -->
                   <view class="car-status" :class="{
-									'in-transit': isInTransit(group.index),
-									'completed': isCompleted(group.index)
-								}">
-                    {{ getStatusText(group.index) }}
+                    'in-transit': group.carStatus === '0',
+                    'completed': group.carStatus === '1' || group.carStatus === '2'
+                  }">
+                    {{ (group.carStatus === '1'||group.carStatus === '2') ? '已运完' : '正在清运' }}
                   </view>
                 </view>
                 <u-upload width="180" height="130" :fileList="group.images" name="3" multiple :maxCount="20"
@@ -352,32 +352,40 @@ const handleEvaluateDetail = (orderId, userType) =&gt; {
 const selectClick = (index) => {
   currentCancelName.value = index.name;
 }
+
 const handleOrderDetail = (orderId) => {
   queryOrderDetail(orderId).then(res => {
     dataGram.value = res.data.data;
     currentImages.value = res.data.data.currentImages.map(item => {
       return { url: import.meta.env.VITE_BASE_URL + item};
     });
-    
+
     putOnImages.value = res.data.data.putOnImages.map(item => {
       let processedItem = item;
       let carName = '';
-      
+      let carStatus = '';
+
       // 提取name后面的字符串作为carName并从item中移除
       if (item.includes('name')) {
         const nameIndex = item.indexOf('name');
         carName = item.substring(nameIndex + 4);
+        // 检查carName末尾是否包含状态值(0或1)
+        if (carName.endsWith('0') || carName.endsWith('1') || carName.endsWith('2')) {
+          carStatus = carName.slice(-1);
+          carName = carName.slice(0, -1);
+        }
+
         processedItem = item.substring(0, nameIndex);
       }
-      
-      // 保持原有逻辑不变，但添加carName到返回对象
+
+      // 保持原有逻辑不变，但添加carName和carStatus到返回对象
       const newItem = processedItem.substring(0, processedItem.length - 6);
       const newIndex = processedItem.substring(processedItem.length - 6);
-      return { url: import.meta.env.VITE_BASE_URL + newItem, newIndex, carName };
+      return { url: import.meta.env.VITE_BASE_URL + newItem, newIndex, carName, carStatus };
     });
-    
+
     // 按照newIndex升序排序
     putOnImages.value.sort((a, b) => {
       return parseInt(a.newIndex) - parseInt(b.newIndex);
@@ -403,7 +411,8 @@ const handleOrderDetail = (orderId) =&gt; {
     putOnImagesGrouped.value = Object.keys(newGroupedImages).map(key => ({
       index: key,
       images: newGroupedImages[key],
-      carName: newGroupedImages[key] && newGroupedImages[key].length > 0 ? newGroupedImages[key][0].carName : ''
+      carName: newGroupedImages[key] && newGroupedImages[key].length > 0 ? newGroupedImages[key][0].carName : '',
+      carStatus: newGroupedImages[key] && newGroupedImages[key].length > 0 ? newGroupedImages[key][0].carStatus : ''
     }));
     putDownImages.value = res.data.data.putDownImages.map(item => {
       return { url: import.meta.env.VITE_BASE_URL + item };
@@ -136,7 +136,7 @@
       </view>
       <!-- 车辆信息 -->
-      <view class="order-detail-container-box-card vehicle-section" v-if="userType !== '用户'">
+      <view class="order-detail-container-box-card vehicle-section" v-if="dataGram.garOrderHandlerStatus !== 3">
         <view class="section-header">
           <view class="header-icon-bar"></view>
           <u-icon name="car" size="22" color="#fff" style="margin-right: 10rpx;"></u-icon>
@@ -150,9 +150,31 @@
             <text class="summary-value">{{ realCarCount }}</text>
             <text class="summary-unit">次</text>
           </view>
+          <view v-if="userType === '用户'" class="reduce-trip-section">
+            <text class="reduce-label">减少发车次数:</text>
+            <view class="right-controls">
+              <u-number-box
+                  v-model="reduceTripCount"
+                  :min="1"
+                  :max="realCarCount - 1"
+                  integer
+                  buttonSize="30"
+                  inputWidth="50"
+                  style="margin: 0 20rpx;">
+              </u-number-box>
+              <u-button
+                  type="primary"
+                  size="mini"
+                  @click="handleReduceTrips"
+                  :disabled="reduceTripCount <= 0 || realCarCount <= 1"
+                  style="background-color: #19a97c; max-width: 120rpx; font-size: 20rpx; padding: 0 10rpx;">
+                确认减少
+              </u-button>
+            </view>
+          </view>
         </view>
-        <view class="vehicle-info-card" v-if="dataGram.garCarInfoList && dataGram.garCarInfoList.length > 0">
+        <view class="vehicle-info-card" v-if="dataGram.garCarInfoList && dataGram.garCarInfoList.length > 0 &&userType !== '用户'">
           <view class="card-header">
             <u-icon name="file-text" size="18" color="#19a97c"></u-icon>
             <text class="card-title">车辆类型详情</text>
@@ -173,7 +195,7 @@
           </view>
         </view>
-        <view class="handler-list-card" >
+        <view class="handler-list-card"  v-if=" userType !== '用户'">
           <view class="card-header">
             <u-icon name="list" size="18" color="#19a97c"></u-icon>
             <text class="card-title">处理人员信息</text>
@@ -219,9 +241,10 @@
         <view class="section-header">
           <view class="header-icon-bar"></view>
           <u-icon name="account" size="22" color="#fff" style="margin-right: 8rpx;"></u-icon>
-          <text class="header-title">订单人员</text>
+          <text class="header-title">订单信息</text>
         </view>
+
         <view class="info-item">
           <view class="info-label">
             <u-icon name="clock" size="16" color="#19a97c" style="margin-right: 8rpx;"></u-icon>
@@ -257,6 +280,29 @@
         <view class="info-item">
           <view class="info-label">
+            <u-icon name="map" size="16" color="#19a97c" style="margin-right: 8rpx;"></u-icon>
+            <text>处理场所:</text>
+          </view>
+          <!-- 修改后 -->
+          <view class="info-content" v-if="selectedDisposalSites.length > 0" style="flex-direction: column; align-items: flex-start;">
+            <view v-for="(site, index) in selectedDisposalSites" :key="index" style="margin-bottom: 15rpx; width: 100%;">
+              <text class="content-text">{{ site.companyName }}</text>
+              <view v-if="site.contactName" style="margin-top: 5rpx;">
+                <text class="content-text">联系人: {{ site.contactName }}</text>
+              </view>
+              <!-- 修改后 -->
+              <view v-if="site.contactPhone" style="margin-top: 5rpx; display: flex; align-items: center;">
+                <text style="flex: 1;">联系电话: {{ site.contactPhone }}</text>
+                <view style="margin-left: 10rpx;" v-if="dataGram.handleFlag" @click="handleContactClick(site.contactPhone)">
+                  <u-icon name="phone-fill" size="20" color="#19a97c"></u-icon>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <view class="info-item">
+          <view class="info-label">
             <u-icon name="file-text" size="16" color="#19a97c" style="margin-right: 8rpx;"></u-icon>
             <text>备注:</text>
           </view>
@@ -287,10 +333,10 @@
               <view class="image-group-header">
                 <view class="image-group-title">{{ group.carName}}第 {{ group.index }} 趟</view>
                 <view class="car-status" :class="{
-									'in-transit': isInTransit(group.index),
-									'completed': isCompleted(group.index)
-								}">
-                  {{ getStatusText(group.index) }}
+                  'in-transit': group.carStatus === '0',
+                  'completed': group.carStatus === '1' || group.carStatus === '2'
+                }">
+                  {{ (group.carStatus === '1'||group.carStatus === '2') ? '已运完' : '正在清运' }}
                 </view>
               </view>
               <u-upload width="180" height="130" :fileList="group.images" name="3" multiple :maxCount="20"
@@ -453,6 +499,7 @@ const carCount = ref(null)
 const tel = ref(null)
 const selectedHandlerTel = ref("")
 const realCarCount = ref(null)
+const reduceTripCount = ref(1) // 要减少的发车次数
 const store = useMainStore();
 const userType = computed(() => store.userType)
 const dataGram = ref();
@@ -475,6 +522,7 @@ const selectedHandlerTels = ref(&quot;&quot;)
 const garCarTypeList = ref([])
 const driverAssigned = ref(false);  // 添加这行，跟踪驾驶员是否已分配
 const disposalAssigned = ref(false);  // 添加这行，跟踪处置场所是否已分配
+const selectedDisposalSites = ref([]);
 // 新增：用于存储待分配的驾驶员列表
 const pendingDriverAssignments = ref({})
@@ -547,6 +595,37 @@ const list = computed(() =&gt; {
   return reason
 })
+const handleReduceTrips = () => {
+  if (!reduceTripCount.value || reduceTripCount.value <= 0) {
+    uni.$u.toast('请输入有效的减少次数');
+    return;
+  }
+
+  if (realCarCount.value <= reduceTripCount.value) {
+    uni.$u.toast('减少次数不能超过当前总次数');
+    return;
+  }
+
+  // 调用接口，传递负数表示减少
+  updateGarRealCarCount(orderId.value, -reduceTripCount.value)
+      .then(res => {
+        if (res.data.success) {
+          uni.$u.toast(`减少${reduceTripCount.value}次成功!`);
+          // 刷新订单详情
+          handleOrderDetail(orderId.value);
+          refreshOrderData();
+          // 重置减少次数
+          reduceTripCount.value = 1;
+        } else {
+          uni.$u.toast(`减少次数失败!`);
+        }
+      })
+      .catch(err => {
+        uni.$u.toast('减少次数请求失败');
+        console.error('减少次数失败:', err);
+      });
+}
+
 const isDriverAssigned = computed(() => {
   // 检查是否有分配的驾驶员
   return handlerList.value && handlerList.value.length > 0;
@@ -914,22 +993,57 @@ const handleOrderDetail = (orderId) =&gt; {
       };
     });
+    // 同时调用queryDisposalDispatch接口获取处理场所信息
+    queryDisposalDispatch(orderId).then(disposalRes => {
+      if (disposalRes.data.success && disposalRes.data.data && disposalRes.data.data.length > 0) {
+        // 根据实际返回数据结构提取处理场所信息，只显示选中的联系人
+        selectedDisposalSites.value = disposalRes.data.data
+            .map(site => {
+              // 筛选出personnelInfo中checked为true的联系人
+              const selectedPerson = site.personnelInfo && site.personnelInfo.length > 0 ?
+                  site.personnelInfo.find(person => person.checked) : null;
+
+              return {
+                companyName: site.garOrderDisposalCompanyName,
+                contactName: selectedPerson ? selectedPerson.personName : '',
+                contactPhone: selectedPerson ? selectedPerson.tel : ''
+              };
+            })
+            // 过滤掉没有选中联系人的处理场所
+            .filter(site => site.contactName && site.contactPhone);
+
+        // 设置已分配状态
+        disposalAssigned.value = selectedDisposalSites.value.length > 0;
+        console.log('从queryDisposalDispatch获取的处理场所信息:', selectedDisposalSites.value);
+      } else {
+        selectedDisposalSites.value = [];
+        disposalAssigned.value = false;
+      }
+    });
+
     putOnImages.value = res.data.data.putOnImages.map(item => {
       let processedItem = item;
       let carName = '';
+      let carStatus = '';
       // 提取name后面的字符串作为carName并从item中移除
       if (item.includes('name')) {
         const nameIndex = item.indexOf('name');
         carName = item.substring(nameIndex + 4);
+        // 检查carName末尾是否包含状态值(0或1)
+        if (carName.endsWith('0') || carName.endsWith('1') || carName.endsWith('2')) {
+          carStatus = carName.slice(-1);
+          carName = carName.slice(0, -1);
+        }
+
         processedItem = item.substring(0, nameIndex);
       }
-      // 保持原有逻辑不变，但添加carName到返回对象
+      // 保持原有逻辑不变，但添加carName和carStatus到返回对象
       const newItem = processedItem.substring(0, processedItem.length - 6);
       const newIndex = processedItem.substring(processedItem.length - 6);
-      return { url: import.meta.env.VITE_BASE_URL + newItem, newIndex, carName };
+      return { url: import.meta.env.VITE_BASE_URL + newItem, newIndex, carName, carStatus };
     });
     // 按照newIndex升序排序
@@ -957,7 +1071,8 @@ const handleOrderDetail = (orderId) =&gt; {
     putOnImagesGrouped.value = Object.keys(newGroupedImages).map(key => ({
       index: key,
       images: newGroupedImages[key],
-      carName: newGroupedImages[key] && newGroupedImages[key].length > 0 ? newGroupedImages[key][0].carName : ''
+      carName: newGroupedImages[key] && newGroupedImages[key].length > 0 ? newGroupedImages[key][0].carName : '',
+      carStatus: newGroupedImages[key] && newGroupedImages[key].length > 0 ? newGroupedImages[key][0].carStatus : ''
     }));
     console.log('putOnImagesGrouped.value:', putOnImagesGrouped.value);
     putDownImages.value = res.data.data.putDownImages.map(item => {
@@ -1157,10 +1272,21 @@ const handleDisposalDispatchConfirm = (val) =&gt; {
     garOrderId: orderId.value,
     dispatchList: []
   }
+
+  // 新增：存储选中的处理场所信息
+  selectedDisposalSites.value = [];
+
   for (const key in val) {
     data.dispatchList.push({
       ...val[key]
     });
+
+    // 新增：提取处理场所信息
+    selectedDisposalSites.value.push({
+      companyName: val[key].companyName,
+      contactName: val[key].personName,
+      contactPhone: val[key].tel
+    });
   }
   console.log(data);
   dispatchDisposalOrders(data).then(res => {
@@ -1169,6 +1295,8 @@ const handleDisposalDispatchConfirm = (val) =&gt; {
       // 标记处置场所已分配
       disposalAssigned.value = true;
       // 检查是否两个任务都已完成
+      // 立即刷新订单详情以确保分配信息得到保存
+      handleOrderDetail(orderId.value);
     } else {
       uni.$u.toast("指定人员失败，请重试")
     }
@@ -1176,6 +1304,7 @@ const handleDisposalDispatchConfirm = (val) =&gt; {
   })
 }
+
 const handlerUpdateOrderClick = () => {
   carPopupShowFlag.value = true;
   // TODO  照搬一键清运得弹窗
@@ -1648,28 +1777,59 @@ $custom-bottom-height: 200rpx;
       /* 发车次数摘要 */
       .trip-summary-card {
+        /* 现有的 summary-content 样式保持不变 */
         .summary-content {
           display: flex;
           align-items: center;
-          padding: 20rpx 15rpx; /* 减小内边距 */
+          padding: 20rpx 15rpx;
           background: linear-gradient(90deg, #e8f4f0, #fff);
           .summary-label {
             color: #666;
-            margin-right: 8rpx; /* 减小右边距 */
-            font-size: 24rpx; /* 减小字体大小 */
+            margin-right: 8rpx;
+            font-size: 24rpx;
           }
           .summary-value {
             color: #19a97c;
             font-weight: bold;
-            font-size: 28rpx; /* 减小字体大小 */
-            margin: 0 4rpx; /* 减小边距 */
+            font-size: 28rpx;
+            margin: 0 4rpx;
           }
           .summary-unit {
             color: #666;
-            font-size: 24rpx; /* 减小字体大小 */
+            font-size: 24rpx;
+          }
+        }
+
+        /* 添加 reduce-trip-section 的样式 */
+        /* 添加 reduce-trip-section 的样式 */
+        .reduce-trip-section {
+          display: flex;
+          flex-wrap: wrap; /* 允许内容换行 */
+          justify-content: space-between; /* 两端对齐，使右侧控件靠右 */
+          align-items: center;
+          padding: 20rpx 15rpx;
+          border-top: 1rpx solid #e8f4f0;
+
+          .reduce-label {
+            color: #666;
+            font-size: 24rpx;
+            min-width: 120rpx; /* 固定标签宽度，防止换行 */
+          }
+
+          /* 右侧控件容器 */
+          .right-controls {
+            display: flex;
+            align-items: center;
+          }
+
+          /* 为按钮添加样式 */
+          .u-button {
+            max-width: 120rpx; /* 限制按钮最大宽度 */
+            font-size: 20rpx; /* 减小字体大小 */
+            padding: 0 10rpx; /* 调整内边距 */
           }
         }
       }
@@ -33,12 +33,20 @@ const getOrderCountByType = async (type) =&gt; {
 }
 onShow(() => {
-  // 调用获取订单数量的接口
-  getOrderCountByType(0).then(res => {
-    // 设置角标显示为实际的订单总数
+  // 同时获取待清运和清运中订单数量
+  Promise.all([
+    getOrderCountByType(0), // 待清运
+    getOrderCountByType(1)  // 清运中
+  ]).then(results => {
+    // 计算待清运和清运中订单数量之和
+    const totalCount = results.reduce((sum, res) => {
+      return sum + (res.data.data.total || 0);
+    }, 0);
+
+    // 设置角标显示为待清运和清运中订单数量之和
     uni.setTabBarBadge({
       index: 1, // 订单tab在tabBar中的索引
-      text: String(res.data.data.total) // 使用实际的订单总数
+      text: String(totalCount) // 使用实际的订单总数
     });
   }).catch(error => {
     console.error('获取订单数量失败:', error);
@@ -20,7 +20,7 @@
                 载运量 {{ item.garNowCarCount }} /{{ item.garRealCarCount }}
               </view>
               <view v-if="item.garNowCarCount === item.garRealCarCount" class="completion-tip">
-                全部完成
+                {{ props.tabIndex === 0 ? '清运完成待确认' : '已完成' }}
               </view>
             </view>
           </view>
@@ -39,7 +39,7 @@
 <script setup>
 import { queryOrderMessageCount, queryOrderList } from '@/apis/order.js';
 import { useMainStore } from '@/stores/index.js';
-import { computed, nextTick, onMounted, ref } from 'vue';
+import { computed, nextTick, onMounted, ref ,onUnmounted} from 'vue';
 import swiperListItem from './swiper-list-item/index.vue';
 const store = useMainStore();
 // 初始化订单类型列表，添加count属性
@@ -128,7 +128,18 @@ onMounted(() =&gt; {
     // 页面加载后获取所有订单总数
     getAllOrderCounts();
   })
+  uni.$on('orderCreated', handleOrderCreated);
 })
+
+const handleOrderCreated = () => {
+  // 重新获取所有订单数量
+  getAllOrderCounts();
+};
+
+onUnmounted(() => {
+  // 移除事件监听
+  uni.$off('orderCreated', handleOrderCreated);
+});
 </script>
 <style lang="scss" scoped>
 .order-container {
@@ -13,7 +13,7 @@
             <view style="display: flex;align-items: center;">
               <view v-if="item.garOrderHandlerStatus === 0 && item.garCancelFlag === 0" class="right">待清运 </view>
               <view v-if="item.garCancelFlag === 1" class="right">已取消 </view>
-              <view v-if="item.garOrderHandlerStatus === 1 && item.garCancelFlag === 0" class="right">清运中 </view>
+              <view v-if="item.garOrderHandlerStatus === 1 && item.garCancelFlag === 0 && item.garNowCarCount !== item.garRealCarCount" class="right">清运中 </view>
               <view v-if="item.garOrderHandlerStatus === 1 && item.garCancelFlag === 0 && item.garNowCarCount === item.garRealCarCount" class="right">已完成 </view>
             </view>
             <view v-if="item.garEvaluateFlag === 0 && userType === '用户'" class="right">待评价