6

src/views/ecw/order/index.vue

@@ -327,9 +327,32 @@
             >
               <el-button type="text">{{ $t("操作") }}</el-button>
               <el-dropdown-menu slot="dropdown">
-                <!-- 编辑 -->
-                <template v-if="(scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && exclude(scope.row.inWarehouseState, [204, 205, 206]) && exclude(scope.row.shipmentState, [307, 407])">
-                  <el-dropdown-item @click.native="handleUpdate(scope.row)" v-hasPermi="['ecw:order:edit']">{{ $t("编辑") }}</el-dropdown-item>
+                <!--出货订单编辑,shipmentState > 0表示出货后，inWarehouseState == 0 表示预装未审核，或者是卸柜到仓）-->
+                <template
+                  v-if="scope.row.shipmentState > 0 && scope.row.inWarehouseState == 0"
+                >
+                  <el-dropdown-item
+                    @click.native="handleUpdate(scope.row)"
+                    v-hasPermi="['ecw:order:shipment:update']"
+                  >{{ $t("编辑") }}</el-dropdown-item
+                  >
+                </template>
+                <!-- 其他编辑 -->
+                <template
+                  v-else-if="
+                    (scope.row.status < 12 ||
+                      (scope.row.status == 12 &&
+                        scope.row.shipmentState == 314)) &&
+                    !scope.row.abnormalState &&
+                    exclude(scope.row.inWarehouseState, [204, 205, 206]) &&
+                    exclude(scope.row.shipmentState, [307, 407])
+                  "
+                >
+                  <el-dropdown-item
+                    @click.native="handleUpdate(scope.row)"
+                    v-hasPermi="['ecw:order:edit']"
+                    >{{ $t("编辑") }}</el-dropdown-item
+                  >
                 </template>
 
                 <!-- 删除 -->