配送添加合计

src/api/distribution/VehicleStowageDetails.js

@@ -0,0 +1,24 @@
+import request from '@/axios';
+
+/**
+ * 初始化获取配载信息
+ */
+export const postloadFindLoadInitData = (data = {}) => {
+  return request({
+    url: '/api/logpm-trunkline/carsLoad/findLoadInitData',
+    method: 'post',
+    data,
+  });
+};
+
+/**
+ * 通过名称查询仓库信息
+ */
+export const postCarsLoadDetailInfo = data => {
+  return request({
+    url: '/api/logpm-trunkline/carsLoad/carsLoadDetailInfo',
+    method: 'post',
+    data,
+  });
+};
+

src/router/views/index.js

@@ -2,7 +2,6 @@ import Layout from '@/page/index/index.vue';
 import Store from '@/store/';
 
 export default [
-
   {
     path: '/wel',
     component: Layout,
@@ -188,7 +187,7 @@ export default [
         },
         component: () =>
           import(
-                /* webpackChunkName: "views" */ '@/views/distribution/artery/zeroAdditionalRecording.vue'
+            /* webpackChunkName: "views" */ '@/views/distribution/artery/zeroAdditionalRecording.vue'
           ),
       },
       {
@@ -199,7 +198,7 @@ export default [
         },
         component: () =>
           import(
-                /* webpackChunkName: "views" */ '@/views/distribution/artery/AddVehicleStowage.vue'
+            /* webpackChunkName: "views" */ '@/views/distribution/artery/AddVehicleStowage.vue'
           ),
       },
       {
@@ -210,7 +209,7 @@ export default [
         },
         component: () =>
           import(
-                /* webpackChunkName: "views" */ '@/views/distribution/artery/truckLoadingDetails.vue'
+            /* webpackChunkName: "views" */ '@/views/distribution/artery/truckLoadingDetails.vue'
           ),
       },
       {
@@ -221,7 +220,7 @@ export default [
         },
         component: () =>
           import(
-                /* webpackChunkName: "views" */ '@/views/distribution/artery/addTripartiteTransfer.vue'
+            /* webpackChunkName: "views" */ '@/views/distribution/artery/addTripartiteTransfer.vue'
           ),
       },
       {
@@ -232,7 +231,18 @@ export default [
         },
         component: () =>
           import(
-                /* webpackChunkName: "views" */ '@/views/distribution/artery/TripartiteTransferDetails.vue'
+            /* webpackChunkName: "views" */ '@/views/distribution/artery/TripartiteTransferDetails.vue'
+          ),
+      },
+      {
+        path: 'VehicleStowageDetails',
+        name: '配载详情',
+        meta: {
+          i18n: 'data',
+        },
+        component: () =>
+          import(
+            /* webpackChunkName: "views" */ '@/views/distribution/artery/VehicleStowageDetails.vue'
           ),
       },
     ],
@@ -285,7 +295,7 @@ export default [
         },
         component: () =>
           import(
-                /* webpackChunkName: "views" */ '@/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue'
+            /* webpackChunkName: "views" */ '@/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue'
           ),
       },
       {
@@ -356,7 +366,7 @@ export default [
         },
         component: () =>
           import(
-                /* webpackChunkName: "views" */ '@/views/basic/pdarecords/basicPdarecordslist.vue'
+            /* webpackChunkName: "views" */ '@/views/basic/pdarecords/basicPdarecordslist.vue'
           ),
       },
     ],
@@ -405,7 +415,7 @@ export default [
         props: route => ({ name: route.query.name, id: route.query.id }),
         component: () =>
           import(
-                /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicHistoricalContract.vue'
+            /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicHistoricalContract.vue'
           ),
       },
     ],
@@ -424,7 +434,7 @@ export default [
         props: route => ({ name: route.query.name, id: route.query.id, type: route.query.type }),
         component: () =>
           import(
-                /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicStorageServices.vue'
+            /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicStorageServices.vue'
           ),
       },
     ],
@@ -485,7 +495,7 @@ export default [
         }),
         component: () =>
           import(
-                /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicdataFreightFrom.vue'
+            /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicdataFreightFrom.vue'
           ),
       },
     ],
@@ -528,7 +538,7 @@ export default [
         }),
         component: () =>
           import(
-                /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicdataCustomerBase.vue'
+            /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicdataCustomerBase.vue'
           ),
       },
     ],
@@ -550,7 +560,7 @@ export default [
         }),
         component: () =>
           import(
-                /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicdataCustomerStore.vue'
+            /* webpackChunkName: "views" */ '@/views/basicdata/brand/basicdataCustomerStore.vue'
           ),
       },
     ],
@@ -770,7 +780,7 @@ export default [
         },
         component: () =>
           import(
-                /* webpackChunkName: "views" */ '@/views/basic/material/basicTripartiteMaterial.vue'
+            /* webpackChunkName: "views" */ '@/views/basic/material/basicTripartiteMaterial.vue'
           ),
       },
     ],
@@ -785,7 +795,7 @@ export default [
         name: '创建提货单',
         meta: {
           i18n: 'dict',
-          keepAlive: true
+          keepAlive: true,
         },
         props: route => ({
           name: route.query.name,
@@ -1231,7 +1241,6 @@ export default [
     ],
   },
 
-
   {
     path: '/aftersales/aftersalesWorkOrderend',
     component: Layout,
@@ -1294,7 +1303,6 @@ export default [
   //   ],
   // },
 
-
   // {
   //   path: '/distribution/turndelivery/devtmp',
   //   component: Layout,
@@ -1366,6 +1374,4 @@ export default [
 
   //   ],
   // }
-
-
 ];

src/views/distribution/artery/VehicleStowageDetails.vue

@@ -10,41 +10,25 @@
             </div>
           </el-divider>
           <!-- 表单 -->
-          <el-form disabled :inline="true" label-width="120px" :model="form" class="el-fr-d">
+          <el-form :inline="true" label-width="120px" :model="form" class="el-fr-d">
             <div class="fo-fl">
-              <el-form-item label="发车批次" prop="carrierName" style="flex: 1">
-                <el-select
-                  v-model="form.carrierName"
-                  filterable
-                  :teleported="false"
-                  remote
-                  reserve-keyword
-                  placeholder="发车批次"
-                  @change="val => carrierNameChange()"
-                  :remote-method="remoteMethod"
-                  :loading="details.loadingObj.loading"
-                >
-                  <el-option
-                    v-for="val in details.carrierNameOptions"
-                    :key="val.carrierName"
-                    :label="val.carrierName"
-                    :value="val.carrierId"
-                  />
-                </el-select>
+              <el-form-item label="发车批次" prop="carsNo" style="flex: 1">
+                <el-input readonly v-model="form.carsNo" placeholder="发车批次" />
               </el-form-item>
-              <el-form-item label="车线" prop="operator">
-                <el-input v-model="form.operator" placeholder="车线" />
+              <el-form-item label="车线" prop="carsLineName">
+                <el-input readonly v-model="form.carsLineName" placeholder="车线" />
               </el-form-item>
               <el-form-item label="分摊方式">
                 <el-select
+                  readonly
                   :teleported="false"
-                  v-model="form.deliveryType"
+                  v-model="form.chargeType"
                   class="m-2"
                   placeholder="分摊方式"
                   size="default"
                 >
                   <el-option
-                    v-for="item in details.pageInfo.deliveryType || []"
+                    v-for="item in details.pageInfo.chargeType || []"
                     :key="item.dictValue"
                     :label="item.dictValue"
                     :value="item.dictKey"
@@ -53,6 +37,7 @@
               </el-form-item>
               <el-form-item label="直发商家">
                 <el-select
+                  readonly
                   :teleported="false"
                   v-model="form.payMethod"
                   class="m-2"
@@ -69,14 +54,15 @@
               </el-form-item>
               <el-form-item label="装车方式">
                 <el-select
+                  readonly
                   :teleported="false"
-                  v-model="form.chargeType"
+                  v-model="form.loadingType"
                   class="m-2"
                   placeholder="装车方式"
                   size="default"
                 >
                   <el-option
-                    v-for="item in details.pageInfo.chargeType || []"
+                    v-for="item in details.pageInfo.loadType || []"
                     :key="item.dictValue"
                     :label="item.dictValue"
                     :value="item.dictKey"
@@ -84,81 +70,39 @@
                 </el-select>
               </el-form-item>
               <el-form-item label="经办人">
-                <el-select
-                  v-model="form.driverName"
-                  filterable
-                  :teleported="false"
-                  remote
-                  @change="handleNameChange"
-                  reserve-keyword
-                  placeholder="经办人"
-                  :remote-method="remoteMethodDriver"
-                  :loading="details.loadingObj.loading"
-                >
-                  <el-option
-                    v-for="val in details.driverListByName"
-                    :key="val.driverName"
-                    :label="val.driverName"
-                    :value="val.driverId"
-                  />
-                </el-select>
+                <el-input readonly v-model="form.userName" />
               </el-form-item>
               <el-form-item label="合计运输费" prop="customerType">
-                <el-select
-                  :teleported="false"
-                  v-model="form.customerType"
-                  class="m-2"
-                  placeholder="合计运输费"
-                  size="default"
-                >
-                  <el-option
-                    v-for="item in details.pageInfo.customerType || []"
-                    :key="item.dictValue"
-                    :label="item.dictValue"
-                    :value="item.dictKey"
-                  />
-                </el-select>
+                <el-input readonly v-model="form.countTransportCost" />
               </el-form-item>
               <el-form-item label="发车时间">
-                <el-select
-                  :teleported="false"
-                  v-model="form.settlementStatus"
-                  class="m-2"
-                  placeholder="发车时间"
-                  size="default"
-                >
-                  <el-option
-                    v-for="item in details.pageInfo.settlementStatus || []"
-                    :key="item.dictValue"
-                    :label="item.dictValue"
-                    :value="item.dictKey"
-                  />
-                </el-select>
+                <el-input readonly v-model="form.startTime" />
               </el-form-item>
 
               <el-form-item label="车牌号/类型">
-                <el-input placeholder="车牌号/类型" />
+                <el-input readonly placeholder="车牌号/类型" />
               </el-form-item>
 
-              <el-form-item label="主驾司机/电话" prop="carrierOrderCode">
-                <el-input v-model="form.carrierOrderCode" placeholder="主驾司机/电话" />
+              <el-form-item label="主驾司机/电话">
+                <el-input readonly v-model="form.driverNameAndMobile" placeholder="主驾司机/电话" />
               </el-form-item>
 
-              <el-form-item label="副驾司机/电话" prop="carrierTime">
-                <el-input v-model="form.carrierOrderCode" placeholder="副驾司机/电话" />
+              <el-form-item label="副驾司机/电话">
+                <el-input readonly v-model="form.carrierOrderCode" placeholder="副驾司机/电话" />
               </el-form-item>
 
-              <el-form-item label="主驾电话" prop="carrierOrderCode">
-                <el-input v-model="form.carrierOrderCode" placeholder="主驾电话" />
+              <el-form-item label="主驾电话">
+                <el-input readonly v-model="form.driverMobile" placeholder="主驾电话" />
               </el-form-item>
               <div style="flex: 1; padding-right: 0">
                 <el-form-item style="width: 100%; margin: 0" label="备注" :inline="false">
-                  <el-input type="textarea" v-model="form.remark" placeholder="备注"
+                  <el-input readonly type="textarea" v-model="form.remark" placeholder="备注"
                 /></el-form-item>
               </div>
             </div>
           </el-form>
 
+          <!-- 标题 节点信息 -->
           <el-divider content-position="left">
             <div class="flex-c-c">
               <el-icon class="mr10"><Document /></el-icon> 节点信息
@@ -172,7 +116,9 @@
             :loading="loadingObj.stowageLoading"
             ref="nodeInfoRef"
           >
-            <template #default="slotProps"> </template>
+            <template #default="slotProps">
+              <div>{{ slotProps.scope.row[slotProps.scope.column.property] }}</div>
+            </template>
           </tablecmt>
 
           <!-- 标题 运单信息 -->
@@ -235,7 +181,7 @@
             @selectCheck="selectsc"
             @selection="selectionChange"
             :arraySpanMethod="
-              (row) => {
+              row => {
                 console.log('row :>> ', row);
                 if (row.columnIndex === 0) {
                   if (row.rowIndex === 0) return [2, 1];
@@ -406,12 +352,17 @@ import {
   postFindCarListByName,
   postFindDriverListByName,
   postFindCarrierByName,
+  postSelectEditDetailByLoadId,
 } from '@/api/distribution/AddVehicleStowage';
+import { postCarsLoadDetailInfo } from '@/api/distribution/VehicleStowageDetails.js';
 import { postSaveNewTripartiteTransfer } from '@/api/distribution/addTripartiteTransfer.js';
 import type { FormInstance, FormRules } from 'element-plus';
 import { useRouter, useRoute } from 'vue-router';
 import { useStore } from 'vuex';
 
+// 获取节点信息列表, 除开节点名称
+const nodeInfokeys = nodeInfoColumnList.slice(1).map(val => val.prop);
+
 // 获取vuex仓库
 const $store = useStore();
 
@@ -561,7 +512,10 @@ const details = reactive<any>({
     customerType: '',
   },
   /** 页面数据 */
-  pageInfo: {},
+  pageInfo: {
+    // 起始仓数据
+    startWarehouseInfo: {},
+  },
   /** 承运商 */
   carrierNameOptions: [],
   /** 客户类型 */
@@ -687,21 +641,64 @@ onMounted(() => {
   }
 });
 
+/** 设置节点费用禁用 */
+const handleEditForbidden = (_arr: any[]) => {
+  if (_arr.length === 0) return;
+
+  // 获取第一项 (第一项和后续项禁用项不同, 分开设置)
+  const _firstChild = _arr[0];
+  _firstChild.blackList = ['unloadCost', 'unloadOtherCost'];
+
+  const _otherList = _arr.slice(1);
+
+  // 其它项的白名单
+  const _otherwhiteList = ['tollFee', 'reachTransportCost'];
+  // 通过白名单筛选出黑名单
+  const _otherBlackList = nodeInfokeys.filter(val => _otherwhiteList.indexOf(val) === -1);
+  // 设置其他项的黑名单;
+  for (let item of _otherList) {
+    item.blackList = _otherBlackList;
+  }
+
+  return [_firstChild, ..._otherList];
+};
+
 /** 请求页面数据 */
 const onLoad = async () => {
-  const res = await postloadFindLoadInitData();
+  // const res = postCarsLoadDetailInfo({ loadId: $route.query.loadId });
+  // console.log('res :>> ', res);
+  // const res = await postloadFindLoadInitData();
+  // const { code, data } = res.data;
+  // if (code !== 200) return;
+  // details.pageInfo = data;
+  // details.customerType = data.customerType;
+  // console.log('data :>> ', data);
+
+  // details.form.startWarehouseName = data.startWarehouseInfo.warehouseName;
+  // details.form.startWarehouseId = data.startWarehouseInfo.warehouseId;
+  // details.form.endWarehouseName = data.startWarehouseInfo.warehouseName;
+  // details.form.endWarehouseId = data.startWarehouseInfo.warehouseId;
+
+  // initOriginWarehouseOrder();
+  details.loadId = $route.query.loadId;
+  const res = await postSelectEditDetailByLoadId({ loadId: details.loadId });
+  console.log('res :>> ', res);
   const { code, data } = res.data;
-  if (code !== 200) return;
-  details.pageInfo = data;
-  details.customerType = data.customerType;
-  console.log('data :>> ', data);
+  details.nodeInfoData = data.allCarsLineList;
 
-  details.form.startWarehouseName = data.startWarehouseInfo.warehouseName;
-  details.form.startWarehouseId = data.startWarehouseInfo.warehouseId;
-  details.form.endWarehouseName = data.startWarehouseInfo.warehouseName;
-  details.form.endWarehouseId = data.startWarehouseInfo.warehouseId;
+  details.form = data.carsLoadEntity;
+  details.form.driverNameAndMobile = details.form.driverName + '/' + details.form.driverMobile;
 
-  initOriginWarehouseOrder();
+  details.pageInfo.loadType = data.loadType;
+  details.pageInfo.chargeType = data.chargeType;
+
+  details.pageInfo.startWarehouseInfo.warehouseId = data.carsLoadEntity.startWarehouseId;
+  details.pageInfo.startWarehouseInfo.warehouseName = data.carsLoadEntity.startWarehouseName;
+  // 请求节点
+  if (Number(details.pageType) === 2) initOriginWarehouseOrder();
+
+  // 设置页面列表高度
+  setTabelHeight();
 };
 
 onLoad();

src/views/distribution/deliverylist/distributionDeliveryList.vue

@@ -69,31 +69,6 @@
         </el-form>
       </el-row>
 
-      <!-- <el-row :gutter="24" class="rows">
-        <el-col :xl="7" :lg="7" :md="8" :sm="24">
-          <span
-            >配送总车次：{{ statistics.vehiclesNub }} /总包件数：{{
-              statistics.deliveriesTotal
-            }}
-            /总库存品数：{{ statistics.dinventoryTotal }}
-          </span>
-        </el-col>
-        <el-col :xl="7" :lg="7" :md="8" :sm="24">
-          <span
-            >商配总车次：{{ statistics.commercialNub }}/总包件数：{{
-              statistics.commercialTotal
-            }}/总库存品数：{{ statistics.cinventoryTotal }}
-          </span>
-        </el-col>
-        <el-col :xl="7" :lg="7" :md="8" :sm="24">
-          <span
-            >市配总车次：{{ statistics.marketNub }}/总包件数：{{
-              statistics.marketTotal
-            }}/总库存品数：{{ statistics.minventoryTotal }}
-          </span>
-        </el-col>
-      </el-row> -->
-      <!-- 配送总车次 -->
       <div class="orderInfos">
         <div class="order-info">
           <ul>
@@ -194,7 +169,7 @@
           </template>
         </tablecmt>
       </el-row>
-      <el-row class='el-fy '>
+      <el-row class="el-fy">
         <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
           <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
@@ -504,6 +479,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         {
           prop: 'price',
@@ -514,6 +490,7 @@ export default {
           checkarr: [],
           fixed: false,
           sortable: true,
+          isshowSummary: true,
         },
         // {
         //   prop: 'fee',
@@ -533,6 +510,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -543,6 +521,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -553,6 +532,7 @@ export default {
           width: '150',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -563,6 +543,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -573,6 +554,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {

src/views/distribution/deliverylist/distributionDeliveryListdis.vue

@@ -85,29 +85,24 @@
       <!-- </el-row> -->
       <!-- 商配总车次 -->
 
-      <div style="
-    height: 95%;
-">
-
-
-      <div class="order-info">
-        <ul>
-          <li>
-            <img src="../../../../public/img/bg/Delivery.png" /> 商配总车次{{
-              statistics.commercialNub
-            }}
-          </li>
-          <li>
-            <img src="../../../../public/img/bg/package.png" />总包件数{{
-              statistics.commercialTotal
-            }}
-          </li>
-        </ul>
-      </div>
-
+      <div style="height: 95%">
+        <div class="order-info">
+          <ul>
+            <li>
+              <img src="../../../../public/img/bg/Delivery.png" /> 商配总车次{{
+                statistics.commercialNub
+              }}
+            </li>
+            <li>
+              <img src="../../../../public/img/bg/package.png" />总包件数{{
+                statistics.commercialTotal
+              }}
+            </li>
+          </ul>
+        </div>
 
-      <el-row  class="el_tabBK">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-row class="el_tabBK">
+          <el-tabs v-model="activeName" @tab-click="handleClick">
             <div class="avue-crud__header">
               <!-- 头部左侧按钮模块 -->
               <div class="avue-crud__left" style="margin-top: 20px">
@@ -118,7 +113,7 @@
 
                 <el-button type="primary" @click="printBatchOrder">批量打印</el-button>
                 <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
-                >导出
+                  >导出
                 </el-button>
               </div>
               <!-- 头部右侧按钮模块 -->
@@ -128,155 +123,152 @@
                 <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
               </div>
             </div>
-          <el-tab-pane label="全部列表" name="first">
-<!--            <tablecmt-->
-<!--                    :columnList="columnList"-->
-<!--                    :tableData="data"-->
-<!--                    :loading="loading"-->
-<!--                    @inputTxt="inputsc"-->
-<!--                    @timeCheck="timesc"-->
-<!--                    @btnCheck="btnsc"-->
-<!--                    @selectCheck="selectsc"-->
-<!--                    @selection="selectionsc"-->
-<!--            >-->
-<!--              <template #default="slotProps">-->
-<!--                <el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>-->
-<!--                <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>-->
-<!--                <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>-->
-<!--                <el-text-->
-<!--                        size="small"-->
-<!--                        v-if="-->
-<!--                slotProps.scope.row.deliveryStatusName !== '已完成' ||-->
-<!--                slotProps.scope.row.deliveryStatus !== '3'-->
-<!--              "-->
-<!--                        @click="handleEdit(slotProps.scope)"-->
-<!--                >编 辑</el-text-->
-<!--                >-->
-<!--                &lt;!&ndash;            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>&ndash;&gt;-->
-<!--              </template>-->
-<!--            </tablecmt>-->
-          </el-tab-pane>
-          <el-tab-pane label="待配送" name="second">
-<!--            <tablecmt-->
-<!--                    :columnList="columnList"-->
-<!--                    :tableData="data"-->
-<!--                    :loading="loading"-->
-<!--                    @inputTxt="inputsc"-->
-<!--                    @timeCheck="timesc"-->
-<!--                    @btnCheck="btnsc"-->
-<!--                    @selectCheck="selectsc"-->
-<!--                    @selection="selectionsc"-->
-<!--            >-->
-<!--              <template #default="slotProps">-->
-<!--                <el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>-->
-<!--                <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>-->
-<!--                <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>-->
-<!--                <el-text-->
-<!--                        size="small"-->
-<!--                        v-if="-->
-<!--                slotProps.scope.row.deliveryStatusName !== '已完成' ||-->
-<!--                slotProps.scope.row.deliveryStatus !== '3'-->
-<!--              "-->
-<!--                        @click="handleEdit(slotProps.scope)"-->
-<!--                >编 辑</el-text-->
-<!--                >-->
-<!--                &lt;!&ndash;            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>&ndash;&gt;-->
-<!--              </template>-->
-<!--            </tablecmt>-->
-          </el-tab-pane>
-          <el-tab-pane label="配送中" name="third">
-<!--            <tablecmt-->
-<!--                    :columnList="columnList"-->
-<!--                    :tableData="data"-->
-<!--                    :loading="loading"-->
-<!--                    @inputTxt="inputsc"-->
-<!--                    @timeCheck="timesc"-->
-<!--                    @btnCheck="btnsc"-->
-<!--                    @selectCheck="selectsc"-->
-<!--                    @selection="selectionsc"-->
-<!--            >-->
-<!--              <template #default="slotProps">-->
-<!--                <el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>-->
-<!--                <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>-->
-<!--                <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>-->
-<!--                <el-text-->
-<!--                        size="small"-->
-<!--                        v-if="-->
-<!--                slotProps.scope.row.deliveryStatusName !== '已完成' ||-->
-<!--                slotProps.scope.row.deliveryStatus !== '3'-->
-<!--              "-->
-<!--                        @click="handleEdit(slotProps.scope)"-->
-<!--                >编 辑</el-text-->
-<!--                >-->
-<!--                &lt;!&ndash;            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>&ndash;&gt;-->
-<!--              </template>-->
-<!--            </tablecmt>-->
-          </el-tab-pane>
-          <el-tab-pane label="已完成" name="fourth">
-
-          </el-tab-pane>
-        </el-tabs>
-        <tablecmt
-                :columnList="columnList"
-                :tableData="data"
-                :loading="loading"
-                @inputTxt="inputsc"
-                @timeCheck="timesc"
-                @btnCheck="btnsc"
-                @selectCheck="selectsc"
-                @selection="selectionsc"
-        >
-          <template #default="slotProps">
-            <el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>
-            <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
-            <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
-            <el-text
-                    size="small"
-                    v-if="
-                slotProps.scope.row.deliveryStatusName !== '已完成' ||
-                slotProps.scope.row.deliveryStatus !== '3'
-              "
-                    @click="handleEdit(slotProps.scope)"
-            >编 辑</el-text
-            >
-            <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
-          </template>
-        </tablecmt>
-
+            <el-tab-pane label="全部列表" name="first">
+              <!--            <tablecmt-->
+              <!--                    :columnList="columnList"-->
+              <!--                    :tableData="data"-->
+              <!--                    :loading="loading"-->
+              <!--                    @inputTxt="inputsc"-->
+              <!--                    @timeCheck="timesc"-->
+              <!--                    @btnCheck="btnsc"-->
+              <!--                    @selectCheck="selectsc"-->
+              <!--                    @selection="selectionsc"-->
+              <!--            >-->
+              <!--              <template #default="slotProps">-->
+              <!--                <el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>-->
+              <!--                <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>-->
+              <!--                <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>-->
+              <!--                <el-text-->
+              <!--                        size="small"-->
+              <!--                        v-if="-->
+              <!--                slotProps.scope.row.deliveryStatusName !== '已完成' ||-->
+              <!--                slotProps.scope.row.deliveryStatus !== '3'-->
+              <!--              "-->
+              <!--                        @click="handleEdit(slotProps.scope)"-->
+              <!--                >编 辑</el-text-->
+              <!--                >-->
+              <!--                &lt;!&ndash;            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>&ndash;&gt;-->
+              <!--              </template>-->
+              <!--            </tablecmt>-->
+            </el-tab-pane>
+            <el-tab-pane label="待配送" name="second">
+              <!--            <tablecmt-->
+              <!--                    :columnList="columnList"-->
+              <!--                    :tableData="data"-->
+              <!--                    :loading="loading"-->
+              <!--                    @inputTxt="inputsc"-->
+              <!--                    @timeCheck="timesc"-->
+              <!--                    @btnCheck="btnsc"-->
+              <!--                    @selectCheck="selectsc"-->
+              <!--                    @selection="selectionsc"-->
+              <!--            >-->
+              <!--              <template #default="slotProps">-->
+              <!--                <el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>-->
+              <!--                <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>-->
+              <!--                <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>-->
+              <!--                <el-text-->
+              <!--                        size="small"-->
+              <!--                        v-if="-->
+              <!--                slotProps.scope.row.deliveryStatusName !== '已完成' ||-->
+              <!--                slotProps.scope.row.deliveryStatus !== '3'-->
+              <!--              "-->
+              <!--                        @click="handleEdit(slotProps.scope)"-->
+              <!--                >编 辑</el-text-->
+              <!--                >-->
+              <!--                &lt;!&ndash;            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>&ndash;&gt;-->
+              <!--              </template>-->
+              <!--            </tablecmt>-->
+            </el-tab-pane>
+            <el-tab-pane label="配送中" name="third">
+              <!--            <tablecmt-->
+              <!--                    :columnList="columnList"-->
+              <!--                    :tableData="data"-->
+              <!--                    :loading="loading"-->
+              <!--                    @inputTxt="inputsc"-->
+              <!--                    @timeCheck="timesc"-->
+              <!--                    @btnCheck="btnsc"-->
+              <!--                    @selectCheck="selectsc"-->
+              <!--                    @selection="selectionsc"-->
+              <!--            >-->
+              <!--              <template #default="slotProps">-->
+              <!--                <el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>-->
+              <!--                <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>-->
+              <!--                <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>-->
+              <!--                <el-text-->
+              <!--                        size="small"-->
+              <!--                        v-if="-->
+              <!--                slotProps.scope.row.deliveryStatusName !== '已完成' ||-->
+              <!--                slotProps.scope.row.deliveryStatus !== '3'-->
+              <!--              "-->
+              <!--                        @click="handleEdit(slotProps.scope)"-->
+              <!--                >编 辑</el-text-->
+              <!--                >-->
+              <!--                &lt;!&ndash;            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>&ndash;&gt;-->
+              <!--              </template>-->
+              <!--            </tablecmt>-->
+            </el-tab-pane>
+            <el-tab-pane label="已完成" name="fourth"> </el-tab-pane>
+          </el-tabs>
+          <tablecmt
+            :columnList="columnList"
+            :tableData="data"
+            :loading="loading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @btnCheck="btnsc"
+            @selectCheck="selectsc"
+            @selection="selectionsc"
+          >
+            <template #default="slotProps">
+              <el-text size="small" @click="printOrder(slotProps.scope.row)">打 印</el-text>
+              <el-text size="small" @click="editsolt(slotProps.scope)">查 看</el-text>
+              <el-text size="small" @click="editmap(slotProps.scope)">地 图</el-text>
+              <el-text
+                size="small"
+                v-if="
+                  slotProps.scope.row.deliveryStatusName !== '已完成' ||
+                  slotProps.scope.row.deliveryStatus !== '3'
+                "
+                @click="handleEdit(slotProps.scope)"
+                >编 辑</el-text
+              >
+              <!--            <el-button size="small" @click="costadd(slotProps.scope)">费 用 增 项</el-button>-->
+            </template>
+          </tablecmt>
 
-        <!-- 列表模块 -->
+          <!-- 列表模块 -->
 
-        <!--        <el-table ref="table" v-loading="loading"-->
-        <!--                  @selection-change="selectionChange"-->
-        <!--                  :data="data"-->
-        <!--                  :height="height"-->
-        <!--                  style="width: 100%"-->
-        <!--                  :border="option.border">-->
-        <!--&lt;!&ndash;          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>&ndash;&gt;-->
-        <!--          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
-        <!--&lt;!&ndash;          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">&ndash;&gt;-->
-        <!--&lt;!&ndash;          </el-table-column>&ndash;&gt;-->
-        <!--          <template v-for="(item,index) in option.column">-->
-        <!--            &lt;!&ndash; table字段 &ndash;&gt;-->
-        <!--            <el-table-column v-if="item.hide!==true"-->
-        <!--                             :prop="item.prop"-->
-        <!--                             :label="item.label"-->
-        <!--                             :width="item.width"-->
-        <!--                             :key="index">-->
-        <!--            </el-table-column>-->
-        <!--          </template>-->
-        <!--          &lt;!&ndash; 操作栏模块 &ndash;&gt;-->
-        <!--          <el-table-column prop="menu" label="操作" :width="220" align="center">-->
-        <!--            <template #="{row}">-->
-        <!--&lt;!&ndash;              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
-        <!--              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看</el-button>-->
-        <!--              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看地图</el-button>-->
-        <!--            </template>-->
-        <!--          </el-table-column>-->
-        <!--        </el-table>-->
-      </el-row>
+          <!--        <el-table ref="table" v-loading="loading"-->
+          <!--                  @selection-change="selectionChange"-->
+          <!--                  :data="data"-->
+          <!--                  :height="height"-->
+          <!--                  style="width: 100%"-->
+          <!--                  :border="option.border">-->
+          <!--&lt;!&ndash;          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>&ndash;&gt;-->
+          <!--          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>-->
+          <!--&lt;!&ndash;          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">&ndash;&gt;-->
+          <!--&lt;!&ndash;          </el-table-column>&ndash;&gt;-->
+          <!--          <template v-for="(item,index) in option.column">-->
+          <!--            &lt;!&ndash; table字段 &ndash;&gt;-->
+          <!--            <el-table-column v-if="item.hide!==true"-->
+          <!--                             :prop="item.prop"-->
+          <!--                             :label="item.label"-->
+          <!--                             :width="item.width"-->
+          <!--                             :key="index">-->
+          <!--            </el-table-column>-->
+          <!--          </template>-->
+          <!--          &lt;!&ndash; 操作栏模块 &ndash;&gt;-->
+          <!--          <el-table-column prop="menu" label="操作" :width="220" align="center">-->
+          <!--            <template #="{row}">-->
+          <!--&lt;!&ndash;              <el-button type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>&ndash;&gt;-->
+          <!--              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看</el-button>-->
+          <!--              <el-button type="primary" text icon="el-icon-view" @click="handleViewBlank(row)">查看地图</el-button>-->
+          <!--            </template>-->
+          <!--          </el-table-column>-->
+          <!--        </el-table>-->
+        </el-row>
       </div>
-      <el-row class='el-fy'>
+      <el-row class="el-fy">
         <div class="avue-crud__pagination flex-c-sb" style="width: 100%">
           <div style="font-size: 14px">勾选数量: {{ selectionList.length }}</div>
           <!-- 分页模块 -->
@@ -473,7 +465,7 @@ export default {
       form: {},
       // 选择行
       selectionList: [],
-      activeName:'first',
+      activeName: 'first',
       columnList: [
         {
           prop: 'serialNumber',
@@ -617,6 +609,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -627,6 +620,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -637,6 +631,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -647,6 +642,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -657,6 +653,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -667,6 +664,7 @@ export default {
           width: '150',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -677,6 +675,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -687,6 +686,7 @@ export default {
           width: '130',
           checkarr: [],
           fixed: false,
+          isshowSummary: true,
           sortable: true,
         },
         {
@@ -840,7 +840,6 @@ export default {
       console.log('tab------------------>', tab.props.name);
       this.query = {};
       switch (tab.props.name) {
-
         case 'first':
           break;
         case 'second':
@@ -1371,7 +1370,7 @@ export default {
     width: fit-content;
     justify-content: space-between;
   }
-  :deep(.el-row){
+  :deep(.el-row) {
     flex-direction: column;
     flex-wrap: nowrap;
   }
@@ -1466,13 +1465,13 @@ export default {
 .el-fy {
   height: 30px;
   display: flex;
-align-items: flex-end;
+  align-items: flex-end;
   justify-content: flex-end;
 }
-:deep(.maboxhi){
-  height:100%!important;
+:deep(.maboxhi) {
+  height: 100% !important;
+}
+.el_tabBK {
+  height: 70%;
 }
-  .el_tabBK{
-    height:70%;
-  }
 </style>