Merge remote-tracking branch 'origin/dev' into dev

src/api/ecw/box.js

@@ -191,6 +191,7 @@ export function zipDownload(params) {
     url: "/shipment/make-bill-of-lading/zipDownload",
     responseType: "blob",
     method: "get",
+    timeout: 30000,
     params,
   });
 }

src/views/ecw/box/ladingBill/index.vue

@@ -78,7 +78,7 @@
     </el-row>
 
     <el-dialog :title="dialogCfg.title" :visible.sync="dialogCfg.visible" :width="dialogCfg.width" :fullscreen="dialogCfg.fullscreen" append-to-body class="shippingSea-dialog" @closed="dialogclosed">
-      <makeLadingBill v-if="['makeBill','queryBill','resetBill'].includes(dialogCfg.type)" :currData="currData" :currRow="currRow" :dialogCfg="dialogCfg" @closeDialog="closeDialog" :selfNo="shipmentObj.selfNo" />
+      <makeLadingBill v-if="dialogCfg.visible && ['makeBill','queryBill','resetBill'].includes(dialogCfg.type)" :currData="currData" :currRow="currRow" :dialogCfg="dialogCfg" @closeDialog="closeDialog" :selfNo="shipmentObj.selfNo" />
       <previewBill v-if="dialogCfg.type === 'previewBill'" :contentHtml="currData.billContent" :currRow="currRow" :type="dialogCfg.type" />
     </el-dialog>
   </el-row>

src/views/ecw/box/shippingSea/nodePage/cabinet/index.vue

@@ -101,18 +101,20 @@ export default {
           }
           const { ldPictures } = this.cabinetObj;
           let pictures = ldPictures?.split(",") ?? [];
-          // 兼容手机端数据结构
-          pictures = pictures.map((item) => {
-            return {
-              type: "image",
-              url: item,
-            };
-          });
+          let newPictures = [];
+          for (const item of pictures) {
+            if (item) {
+              newPictures.push({
+                type: "image",
+                url: item,
+              });
+            }
+          }
 
           cabinetCreate({
             shipmentId: this.$attrs.shipmentObj.id,
             ...this.cabinetObj,
-            ldPictures: JSON.stringify(pictures),
+            ldPictures: newPictures.length ? JSON.stringify(newPictures) : "",
             operateType,
           }).then((res) => {
             serviceMsg(res, this).then(() => {