海运增加上传功能

src/views/ecw/box/shippingSea/nodePage/arrival.vue

@@ -77,9 +77,11 @@ export default {
   methods: {
     // 获取预计到港时间
     getExpectedTime() {
-      return dayjs(
-        this.$attrs.shipmentObj.shippingInfo.dtEstArrivalTime
-      ).format("YYYY-MM-DD");
+      const { shippingInfo } = this.$attrs.shipmentObj;
+      if (shippingInfo) {
+        return dayjs(shippingInfo.dtEstArrivalTime).format("YYYY-MM-DD");
+      }
+      return null;
     },
     // 时间比较
     compareDate(expectedTime, apConfirmTime) {

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

@@ -16,9 +16,7 @@
         <el-date-picker type="date" placeholder="请选择日期" v-model="cabinetObj.ldOutWarehouseTime" value-format="yyyy-MM-dd"></el-date-picker>
       </el-form-item>
       <el-form-item label="装柜图片">
-        <el-upload action="" :limit="1" :file-list="cabinetObj.ldPictures">
-          <el-button size="small" type="primary">选择文件</el-button>
-        </el-upload>
+        <ImageUpload :limit="1" :isShowTip=false v-model="cabinetObj.ldPictures" />
       </el-form-item>
     </el-form>
 
@@ -41,6 +39,7 @@
 import startPacking from "./startPacking.vue";
 import { cabinetCreate, serviceMsg } from "@/api/ecw/boxSea";
 import { formatDateStr } from "../../utils";
+import ImageUpload from "@/components/ImageUpload";
 
 /**
  * 装柜
@@ -48,7 +47,7 @@ import { formatDateStr } from "../../utils";
 export default {
   name: "cabinet",
   inheritAttrs: false,
-  components: { startPacking },
+  components: { startPacking, ImageUpload },
   data() {
     return {
       // 弹窗

src/views/ecw/box/shippingSea/nodePage/cusDeclaration.vue

@@ -46,9 +46,7 @@
           <el-date-picker type="date" placeholder="请选择日期" v-model="cusDeclarationObj.dcCheckTime" value-format="yyyy-MM-dd"></el-date-picker>
         </el-form-item>
         <el-form-item label="查验前图片">
-          <el-upload action="" :limit="1" :file-list="cusDeclarationObj.dcCheckPreImg">
-            <el-button size="small" type="primary">选择文件</el-button>
-          </el-upload>
+          <ImageUpload :limit="1" :isShowTip=false v-model="cusDeclarationObj.dcCheckPreImg" />
         </el-form-item>
         <el-form-item label="新封条">
           <el-input v-model="cusDeclarationObj.dcStripSeal" placeholder="请输入新封条" clearable />
@@ -133,13 +131,15 @@
 import supplierSelect from "./common/supplierSelect.vue";
 import { customsCreate, serviceMsg } from "@/api/ecw/boxSea";
 import { formatNumberString, formatDateStr } from "../utils";
+import ImageUpload from "@/components/ImageUpload";
+
 /**
  * 报关
  */
 export default {
   name: "cusDeclaration",
   inheritAttrs: false,
-  components: { supplierSelect },
+  components: { supplierSelect, ImageUpload },
   data() {
     return {
       // 报关对象

src/views/ecw/box/shippingSea/nodePage/subMaterial.vue

@@ -97,16 +97,7 @@ export default {
         markNo: "N/M",
       },
       // 出单方式
-      method: [
-        {
-          value: "1",
-          label: "正本",
-        },
-        {
-          value: "2",
-          label: "电放",
-        },
-      ],
+      method: constantDict.billingMethod,
       // 单位
       units: [],
       // 柜型
@@ -132,6 +123,7 @@ export default {
 
     const voName = this.$attrs.currNode.voName;
     let oldData = { ...this.shipmentObj[voName] };
+    oldData = formatNumberString(oldData, ["issueType"]);
     this.subMaterialObj = oldData;
   },
   methods: {

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

@@ -14,7 +14,7 @@
 
     <el-row class="operate-button">
       <el-button type="primary" @click="onSubmit(1)">保存</el-button>
-      <el-button type=" success" @click="onSubmit(2)">提交</el-button>
+      <el-button type="success" @click="onSubmit(2)">提交</el-button>
       <el-button @click="cancel">关闭</el-button>
       <el-button type="danger" @click="startUnloading">开始卸柜</el-button>
     </el-row>

src/views/ecw/box/shippingSea/shippingSea.vue

@@ -68,7 +68,7 @@ export default {
       // 用户
       allUsers: [],
       // 流程图节点
-      seaBaseData: seaBaseData,
+      seaBaseData: seaBaseData(),
       // 状态
       statusLabel: "",
     };

src/views/ecw/box/shippingSea/utils.js

@@ -59,325 +59,327 @@ statusName.set(151, "未结算");
 statusName.set(152, "结算中");
 statusName.set(153, "已结算");
 
-const seaBaseData = [
-  [
-    {
-      title: "订舱",
-      imgSrc: {
-        start: require("@/assets/images/shipping/dc-start.png"),
-        end: require("@/assets/images/shipping/dc-end.png"),
+const seaBaseData = () => {
+  return [
+    [
+      {
+        title: "订舱",
+        imgSrc: {
+          start: require("@/assets/images/shipping/dc-start.png"),
+          end: require("@/assets/images/shipping/dc-end.png"),
+        },
+        type: "booking", // 类型
+        /**
+         * 订舱状态：11、未订舱；12、已订舱
+         */
+        voName: "bookSeaInfo", // 订舱对象vo
+        keyName: "bkStatus",
+        status: {
+          start: [11],
+          wait: [],
+          end: [12],
+        },
       },
-      type: "booking", // 类型
-      /**
-       * 订舱状态：11、未订舱；12、已订舱
-       */
-      voName: "bookSeaInfo", // 订舱对象vo
-      keyName: "bkStatus",
-      status: {
-        start: [11],
-        wait: [],
-        end: [12],
+    ],
+    [
+      {
+        title: "预装",
+        imgSrc: {
+          start: require("@/assets/images/shipping/yz-start.png"),
+          wait: require("@/assets/images/shipping/yz-wait.png"),
+          end: require("@/assets/images/shipping/yz-end.png"),
+        },
+        type: "preinstall",
+        /**
+         * 预装状态：21、未预装；22、预装审核中；23、预装审核失败；24、预装审核成功
+         */
+        voName: "preInstallInfo",
+        keyName: "prStatus",
+        status: {
+          start: [21],
+          wait: [22, 23],
+          end: [24],
+        },
       },
-    },
-  ],
-  [
-    {
-      title: "预装",
-      imgSrc: {
-        start: require("@/assets/images/shipping/yz-start.png"),
-        wait: require("@/assets/images/shipping/yz-wait.png"),
-        end: require("@/assets/images/shipping/yz-end.png"),
+      {
+        title: "拖车",
+        imgSrc: {
+          start: require("@/assets/images/shipping/tc-start.png"),
+          wait: require("@/assets/images/shipping/tc-wait.png"),
+          end: require("@/assets/images/shipping/tc-end.png"),
+        },
+        type: "trailer",
+        /**
+         * 拖车状态：31、未派车；32、已派车
+         */
+        voName: "trailerInfo",
+        keyName: "tlStatus",
+        status: {
+          start: [31],
+          wait: [],
+          end: [32],
+        },
       },
-      type: "preinstall",
-      /**
-       * 预装状态：21、未预装；22、预装审核中；23、预装审核失败；24、预装审核成功
-       */
-      voName: "preInstallInfo",
-      keyName: "prStatus",
-      status: {
-        start: [21],
-        wait: [22, 23],
-        end: [24],
+      {
+        title: "AGENT",
+        imgSrc: {
+          start: require("@/assets/images/shipping/agent-start.png"),
+          wait: require("@/assets/images/shipping/agent-wait.png"),
+          end: require("@/assets/images/shipping/agent-end.png"),
+        },
+        type: "agent",
+        voName: "agentInfo",
+        currStatus: "start",
       },
-    },
-    {
-      title: "拖车",
-      imgSrc: {
-        start: require("@/assets/images/shipping/tc-start.png"),
-        wait: require("@/assets/images/shipping/tc-wait.png"),
-        end: require("@/assets/images/shipping/tc-end.png"),
+    ],
+    [
+      {
+        title: "装柜",
+        imgSrc: {
+          start: require("@/assets/images/shipping/zg-start.png"),
+          wait: require("@/assets/images/shipping/zg-wait.png"),
+          end: require("@/assets/images/shipping/zg-end.png"),
+        },
+        type: "cabinet",
+        /**
+         * 装柜状态：41、未装柜；42、装柜中；43、已装柜、待封柜；44、封柜审核中；45、封柜审核失败；46、封柜审核成功
+         */
+        voName: "cabinetInfo",
+        keyName: "ldStatus",
+        status: {
+          start: [41],
+          wait: [42, 43, 44, 45],
+          end: [46],
+        },
       },
-      type: "trailer",
-      /**
-       * 拖车状态：31、未派车；32、已派车
-       */
-      voName: "trailerInfo",
-      keyName: "tlStatus",
-      status: {
-        start: [31],
-        wait: [],
-        end: [32],
+    ],
+    [
+      {
+        title: "报关",
+        imgSrc: {
+          start: require("@/assets/images/shipping/bg-start.png"),
+          wait: require("@/assets/images/shipping/bg-wait.png"),
+          end: require("@/assets/images/shipping/bg-end.png"),
+        },
+        type: "cusDeclaration",
+        voName: "customsInfo",
+        /**
+         *报关状态：51、未报关；52、报关中；53、已报关
+         */
+        keyName: "dcStatus",
+        status: {
+          start: [51],
+          wait: [52],
+          end: [53],
+        },
       },
-    },
-    {
-      title: "AGENT",
-      imgSrc: {
-        start: require("@/assets/images/shipping/agent-start.png"),
-        wait: require("@/assets/images/shipping/agent-wait.png"),
-        end: require("@/assets/images/shipping/agent-end.png"),
-      },
-      type: "agent",
-      voName: "agentInfo",
-      currStatus: "start",
-    },
-  ],
-  [
-    {
-      title: "装柜",
-      imgSrc: {
-        start: require("@/assets/images/shipping/zg-start.png"),
-        wait: require("@/assets/images/shipping/zg-wait.png"),
-        end: require("@/assets/images/shipping/zg-end.png"),
-      },
-      type: "cabinet",
-      /**
-       * 装柜状态：41、未装柜；42、装柜中；43、已装柜、待封柜；44、封柜审核中；45、封柜审核失败；46、封柜审核成功
-       */
-      voName: "cabinetInfo",
-      keyName: "ldStatus",
-      status: {
-        start: [41],
-        wait: [42, 43, 44, 45],
-        end: [46],
-      },
-    },
-  ],
-  [
-    {
-      title: "报关",
-      imgSrc: {
-        start: require("@/assets/images/shipping/bg-start.png"),
-        wait: require("@/assets/images/shipping/bg-wait.png"),
-        end: require("@/assets/images/shipping/bg-end.png"),
+      {
+        title: "配船",
+        imgSrc: {
+          start: require("@/assets/images/shipping/pc-start.png"),
+          wait: require("@/assets/images/shipping/pc-wait.png"),
+          end: require("@/assets/images/shipping/pc-end.png"),
+        },
+        type: "ship",
+        /**
+         * 配船状态：61、未配船；62、已配船
+         */
+        voName: "shipConfigInfo",
+        keyName: "saStatus",
+        status: {
+          start: [61],
+          wait: [],
+          end: [62],
+        },
       },
-      type: "cusDeclaration",
-      voName: "customsInfo",
-      /**
-       *报关状态：51、未报关；52、报关中；53、已报关
-       */
-      keyName: "dcStatus",
-      status: {
-        start: [51],
-        wait: [52],
-        end: [53],
+      {
+        title: "提单补料",
+        imgSrc: {
+          start: require("@/assets/images/shipping/tdcl-start.png"),
+          wait: require("@/assets/images/shipping/tdcl-wait.png"),
+          end: require("@/assets/images/shipping/tdcl-end.png"),
+        },
+        type: "subMaterial",
+        /**
+         * 提单补料状态：71、未提单补料；72、已提单补料
+         */
+        voName: "ladingBillInfo",
+        keyName: "blStatus",
+        status: {
+          start: [71],
+          wait: [],
+          end: [72],
+        },
       },
-    },
-    {
-      title: "配船",
-      imgSrc: {
-        start: require("@/assets/images/shipping/pc-start.png"),
-        wait: require("@/assets/images/shipping/pc-wait.png"),
-        end: require("@/assets/images/shipping/pc-end.png"),
+    ],
+    [
+      {
+        title: "驳船",
+        imgSrc: {
+          start: require("@/assets/images/shipping/bc-start.png"),
+          wait: require("@/assets/images/shipping/bc-wait.png"),
+          end: require("@/assets/images/shipping/bc-end.png"),
+        },
+        type: "barge",
+        /**
+         * 驳船状态：81、未驳船；82、已驳船
+         */
+        voName: "bargeInfo",
+        keyName: "bgStatus",
+        status: {
+          start: [81],
+          wait: [],
+          end: [82],
+        },
       },
-      type: "ship",
-      /**
-       * 配船状态：61、未配船；62、已配船
-       */
-      voName: "shipConfigInfo",
-      keyName: "saStatus",
-      status: {
-        start: [61],
-        wait: [],
-        end: [62],
+    ],
+    [
+      {
+        title: "起运",
+        imgSrc: {
+          start: require("@/assets/images/shipping/qy-start.png"),
+          wait: require("@/assets/images/shipping/qy-wait.png"),
+          end: require("@/assets/images/shipping/qy-end.png"),
+        },
+        type: "departure",
+        /**
+         * 起运状态：91、未起运；92、已起运
+         */
+        voName: "shippingInfo",
+        keyName: "dtStatus",
+        status: {
+          start: [91],
+          wait: [],
+          end: [92],
+        },
       },
-    },
-    {
-      title: "提单补料",
-      imgSrc: {
-        start: require("@/assets/images/shipping/tdcl-start.png"),
-        wait: require("@/assets/images/shipping/tdcl-wait.png"),
-        end: require("@/assets/images/shipping/tdcl-end.png"),
+    ],
+    [
+      {
+        title: "提单Copy",
+        imgSrc: {
+          start: require("@/assets/images/shipping/tdcopy-start.png"),
+          wait: require("@/assets/images/shipping/tdcopy-wait.png"),
+          end: require("@/assets/images/shipping/tdcopy-end.png"),
+        },
+        type: "blCopy",
+        /**
+         * 提单COPY状态：101、未上传；102、已上传
+         */
+        voName: "ladingCopyInfo",
+        keyName: "cpStatus",
+        status: {
+          start: [101],
+          wait: [],
+          end: [102],
+        },
       },
-      type: "subMaterial",
-      /**
-       * 提单补料状态：71、未提单补料；72、已提单补料
-       */
-      voName: "ladingBillInfo",
-      keyName: "blStatus",
-      status: {
-        start: [71],
-        wait: [],
-        end: [72],
+      {
+        type: "clrDocument",
+        imgSrc: {
+          start: require("@/assets/images/shipping/qg-start.png"),
+          wait: require("@/assets/images/shipping/qg-wait.png"),
+          end: require("@/assets/images/shipping/qg-end.png"),
+        },
+        title: "清关文件",
+        /**
+         * 清关文件状态：111、未清关文件；112、已清关文件
+         */
+        voName: "clearanceDocInfo",
+        keyName: "cdStatus",
+        status: {
+          start: [111],
+          wait: [],
+          end: [112],
+        },
       },
-    },
-  ],
-  [
-    {
-      title: "驳船",
-      imgSrc: {
-        start: require("@/assets/images/shipping/bc-start.png"),
-        wait: require("@/assets/images/shipping/bc-wait.png"),
-        end: require("@/assets/images/shipping/bc-end.png"),
+    ],
+    [
+      {
+        title: "到港",
+        imgSrc: {
+          start: require("@/assets/images/shipping/dg-start.png"),
+          wait: require("@/assets/images/shipping/dg-wait.png"),
+          end: require("@/assets/images/shipping/dg-end.png"),
+        },
+        type: "arrival",
+        /**
+         * 到港状态：121、未到港；112、已到港
+         */
+        voName: "arrivalInfo",
+        keyName: "apStatus",
+        status: {
+          start: [121],
+          wait: [],
+          end: [122],
+        },
       },
-      type: "barge",
-      /**
-       * 驳船状态：81、未驳船；82、已驳船
-       */
-      voName: "bargeInfo",
-      keyName: "bgStatus",
-      status: {
-        start: [81],
-        wait: [],
-        end: [82],
+    ],
+    [
+      {
+        title: "清关",
+        imgSrc: {
+          start: require("@/assets/images/shipping/qg-start.png"),
+          wait: require("@/assets/images/shipping/qg-wait.png"),
+          end: require("@/assets/images/shipping/qg-end.png"),
+        },
+        type: "cusClearance",
+        /**
+         * 清关状态：131、未清关；132、已清关
+         */
+        voName: "clearanceInfo",
+        keyName: "clStatus",
+        status: {
+          start: [131],
+          wait: [],
+          end: [132],
+        },
       },
-    },
-  ],
-  [
-    {
-      title: "起运",
-      imgSrc: {
-        start: require("@/assets/images/shipping/qy-start.png"),
-        wait: require("@/assets/images/shipping/qy-wait.png"),
-        end: require("@/assets/images/shipping/qy-end.png"),
+    ],
+    [
+      {
+        title: "卸柜",
+        imgSrc: {
+          start: require("@/assets/images/shipping/xg-start.png"),
+          wait: require("@/assets/images/shipping/xg-wait.png"),
+          end: require("@/assets/images/shipping/xg-end.png"),
+        },
+        type: "unloading",
+        /**
+         * 卸柜状态：141、未卸柜；142、卸柜中；143、卸柜审核中；144、卸柜审核失败；145、卸柜审核成功；146、已卸柜
+         */
+        voName: "cabinetUnloadInfo",
+        keyName: "ulStatus",
+        status: {
+          start: [141],
+          wait: [142, 143, 144, 145],
+          end: [146],
+        },
       },
-      type: "departure",
-      /**
-       * 起运状态：91、未起运；92、已起运
-       */
-      voName: "shippingInfo",
-      keyName: "dtStatus",
-      status: {
-        start: [91],
-        wait: [],
-        end: [92],
+    ],
+    [
+      {
+        title: "结算",
+        imgSrc: {
+          start: require("@/assets/images/shipping/js-start.png"),
+          wait: require("@/assets/images/shipping/js-wait.png"),
+          end: require("@/assets/images/shipping/js-end.png"),
+        },
+        type: "settlement",
+        /**
+         * 结算状态：151、未结算；152、结算中；153、已结算
+         */
+        voName: "settlementInfo",
+        keyName: "slStatus",
+        status: {
+          start: [151],
+          wait: [152],
+          end: [153],
+        },
       },
-    },
-  ],
-  [
-    {
-      title: "提单Copy",
-      imgSrc: {
-        start: require("@/assets/images/shipping/tdcopy-start.png"),
-        wait: require("@/assets/images/shipping/tdcopy-wait.png"),
-        end: require("@/assets/images/shipping/tdcopy-end.png"),
-      },
-      type: "blCopy",
-      /**
-       * 提单COPY状态：101、未上传；102、已上传
-       */
-      voName: "ladingCopyInfo",
-      keyName: "cpStatus",
-      status: {
-        start: [101],
-        wait: [],
-        end: [102],
-      },
-    },
-    {
-      type: "clrDocument",
-      imgSrc: {
-        start: require("@/assets/images/shipping/qg-start.png"),
-        wait: require("@/assets/images/shipping/qg-wait.png"),
-        end: require("@/assets/images/shipping/qg-end.png"),
-      },
-      title: "清关文件",
-      /**
-       * 清关文件状态：111、未清关文件；112、已清关文件
-       */
-      voName: "clearanceDocInfo",
-      keyName: "cdStatus",
-      status: {
-        start: [111],
-        wait: [],
-        end: [112],
-      },
-    },
-  ],
-  [
-    {
-      title: "到港",
-      imgSrc: {
-        start: require("@/assets/images/shipping/dg-start.png"),
-        wait: require("@/assets/images/shipping/dg-wait.png"),
-        end: require("@/assets/images/shipping/dg-end.png"),
-      },
-      type: "arrival",
-      /**
-       * 到港状态：121、未到港；112、已到港
-       */
-      voName: "arrivalInfo",
-      keyName: "apStatus",
-      status: {
-        start: [121],
-        wait: [],
-        end: [122],
-      },
-    },
-  ],
-  [
-    {
-      title: "清关",
-      imgSrc: {
-        start: require("@/assets/images/shipping/qg-start.png"),
-        wait: require("@/assets/images/shipping/qg-wait.png"),
-        end: require("@/assets/images/shipping/qg-end.png"),
-      },
-      type: "cusClearance",
-      /**
-       * 清关状态：131、未清关；132、已清关
-       */
-      voName: "clearanceInfo",
-      keyName: "clStatus",
-      status: {
-        start: [131],
-        wait: [],
-        end: [132],
-      },
-    },
-  ],
-  [
-    {
-      title: "卸柜",
-      imgSrc: {
-        start: require("@/assets/images/shipping/xg-start.png"),
-        wait: require("@/assets/images/shipping/xg-wait.png"),
-        end: require("@/assets/images/shipping/xg-end.png"),
-      },
-      type: "unloading",
-      /**
-       * 卸柜状态：141、未卸柜；142、卸柜中；143、卸柜审核中；144、卸柜审核失败；145、卸柜审核成功；146、已卸柜
-       */
-      voName: "cabinetUnloadInfo",
-      keyName: "ulStatus",
-      status: {
-        start: [141],
-        wait: [142, 143, 144, 145],
-        end: [146],
-      },
-    },
-  ],
-  [
-    {
-      title: "结算",
-      imgSrc: {
-        start: require("@/assets/images/shipping/js-start.png"),
-        wait: require("@/assets/images/shipping/js-wait.png"),
-        end: require("@/assets/images/shipping/js-end.png"),
-      },
-      type: "settlement",
-      /**
-       * 结算状态：151、未结算；152、结算中；153、已结算
-       */
-      voName: "settlementInfo",
-      keyName: "slStatus",
-      status: {
-        start: [151],
-        wait: [152],
-        end: [153],
-      },
-    },
-  ],
-];
+    ],
+  ];
+};
 
 const constantDict = {
   // 配船状态