出货订单编辑

src/api/ecw/order.js

@@ -584,6 +584,16 @@ export function updateApply(data){
     data
   })
 }
+
+// 出货阶段的订单编辑
+export function updateShipmentApply(data){
+  return request({
+    url:'/ecw/order/shipment/update/apply',
+    method:'put',
+    data
+  })
+}
+
 export function warehousePictureList(data){
   return request({
     url:'/order/warehouse-picture/list',

src/views/ecw/order/edit.vue

@@ -668,7 +668,16 @@
 </template>
 
 <script>
-import { createOrder, updateApply, getOrderDetail, getOrderCourierNumber, orderImport, exportPackingList, getUpdateInfo } from "@/api/ecw/order";
+import {
+  createOrder,
+  updateApply,
+  getOrderDetail,
+  getOrderCourierNumber,
+  orderImport,
+  exportPackingList,
+  getUpdateInfo,
+  updateShipmentApply
+} from '@/api/ecw/order'
 import ProductSelector from '@/components/ProductSelector'
 import {getProductAttrList} from '@/api/ecw/productAttr'
 import {getChannelList} from '@/api/ecw/channel'
@@ -1661,7 +1670,8 @@ export default {
               hasConsignee: this.hasConsignee
             })
             data.type = data.type.join(',')
-            updateApply(data).then(response => {
+            const func = this.form.shipmentState > 0 ? updateShipmentApply : updateApply
+            func(data).then(response => {
                 this.$modal.msgSuccess(this.$t("修改成功"));
                 this.$router.back()
             });

src/views/ecw/order/index.vue

@@ -623,6 +623,7 @@
             <el-dropdown
               v-hasPermi="[
                 'ecw:order:edit',
+                'ecw:order:shipment:update',
                 'ecw:order:delete',
                 'ecw:order:cancel',
                 'ecw:order:fee_apply',
@@ -645,9 +646,19 @@
             >
               <el-button type="text">{{ $t("操作") }}</el-button>
               <el-dropdown-menu slot="dropdown">
-                <!-- 编辑 -->
+                <!--出货订单编辑,shipmentState > 0表示出货后，inWarehouseState == 0 表示预装未审核，或者是卸柜到仓）-->
                 <template
-                  v-if="
+                  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)) &&