修复合包完成

src/api/ecw/boxAir.js

@@ -253,6 +253,20 @@ export function getMergeTagById(id) {
   });
 }
 
+/**
+ * 完成合包
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function finishMergePkg(shipmentId) {
+  return request({
+    url: "/ecw/box-merge-pkg/finishMergePkg?shipmentId="+shipmentId,
+    method: "get"
+  });
+}
+
 /*****************************  合包 end **********************************/
 
 

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

@@ -124,7 +124,7 @@
 </template>
 
 <script>
-import { getMergePkgList, createMergePkg, updateMergePkg, deleteMergePkg, getMergeTagById } from '@/api/ecw/boxAir'
+import { getMergePkgList, createMergePkg, updateMergePkg, deleteMergePkg, getMergeTagById, finishMergePkg } from '@/api/ecw/boxAir'
 import { formatDate, serviceMsg } from '../../utils'
 import unPkgPage from './unPkgPage.vue'
 import PkgPage from './pkgPage.vue'
@@ -250,7 +250,13 @@ export default {
       this.getList()
       this.pkgPagedialogVisible = false
     },
-    finish() {}
+    finish() {
+      finishMergePkg(this.$attrs.shipmentObj.id).then((res) => {
+        serviceMsg(res, this).then(() => {
+          this.$emit("closeDialog", "submit");
+        });
+      });
+    }
   }
 }
 </script>