合包

src/api/ecw/boxAir.js

@@ -69,4 +69,34 @@ export function createGoods(data) {
     method: "post",
     data,
   });
+}
+
+/**
+ * 获得获得合包箱分页
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function getMergePkgList(params) {
+  return request({
+    url: "/ecw/box-merge-pkg/pager",
+    method: "get",
+    params,
+  });
+}
+
+/**
+ * 创建合包箱
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function createMergePkg(data) {
+  return request({
+    url: "/ecw/box-merge-pkg/create",
+    method: "post",
+    data,
+  });
 }
\ No newline at end of file

src/views/ecw/box/shippingAir/nodePage/mergePkg/index.vue

+<template>
+  <div>
+    <!-- 信息 -->
+    <el-card style="margin-top: 15px">
+      <el-descriptions :column="5" border>
+        <el-descriptions-item :label="$t('自编号')">{{ shipmentObj.selfNo }}</el-descriptions-item>
+        <el-descriptions-item :label="$t('运输方式')">
+          <dict-tag :type="DICT_TYPE.ECW_TRANSPORT_TYPE" :value="shipmentObj.transportType" />
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('始发地')">
+          {{ importCityName(shipmentObj.startWarehouseId) }}
+        </el-descriptions-item>
+        <el-descriptions-item :label="$t('目的地')">
+          {{ importCityName(shipmentObj.destWarehouseId) }}
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { getMergePkgList, createMergePkg } from "@/api/ecw/boxAir"
+export default {
+  data() {
+    return {
+      // 出货信息
+      shipmentObj: this.$attrs.shipmentObj
+    }
+  },
+  created() {
+    console.log(this.$attrs)
+  },
+  methods: {
+    /* 获取仓库 */
+    importCityName(id) {
+      var arr = this.$attrs.warehouseList.filter((item) => item.id == id)
+      return arr.length > 0 ? this.$l(arr[0], 'title') : '/'
+    }
+  }
+}
+</script>
+
+<style>
+</style>
\ No newline at end of file

src/views/ecw/box/shippingAir/seaProcess.vue

@@ -46,6 +46,7 @@ import unloadingWidget from "./nodePage/unloading/index.vue";
 import settlementWidget from "./nodePage/settlement.vue";
 import reviewWidget from "./nodePage/review.vue";
 import tallyWidget from "./nodePage/tally/index.vue";
+import mergePkgWidget from "./nodePage/mergePkg/index.vue";
 import {checkPermi} from '@/utils/permission'
 
 /**
@@ -75,6 +76,7 @@ export default {
     settlementWidget,
     reviewWidget,
     tallyWidget,
+    mergePkgWidget
   },
   props: {
     shipmentObj: Object,
@@ -133,7 +135,7 @@ export default {
     },
     /** 节点点击 */
     nodeClick(currIndex, node) {
-      if (!checkPermi(['box:'+node.type+':show'])) {
+      if (!checkPermi(['box:'+node.type+':action'])) {
         this.$message.error(this.$t("没有此操作的权限"));
         return;
       }
@@ -149,8 +151,12 @@ export default {
       switch (node.type) {
         // 订舱
         case "booking":
-        // 驳船
-        case "barge":
+          break;
+        // 合包
+        case "mergePkg":
+          this.$set(this.dialogConfig, "fullscreen", true);
+          this.$set(this.dialogConfig, "title", this.$t("合包列表"));
+          break;
         // 清关文件
         case "clrDocument":
           this.$set(this.dialogConfig, "width", "700px");

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

@@ -78,21 +78,21 @@ function airBaseData() {
       {
         title: i18n.$t("合包"),
         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"),
+          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: "trailer",
+        type: "mergePkg",
         dataKey: "3", // 字典数据键值
         /**
-         * 拖车状态：31、未派车；32、已派车
+         * 合包状态：161待合包   162已合包
          */
         voName: "trailerInfo",
-        keyName: "tlStatus",
+        keyName: "mergePkgStatus",
         status: {
-          start: [31],
+          start: [161],
           wait: [],
-          end: [32],
+          end: [162],
         },
       },
     ],