修复退场已入仓没有合单和菜单操作

src/views/ecw/order/index.vue

@@ -238,12 +238,7 @@
                 </template>
 
                 <!-- 合单，拆单 -->
-                <template v-if="
-                  exclude(scope.row.status, [0,2]) &&
-                  exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
-                  scope.row.shipmentState < 320 &&
-                  exclude(scope.row.inWarehouseState, [201])
-                  ">
+                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState">
                   <el-dropdown-item @click.native="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)" >{{$t('合单申请')}}</el-dropdown-item>
                   <el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)"  >{{$t('拆单申请')}}</el-dropdown-item>
                 </template>