Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/order/index.vue

@@ -185,16 +185,13 @@
               <el-dropdown-menu slot="dropdown">
                 <!-- 编辑 -->
                 <template v-if="
-                  exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
-                  exclude(scope.row.status, [20,21]) &&
-                  exclude(scope.row.shipmentState, [320,322,323]) &&
-                  exclude(scope.row.inWarehouseState, [ 212, 218, 213, 214, 215])
+                  ( scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314) ) && !scope.row.abnormalState
                   ">
                   <el-dropdown-item @click.native="handleUpdate(scope.row)" v-hasPermi="['ecw:order:update']" >{{$t('编辑')}}</el-dropdown-item>
                 </template>
 
                 <!-- 删除 -->
-                <template v-if="include(scope.row.status, [0,2])">
+                <template v-if="include(scope.row.status, [0,2, 88])">
                   <el-dropdown-item @click.native="oprateOrder(scope.row.orderId, 'deleteOrder')" v-hasPermi="['ecw:order:delete']" >{{$t('删除')}}</el-dropdown-item>
                 </template>
 
@@ -208,15 +205,14 @@
 
                 <!-- 费用申请 -->
                 <template v-if="
-                  exclude(scope.row.status, [0]) &&
-                  exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14])
+                  exclude(scope.row.status, [0, 88]) && !scope.row.abnormalState
                   ">
                   <el-dropdown-item @click.native="feeApplicationBol = true; orderId = scope.row.orderId"  >{{$t('费用申请')}}</el-dropdown-item>
                 </template>
 
                 <!-- 特需,互斥，关联 -->
                 <template v-if="
-                  exclude(scope.row.status, [0]) &&
+                  include(scope.row.status, [2,3,5,8,9,10]) &&
                   exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
                   exclude(scope.row.inWarehouseState, [204])
                   ">
@@ -235,10 +231,8 @@
 
                 <!-- 确认提货 -->
                 <template v-if="
-                  exclude(scope.row.status, [0,2]) &&
-                  exclude(scope.row.abnormalState, [1 ,99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14]) &&
-                  exclude(scope.row.shipmentState, [320,322,323]) &&
-                  exclude(scope.row.inWarehouseState, [201])
+                  scope.row.status >= 5 &&
+                  !scope.row.abnormalState
                   ">
                   <el-dropdown-item @click.native="$router.push(`/order/release?orderId=${scope.row.orderId}`)" >{{$t('确认提货')}}</el-dropdown-item>
                 </template>
@@ -255,7 +249,7 @@
                 </template>
 
                 <!-- 合单日志，提货日志 -->
-                <template v-if="scope.row.status > 2">
+                <template v-if="scope.row.status >= 5 && scope.row.status < 12 && !scope.row.abnormalState || (scope.row.status == 12 && scope.row.shipmentState == 314) ">
                   <el-dropdown-item @click.native="showMergedLogOrderNo=scope.row.orderNo" >{{$t('合单日志')}}</el-dropdown-item>
                   <el-dropdown-item @click.native="showPickupLogOrderNo=scope.row.orderNo" >{{$t('提货日志')}}</el-dropdown-item>
                 </template>