分拣后不显示不可出

src/api/ecw/box.js

@@ -143,6 +143,15 @@ export function makeBillService(params) {
   });
 }
 
+// 空运制作提单
+export function makeAirBillService(params) {
+  return request({
+    url: "/shipment/make-bill-of-lading/airMake",
+    method: "get",
+    params,
+  });
+}
+
 // 创建制作提货单
 export function createBillService(data) {
   return request({

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

@@ -111,7 +111,7 @@ import {
   getMakeBillList,
   makeBillService,
   getBillService,
-  deleteBillService, zipDownload, downloadReceivableList,
+  deleteBillService, zipDownload, downloadReceivableList, makeAirBillService, downloadAirReceivableList,
 } from "@/api/ecw/box";
 import {
   getTotlContent,
@@ -225,7 +225,8 @@ export default {
           );
           return;
         case "downloadReceivableList":
-          downloadReceivableList({ shipmentId: this.shipmentObj.id }).then(res => {
+          const api = this.type == 'air' ? downloadAirReceivableList : downloadReceivableList;
+          api({ shipmentId: this.shipmentObj.id }).then(res => {
             this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
           })
           return;
@@ -236,7 +237,8 @@ export default {
       this.$set(this.dialogCfg, "visible", true);
     },
     makeBill(row) {
-      makeBillService({
+      let api = this.type != 'air' ? makeBillService : makeAirBillService;
+      api({
         orderId: row.orderId,
         shipmentId: this.shipmentObj.id,
       }).then((res) => {

src/views/ecw/order/index.vue

@@ -373,7 +373,7 @@
                 </template>
 
                 <!--不可出-->
-                <template  v-if="include(scope.row.airShipment, [2,3,4])">
+                <template  v-if="include(scope.row.airShipment, [2,3,4]) && scope.row.status < 11">
                   <el-dropdown-item @click.native="setCanNotShipment(scope.row)"  v-hasPermi="['ecw:order:setCanNotShipment']">{{$t('不可出')}}</el-dropdown-item>
                 </template>
               </el-dropdown-menu>