调整

lichao
1 parent 0e4ee266
Showing 4 changed files with 100 additions and 18 deletions
garbage-removal/src/pages/order-info/order-disposal/transport-detail/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/order-driver/index.vue
@@ -100,7 +100,7 @@
       <view class="space-box">{{ spaceStr }}</view>
     </view>
     <!-- 占位符 -->
-    <view class="order-detail-bottom" v-if="dataGram.garOrderDisposalStatus === 1">
+    <view class="order-detail-bottom" v-if="dataGram.garOrderDisposalStatus === 1 && transportWeightCount > 0">
       <view class="order-detail-bottom-box">
         <u-button @click="handlerOrderSuccess(orderId)" shape="square" color="#19a97c" text="完成订单"></u-button>
       </view>
@@ -132,6 +132,23 @@ const goTransportDetail = (val) =&gt; {
 }
 const handlerOrderSuccess = (orderId) => {
+  // 检查是否有运送信息和载重数据
+  if (!dataGram.value.transportDetails || dataGram.value.transportDetails.length === 0) {
+    uni.showToast({
+      title: '请先添加运送信息',
+      icon: 'none'
+    });
+    return;
+  }
+
+  // 检查载重合计是否大于0
+  if (!transportWeightCount.value || transportWeightCount.value <= 0) {
+    uni.showToast({
+      title: '载重合计必须大于0才能完成订单',
+      icon: 'none'
+    });
+    return;
+  }
   // 提示
   uni.showModal({
     title: '提示',
@@ -146,12 +146,21 @@
           </view>
           <view class="order-detail-container-header-item">
             <text class=" order-detail-container-header-title">装车照片：</text>
-            
+
             <view class="order-detail-container-header-content" style="flex-direction: column;">
               <view v-for="group in putOnImagesGrouped" :key="group.index" class="image-group">
-                <view class="image-group-title">{{ group.carName}}第 {{ group.index }} 趟</view>
+                <view class="image-group-header">
+                  <view class="image-group-title">{{ group.carName}}第 {{ group.index }} 趟</view>
+                  <!-- 根据group.index与真实发车数比较显示状态 -->
+                  <view class="car-status" :class="{
+          'in-transit': group.index < dataGram.garCarInfoList.length,
+          'completed': group.index >= dataGram.garCarInfoList.length
+        }">
+                    {{ group.index < dataGram.garCarInfoList.length ? '运输中' : '已运完' }}
+                  </view>
+                </view>
                 <u-upload width="180" height="130" :fileList="group.images" name="3" multiple :maxCount="20"
-                  :previewFullImage="true" :isReadOnly="true"></u-upload>
+                          :previewFullImage="true" :isReadOnly="true"></u-upload>
               </view>
             </view>
           </view>
@@ -659,4 +668,27 @@ $custom-bottom-height: 200rpx;
   display: flex;
   flex-wrap: wrap;
 }
+.image-group-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 10rpx;
+}
+
+.car-status {
+  padding: 4rpx 12rpx;
+  border-radius: 6rpx;
+  font-size: 24rpx;
+  font-weight: bold;
+
+  &.in-transit {
+    background-color: #fff7e6;
+    color: #ff9900;
+  }
+
+  &.completed {
+    background-color: #e6f7ff;
+    color: #19a97c;
+  }
+}
 </style>
@@ -180,16 +180,26 @@
 					处理信息
 				</view>
 				<view v-if="putDownImages.length || putOnImages.length" style="width: 100%;">
-					<view class="order-detail-container-header-item">
-						<text class=" order-detail-container-header-title">装车照片：</text>
-						<view class="order-detail-container-header-content" style="flex-direction: column">
-							<view v-for="group in putOnImagesGrouped" :key="group.index" class="image-group">
-								<view class="image-group-title">{{ group.carName}}第 {{ group.index }} 趟</view>
-								<u-upload width="180" height="130" :fileList="group.images" name="3" multiple :maxCount="20"
-								:previewFullImage="true" :isReadOnly="true"></u-upload>
-							</view>
-						</view>
-					</view>
+          <view class="order-detail-container-header-item">
+            <text class=" order-detail-container-header-title">装车照片：</text>
+
+            <view class="order-detail-container-header-content" style="flex-direction: column;">
+              <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与真实发车数比较显示状态 -->
+                  <view class="car-status" :class="{
+                      'in-transit': group.index < dataGram.garCarInfoList.length,
+                      'completed': group.index >= dataGram.garCarInfoList.length
+                   }">
+                    {{ group.index < dataGram.garCarInfoList.length ? '运输中' : '已运完' }}
+                  </view>
+                </view>
+                <u-upload width="180" height="130" :fileList="group.images" name="3" multiple :maxCount="20"
+                          :previewFullImage="true" :isReadOnly="true"></u-upload>
+              </view>
+            </view>
+          </view>
 					<!-- <view class="order-detail-container-header-item">
 						<text class=" order-detail-container-header-title">卸车照片：</text>
 						<view class="order-detail-container-header-content">
@@ -437,7 +447,7 @@
 			putOnImages.value = res.data.data.putOnImages.map(item => {
 			let processedItem = item;
 			let carName = '';
-			
+
 			// 提取name后面的字符串作为carName并从item中移除
 			if (item.includes('name')) {
 				const nameIndex = item.indexOf('name');
@@ -445,7 +455,7 @@
 				processedItem = item.substring(0, nameIndex);
 			}
-			
+
 			// 保持原有逻辑不变，但添加carName到返回对象
 			const newItem = processedItem.substring(0, processedItem.length - 6);
 			const newIndex = processedItem.substring(processedItem.length - 6);
@@ -477,7 +487,7 @@
 			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 : ''
 			}));
    			console.log('putOnImagesGrouped.value:', putOnImagesGrouped.value);
 			putDownImages.value = res.data.data.putDownImages.map(item => {
@@ -1034,4 +1044,27 @@ const handleDriverDispatchConfirm = (val) =&gt; {
 		display: flex;
 		flex-wrap: wrap;
 	}
+  .image-group-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 10rpx;
+  }
+
+  .car-status {
+    padding: 4rpx 12rpx;
+    border-radius: 6rpx;
+    font-size: 24rpx;
+    font-weight: bold;
+
+    &.in-transit {
+      background-color: #fff7e6;
+      color: #ff9900;
+    }
+
+    &.completed {
+      background-color: #e6f7ff;
+      color: #19a97c;
+    }
+  }
 </style>
 \ No newline at end of file
@@ -37,7 +37,7 @@ import swiperListItem from &#39;./swiper-list-item/index.vue&#39;;
 import { queryOrderList } from "@/apis/order.js";
 // 初始化订单类型列表，添加count属性
-const list = ref([, { name: '清运中', count: 0 }, { name: '全部', count: 0 }, { name: '已完成', count: 0 }])
+const list = ref([{ name: '待清运', count: 0 }, { name: '清运中', count: 0 }, { name: '全部', count: 0 }, { name: '已完成', count: 0 }])
 const current = ref(0);
 const swiperCurrent = ref(0)
 const uTabsElement = ref()