Commit c8e9cd65 authored by zhengyi's avatar zhengyi

订单编辑不受订单异常状态影响

parent 7842f808
...@@ -340,7 +340,7 @@ ...@@ -340,7 +340,7 @@
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<!--出货订单编辑,shipmentState > 0表示出货后,inWarehouseState == 0 表示预装未审核或者是卸柜到仓 , shipmentState==307 表示已预装,待封柜, shipmentState==407 表示已预装,待封柜)--> <!--出货订单编辑,shipmentState > 0表示出货后,inWarehouseState == 0 表示预装未审核或者是卸柜到仓 , shipmentState==307 表示已预装,待封柜, shipmentState==407 表示已预装,待封柜)-->
<template <template
v-if="scope.row.abnormalState == 0 && scope.row.shipmentState > 0 && v-if="scope.row.shipmentState > 0 &&
scope.row.inWarehouseState == 0 && scope.row.inWarehouseState == 0 &&
exclude(scope.row.auditType, [1, 2, 3, 4, 5, 6, 11, 23, 28, 31, 32]) && 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])" exclude(scope.row.shipmentState, [305, 307, 309, 310, 311, 313, 407,409,411])"
...@@ -357,7 +357,6 @@ ...@@ -357,7 +357,6 @@
(scope.row.status < 12 || (scope.row.status < 12 ||
(scope.row.status == 12 && (scope.row.status == 12 &&
scope.row.shipmentState == 314)) && scope.row.shipmentState == 314)) &&
!scope.row.abnormalState &&
exclude(scope.row.auditType, [1, 2, 3, 4, 5, 6, 11, 23, 28, 31, 32]) && exclude(scope.row.auditType, [1, 2, 3, 4, 5, 6, 11, 23, 28, 31, 32]) &&
exclude(scope.row.inWarehouseState, [204, 205, 206]) && exclude(scope.row.inWarehouseState, [204, 205, 206]) &&
exclude(scope.row.shipmentState, [305, 307, 407]) exclude(scope.row.shipmentState, [305, 307, 407])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment