修复部分bug

src/option/distribution/arteryDistrilbutionBillLadingList.js

@@ -222,6 +222,16 @@ export const columnList = [
     fixed: false,
     sortable: true,
   },
+  {
+    prop: 'planNum',
+    label: '预计件数',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+  },
   {
     prop: 'totalWeight',
     label: '重量',
@@ -232,6 +242,17 @@ export const columnList = [
     fixed: false,
     sortable: true,
   },
+  {
+    prop: 'planWeight',
+    label: '计划重量',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    isshowSummary: true,
+  },
   {
     prop: 'totalVolume',
     label: '体积',
@@ -242,6 +263,17 @@ export const columnList = [
     fixed: false,
     sortable: false,
   },
+  {
+    prop: 'planVolume',
+    label: '计划体积',
+    type: 1,
+    values: '',
+    width: '130',
+    checkarr: [],
+    fixed: false,
+    sortable: true,
+    isshowSummary: true,
+  },
   {
     prop: 'createUserName',
     label: '创建人',

src/option/distribution/directGoMarketDetails.js

@@ -245,7 +245,7 @@ export const detailsColumnList = [
   },
   {
     prop: 'scanStatusName',
-    label: '装卸状态',
+    label: '签收状态',
     type: 3,
     values: '',
     width: '130',
@@ -273,16 +273,16 @@ export const detailsColumnList = [
     fixed: false,
     sortable: true,
   },
-  {
-    prop: 'unLoadNum',
-    label: '卸车数',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
+  // {
+  //   prop: 'unLoadNum',
+  //   label: '卸车数',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
   {
     prop: 'signUserName',
     label: '签收人',
@@ -303,16 +303,16 @@ export const detailsColumnList = [
     fixed: false,
     sortable: true,
   },
-  {
-    prop: 'unloadTime',
-    label: '卸车时间',
-    type: 1,
-    values: '',
-    width: '130',
-    checkarr: [],
-    fixed: false,
-    sortable: true,
-  },
+  // {
+  //   prop: 'unloadTime',
+  //   label: '卸车时间',
+  //   type: 1,
+  //   values: '',
+  //   width: '130',
+  //   checkarr: [],
+  //   fixed: false,
+  //   sortable: true,
+  // },
   {
     prop: 'remark',
     label: '备注',

src/option/waybill/orderPackageListDetails.js

@@ -57,6 +57,16 @@ export const packageListColumnList = [
     fixed: true,
     sortable: true,
   },
+  {
+    prop: 'nowWarehouseName',
+    label: '当前所在仓库',
+    type: 2,
+    values: '',
+    width: '150',
+    checkarr: [],
+    fixed: true,
+    sortable: true,
+  },
   {
     prop: 'trainNumber',
     label: '客户车次号',

src/views/distribution/artery/TripartiteTransfer.vue

@@ -431,7 +431,10 @@
         fullScreen: details.fullscreenObj.listOfLoadedWagonsPopUp,
       }"
     >
-      <TripartiteTransferPrintTemplate :waybillInfo="details.listOfLoadedWagonsData" />
+      <TripartiteTransferPrintTemplate
+        v-if="details.popUpShow.listOfLoadedWagons"
+        :waybillInfo="details.listOfLoadedWagonsData"
+      />
     </div>
     <div class="flex-c-c mt10">
       <el-button icon="el-icon-circle-close" @click="details.popUpShow.listOfLoadedWagons = false">

src/views/distribution/artery/VehicleArrivalManagement.vue

@@ -440,7 +440,10 @@
         fullScreen: details.fullscreenObj.listOfLoadedWagonsPopUp,
       }"
     >
-      <ArteryPrintTemplate :waybillInfo="details.listOfLoadedWagonsData" />
+      <ArteryPrintTemplate
+        v-if="details.popUpShow.listOfLoadedWagons"
+        :waybillInfo="details.listOfLoadedWagonsData"
+      />
     </div>
     <div class="flex-c-c mt10">
       <el-button icon="el-icon-circle-close" @click="details.popUpShow.listOfLoadedWagons = false">

src/views/distribution/artery/VehicleStowage.vue

@@ -415,7 +415,10 @@
           fullScreen: details.fullscreenObj.listOfLoadedWagonsPopUp,
         }"
       >
-        <ArteryPrintTemplate :waybillInfo="details.listOfLoadedWagonsData" />
+        <ArteryPrintTemplate
+          v-if="details.popUpShow.listOfLoadedWagons"
+          :waybillInfo="details.listOfLoadedWagonsData"
+        />
       </div>
       <div class="dialog-footer">
         <el-button

src/views/waybill/TemporaryStorageList.vue

@@ -1327,7 +1327,7 @@ const handleDownLoadFile = () => {
   const url =
     details.ouPaiChooseType === 1
       ? 'http://47.108.51.143:9000/bladex/upload/20240118/65c977fe6ac575ebb17803400a7abbc7.xlsx'
-      : 'http://47.108.51.143:9000/bladex/upload/20240508/%E6%97%A0%E5%8C%85%E6%9D%A1%E7%A0%81%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%28%E8%B4%A7%E6%97%A0%E5%BF%A7%29.xlsx?Content-Disposition=attachment%3B%20filename%3D%22upload%2F20240508%2F%E6%97%A0%E5%8C%85%E6%9D%A1%E7%A0%81%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%28%E8%B4%A7%E6%97%A0%E5%BF%A7%29.xlsx%22&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minio%2F20240508%2F%2Fs3%2Faws4_request&X-Amz-Date=20240508T024854Z&X-Amz-Expires=432000&X-Amz-SignedHeaders=host&X-Amz-Signature=cebd92541903249d5c5fdf1a2dfa03bdb5d56beba7b73c97ac419c209cd1f2fa';
+      : 'http://8.137.14.82:9000/bladex/upload/20240612/%E6%97%A0%E5%8C%85%E6%9D%A1%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%EF%BC%88%E8%B4%A7%E6%97%A0%E5%BF%A7-%E7%94%9F%E6%88%90%E5%8C%85%E6%9D%A1%EF%BC%89.xlsx?Content-Disposition=attachment%3B%20filename%3D%22upload%2F20240612%2F%E6%97%A0%E5%8C%85%E6%9D%A1%E5%AF%BC%E5%85%A5%E6%A8%A1%E7%89%88%EF%BC%88%E8%B4%A7%E6%97%A0%E5%BF%A7-%E7%94%9F%E6%88%90%E5%8C%85%E6%9D%A1%EF%BC%89.xlsx%22&X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=minio%2F20240612%2F%2Fs3%2Faws4_request&X-Amz-Date=20240612T115253Z&X-Amz-Expires=432000&X-Amz-SignedHeaders=host&X-Amz-Signature=f5f10451397865d890f2414c1d8e66b35e78e918528db7f5e29fd6276c0c3551';
   const name =
     details.ouPaiChooseType === 1
       ? '包条导入模版（货无忧-生成包条）.xlsx'