diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
index c114eba0..6d19ebcc 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingList.vue
@@ -48,9 +48,6 @@
             <el-button type="primary" icon="Check" @click="handleEditBillladingStatus(1)">
               开始提货
             </el-button>
-            <el-button type="primary" icon="el-icon-close" @click="handleEditBillladingStatus(6)">
-              取消提货
-            </el-button>
             <el-button type="primary" icon="el-icon-check" @click="handleEditBillladingStatus(2)">
               提货完成
             </el-button>
@@ -63,6 +60,9 @@
             <el-button type="primary" icon="el-icon-close" @click="handleEditBillladingStatus(5)">
               取消结算
             </el-button>
+            <el-button type="primary" icon="el-icon-close" @click="handleEditBillladingStatus(6)">
+              取消提货
+            </el-button>
             <!-- <el-button type="danger" icon="el-icon-download" @click="handleExportInfo" plain
               >导出
             </el-button> -->
@@ -1195,7 +1195,18 @@ export default {
 
       if (this.selectionList.length > 1) return this.$message.error('暂时只支持单条数据操作');
 
-      this.$confirm('确定将选择数据提货完成?', {
+      let content = '';
+
+      const contentObj = {
+        1: '确认开始提货',
+        2: '确认提货完成',
+        3: '确认取消完成提货',
+        4: '确认结算',
+        5: '确认取消结算',
+        6: '确认取消提货',
+      };
+
+      this.$confirm(contentObj[type], {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'success',
diff --git a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
index 72196750..f2fb8a32 100644
--- a/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
+++ b/src/views/distribution/inventory/arteryDistrilbutionBillLadingListDetails.vue
@@ -259,7 +259,7 @@ export default {
     return {
       columnList: [
         {
-          prop: 'reservationCode',
+          prop: '',
           label: '序号',
           type: 12,
           values: '',
@@ -269,7 +269,7 @@ export default {
           head: false,
         },
         {
-          prop: 'reservationCode',
+          prop: 'billadingCode',
           label: '提货批次',
           type: 2,
           values: '',
@@ -280,7 +280,7 @@ export default {
           head: false,
         },
         {
-          prop: 'trainNumber',
+          prop: 'waybillNo',
           label: '运单号',
           type: 13,
           values: '',
@@ -291,7 +291,7 @@ export default {
           head: false,
         },
         {
-          prop: 'mallName',
+          prop: 'createTime',
           label: '开单日期',
           type: 4,
           values: '',
@@ -302,7 +302,7 @@ export default {
           head: false,
         },
         {
-          prop: 'consignee',
+          prop: 'goodsName',
           label: '货物名称',
           type: 2,
           values: '',
@@ -312,7 +312,7 @@ export default {
           sortable: true,
         },
         {
-          prop: 'deliveryPhone',
+          prop: 'realNum',
           label: '提货件数',
           type: 10,
           values: '',
@@ -323,7 +323,7 @@ export default {
           isshowSummary: true,
         },
         {
-          prop: 'deliveryAddress',
+          prop: 'realWeight',
           label: '提货重量',
           type: 10,
           values: '',
@@ -334,7 +334,7 @@ export default {
           isshowSummary: true,
         },
         {
-          prop: 'receivingUnit',
+          prop: 'realVolume',
           label: '提货体积',
           type: 10,
           values: '',
@@ -501,16 +501,19 @@ export default {
       data: [],
     };
   },
-  watch: {
-    '$route.data': {
-      handler(newVal, oldVal) {
-        console.log(newVal, oldVal);
-        this.onLoad(this.page);
-      },
-      deep: true,
-      immediate: true,
-    },
-  },
+  // watch: {
+  //   '$route.data': {
+  //     handler(newVal, oldVal) {
+  //       // if ($route.fullpath.indexOf('/delivery/delivery') > -1
+  //       console.log('this.$route :>> ', this.$route);
+
+  //       console.log(newVal, oldVal);
+  //       this.onLoad(this.page);
+  //     },
+  //     deep: true,
+  //     immediate: true,
+  //   },
+  // },
   mounted() {
     var bodyContent = document.querySelectorAll('.maboxhi');
     bodyContent.forEach(val => {
@@ -519,6 +522,7 @@ export default {
     });
   },
   created() {
+    this.onLoad(this.page);
     // //查询字典
     // this.queryDictionary();
   },
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
index 5631a170..529b4cf3 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue
@@ -441,6 +441,8 @@ import { exportBlob } from '@/api/common';
 import { getToken } from '@/utils/auth';
 import { downloadXls } from '@/utils/util';
 import { columnList } from '@/option/distribution/distributionStockArticleSelf';
+import { deepClone } from '@/utils/util.js';
+const _newCol = deepClone(columnList);
 
 export default {
   data() {
@@ -472,7 +474,7 @@ export default {
           },
         ],
       },
-      columnList,
+      columnList: _newCol,
       // columnList: [
       //   {
       //     prop: '',
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
index 182f44a7..55979501 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue
@@ -392,11 +392,13 @@ import { getDictionaryBiz } from '@/api/system/dict';
 import dayjs from 'dayjs';
 import { downloadXls } from '@/utils/util';
 import { columnList } from '@/option/distribution/distributionStockArticleSelf';
+import { deepClone } from '@/utils/util.js';
+const _newCol = deepClone(columnList);
 
 export default {
   data() {
     return {
-      columnList,
+      columnList: _newCol,
       columnListedit: [],
       drawerShow: false,
       height: 0,
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
index b50526e3..64fdbcbd 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue
@@ -419,11 +419,13 @@ import { getDictionaryBiz } from '@/api/system/dict';
 import dayjs from 'dayjs';
 import { downloadXls } from '@/utils/util';
 import { columnList } from '@/option/distribution/distributionStockArticleSelf';
+import { deepClone } from '@/utils/util.js';
+const _newCol = deepClone(columnList);
 
 export default {
   data() {
     return {
-      columnList,
+      columnList:_newCol,
       columnListedit: [],
       drawerShow: false,
       height: 0,
diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
index 42e3cd05..3585be53 100644
--- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
+++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue
@@ -526,11 +526,13 @@ import dayjs from 'dayjs';
 import { getListMaterial } from '@/api/basic/basicMaterial';
 import { downloadXls } from '@/utils/util';
 import { columnList } from '@/option/distribution/distributionStockArticleSelf';
+import { deepClone } from '@/utils/util.js';
+const _newCol = deepClone(columnList);
 
 export default {
   data() {
     return {
-      columnList,
+      columnList: _newCol,
       columnListedit: [],
 
       drawerShow: false,
diff --git a/src/views/distribution/turndelivery/deliveryDiscuss.vue b/src/views/distribution/turndelivery/deliveryDiscuss.vue
index 9f678af4..db16fce3 100644
--- a/src/views/distribution/turndelivery/deliveryDiscuss.vue
+++ b/src/views/distribution/turndelivery/deliveryDiscuss.vue
@@ -327,7 +327,7 @@
                                   ? 'static-class'
                                   : ''
                               "
-                              >{{ props.row[item.prop]!=null ? props.row[item.prop] : '/' }}</span
+                              >{{ props.row[item.prop] != null ? props.row[item.prop] : '/' }}</span
                             >
                           </template>
                         </el-table-column>
@@ -404,15 +404,21 @@
                   </el-table>
                   <div class="el-Cart-button-btn">
                     <div class="el_tool">
-                      已选择:{{dataInfo.length}}条 
-                    
+                      已选择:{{ dataInfo.length }}条
+
                       <div>
                         <span>合计:</span>
-                      <span>订单总件数: <span style="color: #67c23a;">{{Totalnumberoforders}} </span> </span>
-                      <span style=" margin: 0 4px;"></span>
-                      <span>在库总件数: <span style="color: #67c23a;"> {{Totalnumberofitemsinstock}}</span></span>
-                    </div>  
-                    </div>  
+                        <span
+                          >订单总件数:
+                          <span style="color: #67c23a">{{ Totalnumberoforders }} </span>
+                        </span>
+                        <span style="margin: 0 4px"></span>
+                        <span
+                          >在库总件数:
+                          <span style="color: #67c23a"> {{ Totalnumberofitemsinstock }}</span></span
+                        >
+                      </div>
+                    </div>
                     <el-button type="primary" @click="SubmitCommercial"
                       ><el-icon><Select /></el-icon>提交(商配订单)</el-button
                     >
@@ -630,6 +636,15 @@
                     </el-table>
                     <!-- 表格翻页功能 -->
                     <div class="demo-pagination-block TCdemo-pagination-block">
+                      <div style="display: flex" v-if="!wrapLoading">
+                        <div>
+                          订单总件数: <span>{{ orderTotalNum }}</span>
+                        </div>
+                        <div>
+                          在库件数: <span>{{ orderStockNum }}</span>
+                        </div>
+                      </div>
+
                       <el-pagination
                         v-model:current-page="currentPage"
                         v-model:page-size="pageSize"
@@ -857,8 +872,8 @@ const numTab = ref([
   },
 ]);
 const num = ref(null); //计步器
-const Totalnumberoforders=ref(0);//订单总件数
-const Totalnumberofitemsinstock =ref(0);//在库件数
+const Totalnumberoforders = ref(0); //订单总件数
+const Totalnumberofitemsinstock = ref(0); //在库件数
 const kind = ref(true); //标签切换
 const currentPage = ref(1); // 默认页码
 const pageSize = ref(20); // 默认每一页几条
@@ -919,6 +934,20 @@ const soInpuState = ref(false); //搜索框状态表示当前没有搜索
 const statisticsList = ref([]); //需要统计的字段
 const inputValue = ref('number'); //零担输入的值
 const dataInfoID = ref(); //点击删除保存当前ID
+/** 编辑时, 初始化司机信息 */
+const chooseDriverIds = ref([]);
+/** 编辑时, 初始化车辆信息 */
+const chooseCarIds = ref([]);
+const orderTotalNum = computed(() => {
+  console.log('dataTmp.value :>> ', dataTmp.value);
+  console.log('dataInfo.value :>> ', dataInfo.value);
+  const _arr = [...new Set(dataTmp.value), ...dataInfo.value];
+  return _arr.reduce((sum, item) => sum + item.totalNumber, 0);
+});
+const orderStockNum = computed(() => {
+  const _arr = [...new Set(dataTmp.value), ...dataInfo.value];
+  return _arr.reduce((sum, item) => sum + item.handQuantity, 0);
+});
 // 司机选择信息
 // 车辆选项
 // 备货人员
@@ -1237,7 +1266,7 @@ const menuData = ref([
     statistics: true, //开启统计
   },
   {
-    prop: 'handQuantity',  
+    prop: 'handQuantity',
     label: '在库件数',
     type: 1,
     values: '',
@@ -1248,6 +1277,17 @@ const menuData = ref([
     head: true,
     statistics: true, //开启统计
   },
+  {
+    prop: 'warehouseEntryTime',
+    label: '入库时间',
+    type: 1,
+    values: '',
+    width: '160',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    head: true,
+  },
   {
     prop: 'consigneePerson',
     label: '运单收货人',
@@ -1380,17 +1420,6 @@ const menuData = ref([
     sortable: true,
     head: true,
   },
-  {
-    prop: 'warehouseEntryTime',
-    label: '入库时间',
-    type: 1,
-    values: '',
-    width: '160',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-    head: true,
-  },
   {
     prop: 'storeTime',
     label: '在库时间',
@@ -1710,17 +1739,19 @@ onMounted(() => {
         numTab.value[0].name = '0'; //切换外协选项卡
         numTab.value[1].name = '1';
         kind.value = true;
-        res.data.data.deliverySelfVO.forEach(item => {
+        res.data.data.deliverySelfVO.forEach((item, index) => {
           console.log(item, '司机配置信息');
           DriverTemporaryStorage.value.push({
             driverId: item.driverId, //司机ID
             driverName: item.driverName, //司机姓名
             driverPhone: item.driverPhone, //司机电话
-          }),
-            VehicleTemporaryStorage.value.push({
-              vehicleId: item.vehicleId, //车辆ID
-              vehicleNub: item.vehicleNub, //车牌号
-            });
+          });
+          chooseDriverIds.value.push(item.driverId);
+          VehicleTemporaryStorage.value.push({
+            vehicleId: item.vehicleId, //车辆ID
+            vehicleNub: item.vehicleNub, //车牌号
+          });
+          chooseCarIds.value.push(item.vehicleId);
           // 配送司机
           StockInfo.value.Sj.push(item.driverId);
           // 配送车辆
@@ -1730,6 +1761,9 @@ onMounted(() => {
             DataSubmit.value.masterVehicleNub = item.vehicleNub; //司机车牌号
           }
         });
+
+        console.log('chooseDriverIds :>> ', chooseDriverIds);
+        console.log('chooseCarIds :>> ', chooseCarIds);
       }
       wrapDataInfo.value = res.data.data.stockArticleList; // 订单包件
       dataInfo.value = res.data.data.stockArticleList; //订单列表
@@ -1747,7 +1781,7 @@ onMounted(() => {
       DataSubmit.value.stockup.stockupDate = res.data.data.stockupInfo.stockupDate; //备货时间
       DataSubmit.value.taskTime = res.data.data.taskTime; //配送日期
       editLoading.value = false; //所有信息获取完成关闭弹窗
-      tooSUM()
+      tooSUM();
     });
   }
 });
@@ -1883,14 +1917,14 @@ const selectChange = (selection, row) => {
     }
   }
 };
-function tooSUM(){
-  Totalnumberoforders.value=0
-  Totalnumberofitemsinstock.value=0
-  dataInfo.value.forEach(item=>{
-    Totalnumberoforders.value+= item.totalNumber,
-    Totalnumberofitemsinstock.value+=item.handQuantity
-  })
-};
+function tooSUM() {
+  Totalnumberoforders.value = 0;
+  Totalnumberofitemsinstock.value = 0;
+  dataInfo.value.forEach(item => {
+    (Totalnumberoforders.value += item.totalNumber),
+      (Totalnumberofitemsinstock.value += item.handQuantity);
+  });
+}
 // 弹窗确认表单信息展示
 const submit = () => {
   // 当前为编辑状态
@@ -1932,7 +1966,7 @@ const submit = () => {
   // 展示的信息
   dataInfo.value = removeDuplicates(dataInfo.value);
   // 计算总数
-  tooSUM()
+  tooSUM();
   // 临时存储
   dataTmp.value = removeDuplicates(dataTmp.value);
   AddLalog.value = false; //关闭弹窗
@@ -1990,59 +2024,12 @@ const SearchFu = () => {
   }
 
   return;
-  if (multifunctional.value) {
-    document.getElementById(multifunctional.value).scrollIntoView();
-  }
-  return;
-  console.log(soInpuState.value, '当前搜索状态');
-  if (!multifunctional.value && !dataInfoTemp.value.length) {
-    soInpuState.value = false; //重置搜索状态
-    ElMessage({
-      showClose: true,
-      message: '请输入搜索内容',
-      type: 'warning',
-    });
-    return;
-  }
-  if (!multifunctional.value && dataInfoTemp.value.length) {
-    //这里是回复初始内容
-    soInpuState.value = false; //重置搜索状态
-    dataInfo.value = JSON.parse(JSON.stringify(dataInfoTemp.value));
-    dataInfoTemp.value = [];
-  }
-  if (soInpuState.value) {
-    ElMessage({
-      showClose: true,
-      message: '请先重置数据',
-      type: 'warning',
-    });
-    return;
-  } else {
-    //当前状态默认为假，如果是假可以搜索
-    console.log('多功能搜索功能');
-    console.log(dataInfo.value, '当前订单');
-    dataInfoTemp.value = dataInfo.value; //先存储一个完整的值
-    let temp = dataInfo.value.filter(item => {
-      return Object.values(item).some(val => {
-        if (typeof val === 'string') {
-          return val.includes(multifunctional.value);
-        }
-        return false;
-      });
-    });
-
-    console.log(temp, '搜索结果');
-    console.log(dataInfoTemp.value, '临时存储的值');
-    dataInfo.value = temp; //如果搜索到了值才赋值
-    soInpuState.value = false; //表示当前已经搜索过了
-  }
 
   // console.log(dataInfo.value, '搜索结果');
 };
 
 // 删除触发事件
 const DeleteEvent = val => {
-  
   if (route.query.id) {
     // 判断是否为编辑
     let data = {
@@ -2101,7 +2088,7 @@ const DeleteEvent = val => {
       });
     }
   }
-  tooSUM()
+  tooSUM();
 };
 // 编辑触发事件
 const EditEvent = val => {
@@ -2207,7 +2194,7 @@ const PackageFn = () => {
 
 // 查看包件事件
 const ViewEvent = val => {
-  wrapData.value=[]
+  wrapData.value = [];
   loading.value = true; //开启加载效果
   PackageFrom.value = {}; //清空订单搜索参数
   parameter.value = {}; //清空包件搜索
@@ -2220,66 +2207,6 @@ const ViewEvent = val => {
   //   编辑信息弹窗状态
   PackageFn();
   return;
-  if (RouteId.value) {
-    console.log(wrapLoading.value, '当前为编辑状态');
-    $_getPackageListByDeliveryIdAndOrderId({
-      waybillNumber: '', //运单号
-      orderPackageCode: '', //包条码
-      current: 1,
-      size: 100,
-      deliveryId: RouteId.value,
-      id: val.id,
-    }).then(res => {
-      console.log(res, '订单包件信息');
-      if (res.data.code == 200) {
-        wrapData.value = res.data.data.data.packageList;
-        let IdTmp = []; //订单ID暂存
-        dataInfo.value[dataId.value].packageListInfo = wrapTemp.value[dataId.value];
-        //查看当前订单下面包件是缓存值,如果有就读取缓存值,否则就是第一次加载,使用API返回值
-        if (dataInfo.value[dataId.value].packageListInfo) {
-          dataInfo.value[dataId.value].packageListInfo.forEach(item => {
-            IdTmp.push(item.id);
-          });
-        }
-        toggleSelection({
-          val: false,
-          data: IdTmp.length ? IdTmp : res.data.data.data.packageListIds.split(','),
-          index: kind.value ? 0 : 1,
-        }); //编辑的时候选中已有的数据
-      }
-      // AddLalog.value = false; //关闭弹窗
-      console.log(wrapData.value, '包件表格信息');
-      console.log(res);
-    });
-  } else {
-    // 运单号
-    // 包条码
-    $_getPackageListByStockArticleId({
-      waybillNumber: '', //运单号
-      orderPackageCode: '', //包条码
-      id: val.id,
-      current: 1,
-      size: 100,
-    }).then(res => {
-      wrapData.value = res.data.data.records;
-      console.log(res, '订单包件');
-      if (kind.value) {
-        toggleSelection({ index: 0 }); //自主配送下面包件全选
-      } else {
-        toggleSelection({ index: 1 }); //外协下面包件全选
-      }
-      console.log(tableRefs, 'tableRefs');
-      console.log(res.data.data.records, '查看下面的包件');
-    });
-    // 新增 查看订单流程
-    console.log('当前为新增状态');
-    console.log(val, val.id, '查看包件事件');
-    //临时存储下标用于查询包件对应的下标
-    console.log(dataId.value, 'dataId.value下标');
-    console.log(wrapDataInfo.value[dataId.value], '当前订单下面的包件信息');
-    console.log(wrapDataInfo, '订单');
-  }
-  editLoading.value = false; //关闭加载效果
 };
 // 输入框值切换
 
@@ -2617,6 +2544,7 @@ const merge = (val, kindS) => {
       message: '未选择司机配置!',
       type: 'warning',
     });
+    state.value = false; // 不满足提交条件
     return;
   }
   //   判读司机配置是否选择完整
@@ -2625,6 +2553,7 @@ const merge = (val, kindS) => {
       message: '司机配置未选择完整!',
       type: 'warning',
     });
+    state.value = false; // 不满足提交条件
     return;
   }
   //   判读主司机否选择
@@ -2633,6 +2562,7 @@ const merge = (val, kindS) => {
       message: '未选择主司机!',
       type: 'warning',
     });
+    state.value = false; // 不满足提交条件
     return;
   }
   //   判读主车辆否选择
@@ -2641,6 +2571,7 @@ const merge = (val, kindS) => {
       message: '未选择主车辆!',
       type: 'warning',
     });
+    state.value = false; // 不满足提交条件
     return;
   }
   if (!DataSubmit.value.taskTime) {
@@ -2648,6 +2579,7 @@ const merge = (val, kindS) => {
       message: '请填写配送日期',
       type: 'warning',
     });
+    state.value = false; // 不满足提交条件
     return;
   }
   //   如果是提交就不弹窗
@@ -2729,26 +2661,65 @@ const SubmitCommercial = () => {
     if (!kind.value) {
       delete DataSubmit.value.allocationInfo; //如果为外协删掉此参数
     }
+
+    console.log('DriverTemporaryStorage :>> ', DriverTemporaryStorage);
+    console.log('VehicleTemporaryStorage :>> ', VehicleTemporaryStorage);
+
     let DataSubmitRenamed = Object.assign({}, DataSubmit.value); //浅拷贝需要提交的参数
+
+    // 是否修改了司机或车辆的信息
+    DataSubmitRenamed.isDeliveryDriverUpdate = 0;
+    if (
+      DriverTemporaryStorage.value.length !== chooseDriverIds.value.length ||
+      VehicleTemporaryStorage.value.length !== chooseCarIds.value.length
+    )
+      DataSubmitRenamed.isDeliveryDriverUpdate = 1;
+    else {
+      console.log('111 :>> ', 111);
+      // 循环对比司机和车辆的信息, 和编辑初始化带出的信息进行比对
+      for (const iterator of DriverTemporaryStorage.value) {
+        if (chooseDriverIds.value.indexOf(iterator.driverId) === -1) {
+          DataSubmitRenamed.isDeliveryDriverUpdate = 1;
+          break;
+        }
+      }
+
+      // 查看司机是否被改, 被改则跳过循环
+      if (DataSubmitRenamed.isDeliveryDriverUpdate === 0) {
+        for (const iterator of VehicleTemporaryStorage.value) {
+          if (chooseCarIds.value.indexOf(iterator.vehicleId) === -1) {
+            DataSubmitRenamed.isDeliveryDriverUpdate = 1;
+            break;
+          }
+        }
+      }
+    }
+
     delete DataSubmitRenamed.stockup; //删除不需要的参数
     DataSubmitRenamed.stockupInfo = DataSubmit.value.stockup; //把原来的参数赋值给新对象名字,这里用于修改对象名字
     DataSubmitRenamed.id = RouteId.value; //修改提交的时候带上参数ID
-    updateDeliveryList(DataSubmitRenamed).then(res => {
-      editLoading.value = false; //关闭提交加载
-      console.log(res, '修改之后提交的返回值');
-      $store.commit('DEL_TAG_CURRENT'); //关闭当前页面
-      router.push('/distribution/inventory/distrilbutionBillLadingList');
-    });
+    updateDeliveryList(DataSubmitRenamed)
+      .then(res => {
+        console.log(res, '修改之后提交的返回值');
+        $store.commit('DEL_TAG_CURRENT'); //关闭当前页面
+        router.push('/distribution/inventory/distrilbutionBillLadingList');
+      })
+      .finally(() => {
+        editLoading.value = false; //关闭提交加载
+      });
   } else {
     // 新增信息
 
-    deliveryBusinessTask(DataSubmit.value).then(res => {
-      console.log(res, '新增之后的返回值');
-      //   提交之后进行跳转
-      editLoading.value = false; //关闭提交加载
-      $store.commit('DEL_TAG_CURRENT'); //关闭当前页面
-      router.push('/distribution/inventory/distrilbutionBillLadingList');
-    });
+    deliveryBusinessTask(DataSubmit.value)
+      .then(res => {
+        console.log(res, '新增之后的返回值');
+        //   提交之后进行跳转
+        $store.commit('DEL_TAG_CURRENT'); //关闭当前页面
+        router.push('/distribution/inventory/distrilbutionBillLadingList');
+      })
+      .finally(() => {
+        editLoading.value = false; //关闭提交加载
+      });
   }
 
   console.log(DataSubmit.value, '准备提交的信息');
@@ -3315,11 +3286,11 @@ const SubmitCommercial = () => {
     justify-content: flex-start !important;
   }
 }
-.el_tool{
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    min-width: 300px;
-    font-size: 14px;
+.el_tool {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  min-width: 300px;
+  font-size: 14px;
 }
 </style>
diff --git a/vite.config.js b/vite.config.js
index df06fc76..4e457a88 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -14,7 +14,7 @@ export default ({ mode, command }) => {
         '/api': {
           // target: 'http://192.168.10.126:8889',
           // hy
-          target: 'http://192.168.10.48:13000',
+          // target: 'http://192.168.10.48:13000',
           // lmy
           // target: 'http://192.168.10.123:8889',
           // target: 'http://192.168.10.101:8888',
@@ -23,10 +23,10 @@ export default ({ mode, command }) => {
           // 新zyc
           // target: 'http://192.168.6.116:8777',
           // target: 'http://192.168.6.122:8777',
-          // target: 'http://192.168.10.25:13000', 
+          target: 'http://192.168.10.25:13000',
           // target: 'http://192.168.10.25:2888',
-          // target: 'http://192.168.6.162:9777',//CYZ  
-          // target: 'http://192.168.10.57:13000',  
+          // target: 'http://192.168.6.162:9777',//CYZ
+          // target: 'http://192.168.10.57:13000',
           // target: 'http://192.168.10.200:13000',
           // target: 'http://192.168.10.29:13000',
           // target: 'http://h5uapi.huitongys.com',