diff --git a/src/option/waybill/orderPackageList.js b/src/option/waybill/orderPackageList.js
index 14a4f022..9776215a 100644
--- a/src/option/waybill/orderPackageList.js
+++ b/src/option/waybill/orderPackageList.js
@@ -48,16 +48,16 @@ export const packageListColumnList = [
     sortable: true,
     head: false,
   },
-  // {
-  //   prop: 'carNumber',
-  //   label: '客户车次号',
-  //   type: 2,
-  //   values: '',
-  //   width: '150',
-  //   checkarr: [],
-  //   fixed: false,
-  //   sortable: true,
-  // },
+  {
+    prop: 'trainNumber',
+    label: '客户车次号',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'packageStatusName',
     label: '入库',
diff --git a/src/styles/common.scss b/src/styles/common.scss
index af843f51..f675df91 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -153,6 +153,11 @@ a {
   justify-content: space-between;
 }
 
+.align-center {
+  display: flex;
+  align-items: center;
+}
+
 .mt10 {
   margin-top: 10px;
 }
diff --git a/src/views/distribution/artery/AddVehicleStowage.vue b/src/views/distribution/artery/AddVehicleStowage.vue
index f03e6fec..8756fd4a 100644
--- a/src/views/distribution/artery/AddVehicleStowage.vue
+++ b/src/views/distribution/artery/AddVehicleStowage.vue
@@ -449,7 +449,7 @@
                     </el-form-item> -->
                   <el-form-item label="开单时间" class="el-times">
                     <el-date-picker
-                      v-model="item.createTimeArr"
+                      v-model="item.timeQuery.createTimeArr"
                       type="daterange"
                       unlink-panels
                       range-separator="-"
@@ -463,7 +463,7 @@
                   </el-form-item>
                   <el-form-item label="入库时间" class="el-times">
                     <el-date-picker
-                      v-model="item.openTimeArr"
+                      v-model="item.timeQuery.openTimeArr"
                       type="daterange"
                       unlink-panels
                       range-separator="-"
diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue
index 50578f04..2fd485c3 100644
--- a/src/views/distribution/artery/TripartiteTransfer.vue
+++ b/src/views/distribution/artery/TripartiteTransfer.vue
@@ -907,6 +907,9 @@ const editTransfer = async () => {
   if (Number(details.selectionList[0].isSettlement) === 2)
     return ElMessage.warning('已结算, 无法修改');
 
+  if (Number(details.selectionList[0].loadStatus) === 10)
+    return ElMessage.warning('已发车, 无法修改');
+
   if (Number(details.selectionList[0].loadStatus) === 90)
     return ElMessage.warning('已签收, 无法修改');
 
@@ -990,8 +993,18 @@ const handleConfirmStartCar = () => {
     cancelButtonText: '取消',
     type: 'warning',
   }).then(async () => {
+    const _arr = [];
+
+    for (let index = 0; index < details.selectionList.length; index++) {
+      const item = details.selectionList[index];
+
+      if (item.realLoadingNumber === 0) return ElMessage.warning('存在未装车数据');
+
+      _arr.push(item.id);
+    }
+
     const submitData = {
-      loadId: details.selectionList.map(val => val.id).join(','),
+      loadId: _arr.join(','),
     };
 
     const res = await postStartCars(submitData);
diff --git a/src/views/distribution/artery/TripartiteTransferDetails.vue b/src/views/distribution/artery/TripartiteTransferDetails.vue
index a213f80d..f882f199 100644
--- a/src/views/distribution/artery/TripartiteTransferDetails.vue
+++ b/src/views/distribution/artery/TripartiteTransferDetails.vue
@@ -229,11 +229,11 @@
             </div>
           </div>
           <!-- 表格 -->
-          <!--  <tablecmt
+          <tablecmt
             ref="oldColumnListNode"
             :columnList="details.columnList"
             :tableData="details.oldData"
-            :loading="loadingObj.oldListLoading"
+            :loading="loadingObj.renderData"
             @inputTxt="inputsc"
             @timeCheck="timesc"
             @selectCheck="selectsc"
@@ -241,14 +241,14 @@
           >
             <template #default="slotProps">
               <template v-if="slotProps.scope.column.label === '运单号'">
-                <el-text @click="handleGoWaybillDetails(slotProps.scope)">
+                <el-text @click="() => handleGoWayBillDetail(slotProps.scope)">
                   {{ slotProps.scope.row.waybillNo }}
                 </el-text>
               </template>
             </template>
-          </tablecmt> -->
+          </tablecmt>
 
-          <div class="flex">
+          <!-- <div class="flex">
             <el-tabs
               v-model="details.type"
               tab-position="left"
@@ -261,7 +261,6 @@
             </el-tabs>
 
             <div class="overflow">
-              <!-- 表格 -->
               <tablecmt
                 class="w100"
                 ref="oldColumnListNode"
@@ -283,7 +282,7 @@
                 </template>
               </tablecmt>
             </div>
-          </div>
+          </div>-->
         </el-tab-pane>
 
         <el-tab-pane label="操 作 日 志" name="tab2">
@@ -781,6 +780,10 @@ const handleData = async () => {
       comparisonValue = value.waybillNo;
       handleMerge(mergeStartIndex, index, _data);
       mergeStartIndex = index;
+
+      if (index === _data.length - 1) {
+        handleMerge(mergeStartIndex, index + 1, _data);
+      }
       // 最后一位特殊处理
     } else if (index === _data.length - 1) handleMerge(mergeStartIndex, index + 1, _data);
   }
diff --git a/src/views/distribution/artery/VehicleStowageDetails.vue b/src/views/distribution/artery/VehicleStowageDetails.vue
index 74c772cc..af72e371 100644
--- a/src/views/distribution/artery/VehicleStowageDetails.vue
+++ b/src/views/distribution/artery/VehicleStowageDetails.vue
@@ -183,7 +183,28 @@
             </div>
           </div>
 
-          <div class="flex">
+          <tablecmt
+            class="w100"
+            ref="oldColumnListNode"
+            :columnList="details.detailsColumnList"
+            :tableData="details.renderData"
+            :loading="loadingObj.oldListLoading"
+            @inputTxt="inputsc"
+            @timeCheck="timesc"
+            @selectCheck="selectsc"
+            @selection="selectionChange"
+            :arraySpanMethod="row => arraySpanMethod(row)"
+          >
+            <template #default="slotProps">
+              <template v-if="slotProps.scope.column.label === '运单号'">
+                <el-text @click="() => handleGoWayBillDetail(slotProps.scope)">{{
+                  slotProps.scope.row.waybillNo
+                }}</el-text>
+              </template>
+            </template>
+          </tablecmt>
+
+          <!-- <div class="flex">
             <el-tabs
               v-model="details.type"
               tab-position="left"
@@ -196,7 +217,6 @@
             </el-tabs>
 
             <div class="overflow">
-              <!-- 表格 -->
               <tablecmt
                 class="w100"
                 ref="oldColumnListNode"
@@ -218,7 +238,7 @@
                 </template>
               </tablecmt>
             </div>
-          </div>
+          </div> -->
         </el-tab-pane>
 
         <el-tab-pane label="日 志 跟 踪" name="tab2">
@@ -315,19 +335,31 @@
               "
               >添加运输合同图片</el-button
             >
-            <div class="mt10">
-              <el-image
-                class="mr10 carriageContractList_img"
-                v-for="(item, index) in details.carriageContractList"
-                style="width: 100px; height: 100px"
-                :src="item"
-                :zoom-rate="1.2"
-                :max-scale="7"
-                :min-scale="0.2"
-                :preview-src-list="details.carriageContractList"
-                :initial-index="index"
-                fit="cover"
-              />
+            <div class="mt10 imgBox flex">
+              <div v-for="(item, index) in details.carriageContractList">
+                <el-image
+                  class="mr10 carriageContractList_img"
+                  style="width: 100px; height: 100px"
+                  :src="item.url"
+                  :zoom-rate="1.2"
+                  :max-scale="7"
+                  :min-scale="0.2"
+                  :preview-src-list="details.carriageContractList.map(val => val.url)"
+                  :initial-index="index"
+                  fit="cover"
+                />
+
+                <div class="align-center">
+                  <el-icon color="#172e60" size="20px"><User /></el-icon>
+                  <span class="mr10 ml10">操作人：</span>
+                  <span>{{ item.createUserName }}</span>
+                </div>
+                <div class="mt10 align-center">
+                  <el-icon color="#172e60" size="20px"><Clock /></el-icon>
+                  <span class="mr10 ml10">上传时间：</span>
+                  <span>{{ item.createTime }}</span>
+                </div>
+              </div>
             </div>
           </div>
         </el-tab-pane>
@@ -739,7 +771,16 @@ const handleFindContractList = async () => {
     const _imgArr = [];
     for (let i = 0; i < data.length; i++) {
       const value = data[i];
-      _imgArr.push(...value.url.split(','));
+      const _img = value.url.split(',');
+
+      for (let index = 0; index < _img.length; index++) {
+        const element = _img[index];
+        // _imgArr.push(...value.url.split(','));
+        _imgArr.push({
+          ...value,
+          url: element,
+        });
+      }
     }
     details.carriageContractList = _imgArr;
     console.log('_imgArr :>> ', _imgArr);
@@ -890,16 +931,17 @@ const arraySpanMethod = (row: any) => {
 /** 提交新增 */
 const handleSubmitAddImg = async () => {
   if (details.updateImgList.length === 0) return ElMessage.warning('请选择需要上传的图片');
+  const urlList = [];
+  console.log('details.updateImgList :>> ', details.updateImgList);
+  for (let i = 0; i < details.updateImgList.length; i++) {
+    const value = details.updateImgList[i];
+    console.log('value :>> ', value);
+    if (!value.response) return ElMessage.warning('照片上传未完成或上传失败, 请等待或移除');
+    if (value.response.data.link) urlList.push(value.response.data.link);
+  }
   details.popUpShow.addImgVisible = false;
   details.loadingObj.pageLoading = true;
   try {
-    const urlList = [];
-    console.log('details.updateImgList :>> ', details.updateImgList);
-    for (let i = 0; i < details.updateImgList.length; i++) {
-      const value = details.updateImgList[i];
-      console.log('value :>> ', value);
-      if (value.response.data.link) urlList.push(value.response.data.link);
-    }
     const res = await postAddContractByLoadId({
       loadId: $route.query.loadId,
       url: urlList.join(','),
@@ -1157,4 +1199,12 @@ watch(
   color: #959a9e;
   transition: all 0.3s;
 }
+
+.imgBox {
+  display: flex;
+  flex-wrap: wrap;
+  & > div {
+    padding: 10px;
+  }
+}
 </style>
diff --git a/src/views/distribution/inventory/CreateOrder.vue b/src/views/distribution/inventory/CreateOrder.vue
index e776c2a5..7163c18c 100644
--- a/src/views/distribution/inventory/CreateOrder.vue
+++ b/src/views/distribution/inventory/CreateOrder.vue
@@ -2026,7 +2026,7 @@ const onLoad = async (idsArr = []) => {
       details.query.payWay = data.payWayList.find(val => val.dictValue === '到付').dictKey || '2';
     }
     details.query.transportType = details.query.transportType || '1';
-    details.query.deliveryWay = details.defaultDeliveryWay || '1'
+    details.query.deliveryWay = details.query.defaultDeliveryWay || '1';
 
     handleFindPrice();
   } catch (error) {