调整

lichao
1 parent d1ba992a
Showing 2 changed files with 86 additions and 0 deletions
trash-ui/dist.zip
trash-ui/src/views/gar/order/index.vue
@@ -56,6 +56,20 @@
         </template>
       </el-table-column>
       <el-table-column label="车辆数量" align="center" prop="garRealCarCount" />
+      <el-table-column label="未发车数" align="center">
+        <template slot-scope="scope">
+    <span v-if="scope.row.unDispatchedCount !== undefined && scope.row.unDispatchedCount > 0"
+          style="color: red; font-weight: bold;">
+      {{ scope.row.unDispatchedCount }}
+    </span>
+          <span v-else-if="scope.row.unDispatchedCount === 0 || scope.row.unDispatchedCount === 0">
+      0
+    </span>
+          <span v-else>
+      <i class="el-icon-loading"></i>
+    </span>
+        </template>
+      </el-table-column>
 <!--      <el-table-column label="车子类型" width="200px" align="center" prop="garOrderCarType" />-->
       <el-table-column fixed="right" label="操作" width="200px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -399,7 +413,12 @@ export default {
       this.loading = true;
       listOrder(this.queryParams).then(response => {
         this.orderList = response.data.list;
+        console.log(response.data.list)
         this.total = response.data.total;
+
+        // 自动加载所有订单的未发车信息
+        this.loadAllUnDispatchedInfo();
+
         this.loading = false;
       });
     },
@@ -457,6 +476,73 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
+    /**
+     * 批量加载所有订单的未发车信息（带并发限制）
+     */
+    loadAllUnDispatchedInfo() {
+      if (!this.orderList || this.orderList.length === 0) {
+        return;
+      }
+
+      // 限制并发请求数量
+      const concurrencyLimit = 5;
+      const results = [];
+      let index = 0;
+
+      const processBatch = () => {
+        const batch = [];
+        for (let i = 0; i < concurrencyLimit && index < this.orderList.length; i++, index++) {
+          const order = this.orderList[index];
+          batch.push(
+            getOrder(order.garOrderId).then(response => {
+              const detailData = response.data;
+              let unsentCount = 0;
+
+              // 使用与详情页相同的逻辑计算未发车次数
+              if (detailData.carReports && detailData.carReports.length > 0) {
+                detailData.carReports.forEach(carReport => {
+                  // 如果车牌号或载重为空，则认为未发车（与详情页保持一致）
+                  if (!carReport.carNo || !carReport.carWeight) {
+                    unsentCount++;
+                  }
+                });
+              }
+
+              return {
+                orderId: order.garOrderId,
+                unDispatchedCount: unsentCount
+              };
+            }).catch(error => {
+              console.error(`获取订单 ${order.garOrderId} 详情失败:`, error);
+              return {
+                orderId: order.garOrderId,
+                unDispatchedCount: 0
+              };
+            })
+          );
+        }
+
+        if (batch.length === 0) {
+          // 所有请求处理完毕，更新界面
+          results.forEach(result => {
+            const idx = this.orderList.findIndex(item => item.garOrderId === result.orderId);
+            if (idx !== -1) {
+              this.$set(this.orderList[idx], 'unDispatchedCount', result.unDispatchedCount);
+            }
+          });
+          return;
+        }
+
+        Promise.all(batch).then(batchResults => {
+          results.push(...batchResults);
+          // 继续处理下一批
+          processBatch();
+        });
+      };
+
+      // 开始处理
+      processBatch();
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();