入仓修改与入仓补充按钮屏蔽逻辑的修正

src/views/ecw/order/index.vue

@@ -474,12 +474,12 @@
                 <el-button type="text">{{ $t("仓库") }}</el-button>
                 <el-dropdown-menu slot="dropdown">
                   <!-- 入仓操作 -->
-                  <template v-if="include(scope.row.status, [0, 2]) || scope.row.inWarehouseState == 208">
+                  <template v-if="(include(scope.row.status, [0, 2]) || scope.row.inWarehouseState == 208)">
                     <el-dropdown-item @click.native="$router.push('/order/warehousing?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:warehouse_add']">{{ $t("入仓操作") }}</el-dropdown-item>
                   </template>
                   <!-- 入仓补充 -->
                   <template
-                    v-if="scope.row.shipmentState > 0 && scope.row.inWarehouseState == 0"
+                    v-if="scope.row.shipmentState > 0 && scope.row.inWarehouseState == 0 && scope.row.shipmentState != 307 && scope.row.shipmentState != 407"
                   >
                     <el-dropdown-item
                       @click.native="$router.push('/order/warehousing-add?shipment=1&id=' + scope.row.orderId)"
@@ -492,7 +492,7 @@
                       include(
                         scope.row.inWarehouseState,
                         [201, 202, 202, 210, 202, 211, 202, 214, 215, 216]
-                      ) && include(scope.row.status, [2, 3, 5, 10, 9, 8])
+                      ) && include(scope.row.status, [2, 3, 5, 10, 9, 8] && include(scope.row.airShipment, [0, 1]))
                     "
                   >
                     <el-dropdown-item
@@ -507,7 +507,7 @@
                   </template>
                   <!-- 入仓修改 -->
                   <template
-                    v-if="scope.row.shipmentState > 0 && scope.row.inWarehouseState == 0"
+                    v-if="scope.row.shipmentState > 0 && scope.row.inWarehouseState == 0 && scope.row.shipmentState != 307 && scope.row.shipmentState != 407"
                   >
                     <el-dropdown-item
                       @click.native="$router.push('/order/warehousing-update?shipment=1&id=' + scope.row.orderId)"
@@ -525,7 +525,7 @@
                         ]
                       ) &&
                       scope.row.status != 11 &&
-                      exclude(scope.row.shipmentState, [305, 307, 407])
+                      exclude(scope.row.shipmentState, [305, 307, 407]) && include(scope.row.airShipment, [0, 1])
                     "
                   >
                     <el-dropdown-item