空运可出后不显示拆单和合单

src/views/ecw/order/index.vue

@@ -343,9 +343,17 @@
                 </template>
 
                 <!-- 合单，拆单 -->
-                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status > 3 && exclude(scope.row.inWarehouseState, [204,205,206,212,213])">
+								<!--可出后不显示拆单（经确认合单也不显示） https://zentao.test.jdshangmen.com/bug-view-5322.html-->
+                <template
+                  v-if=" ([3,4].indexOf(scope.row.transportId) < 0 || scope.row.airShipment < 2) &&
+                  (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314))
+                  && !scope.row.abnormalState && scope.row.status > 3
+                  && exclude(scope.row.inWarehouseState, [204,205,206,212,213])">
                   <el-dropdown-item @click.native="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)"  v-hasPermi="['ecw:order:merge']">{{$t('合单申请')}}</el-dropdown-item>
-                  <el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)"   v-hasPermi="['ecw:order:split']">{{$t('拆单申请')}}</el-dropdown-item>
+
+                  <el-dropdown-item
+                    @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)"
+                    v-hasPermi="['ecw:order:split']">{{$t('拆单申请')}}</el-dropdown-item>
                 </template>
 
                 <!--撤销拆单，拆单的子订单,预装前显示，预装后变灰不可点击-->