Merge branch 'master-fix'

src/views/ecw/order/index.vue

@@ -340,7 +340,7 @@
               <el-dropdown-menu slot="dropdown">
                 <!--出货订单编辑,shipmentState > 0表示出货后，inWarehouseState == 0 表示预装未审核或者是卸柜到仓 ， shipmentState==307 表示已预装，待封柜， shipmentState==407 表示已预装，待封柜）-->
                 <template
-                  v-if="scope.row.shipmentState > 0 &&
+                  v-if="(scope.row.shipmentState > 0 || scope.row.status == 16) &&
                   scope.row.inWarehouseState == 0  &&
                   exclude(scope.row.auditType, [1, 2, 3, 4, 5, 6, 11, 23, 28, 31, 32])  &&
                   exclude(scope.row.shipmentState, [305, 307, 309, 310, 311, 313, 407,409,411])"