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

src/api/ecw/boxAir.js

@@ -493,3 +493,18 @@ export function searchLoadOrderByBoxNo(data) {
     data: data
   });
 }
+
+/**
+ * 确认出仓
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function confirmAirCheckout(params) {
+  return request({
+    url: `/ecw/box-air-checkout/confirmAirCheckout`,
+    method: "get",
+    params
+  });
+}
\ No newline at end of file

src/views/ecw/box/shippingAir/nodePage/checkout.vue

@@ -71,16 +71,23 @@
 
     </el-form>
 
+    <!-- 开始出仓 -->
+    <el-dialog :title="$t('开始出仓')" :visible.sync="dialogVisible" fullscreen :modal-append-to-body=false append-to-body>
+      <startCheckout v-bind="$attrs" v-if="dialogVisible" v-on="$listeners" @closeDialog1="closeDialog1" />
+    </el-dialog>
+
     <el-row class="operate-button">
       <el-button type="primary" @click="onSubmit(1)">{{$t('保存')}}</el-button>
       <el-button :disabled="$attrs.shipmentObj.approvaling" type="success" @click="onSubmit(2)">{{$t('提交')}}</el-button>
       <el-button @click="cancel">{{$t('关闭')}}</el-button>
+      <el-button @click="startCheckout">{{$t('确认出仓')}}</el-button>
     </el-row>
   </div>
 </template>
 
 <script>
 import { airCheckoutCreate } from "@/api/ecw/boxSea";
+import startCheckout from "./checkout/startCheckout.vue";
 import userSelect from "./common/userSelect.vue";
 import ImageUpload from "@/components/ImageUpload";
 import { constantDict, formatDateStr, formatNumberString, serviceMsg } from "../utils";
@@ -91,7 +98,7 @@ import { constantDict, formatDateStr, formatNumberString, serviceMsg } from "../
 export default {
   name: "checkout",
   inheritAttrs: false,
-  components: { userSelect, ImageUpload },
+  components: { userSelect, ImageUpload, startCheckout },
   data() {
     return {
       // 空运出仓对象
@@ -106,6 +113,7 @@ export default {
         //deliverType: [{ required: true, message: this.$t("必填"), trigger: "change" }],
         checkoutTime: [{ required: true, message: this.$t("必填"), trigger: "change" }]
       },
+      dialogVisible: false
     };
   },
   created() {
@@ -140,6 +148,13 @@ export default {
     cancel(type) {
       this.$emit("closeDialog", type);
     },
+    /** 开始出仓 */
+    startCheckout() {
+      this.dialogVisible = true;
+    },
+    closeDialog1() {
+      this.dialogVisible = false;
+    },
   },
 };
 </script>