diff --git a/src/api/shipment/index.js b/src/api/shipment/index.js
index 3614675..7368d81 100644
--- a/src/api/shipment/index.js
+++ b/src/api/shipment/index.js
@@ -7,3 +7,4 @@ export const getShipmentPage = (data) => createAPI( `/shipment/list/${data.no}/$
 export const printShipment = (data)=>createAPI('/shipment/print','post',data)
 
 export const endShipment = (data) => createAPI( `/shipment/end`,'post',data)
+export const cancelShipment = (data) => createAPI( `/shipment/cancel`,'post',data)
diff --git a/src/views/modules/finshProduct/outWarehouse.vue b/src/views/modules/finshProduct/outWarehouse.vue
index 7a37668..8964d88 100644
--- a/src/views/modules/finshProduct/outWarehouse.vue
+++ b/src/views/modules/finshProduct/outWarehouse.vue
@@ -1,6 +1,6 @@
 <script>
 import OutWarehouseDetail from './outWarehouse/outWarehouseDetail.vue'
-import {getShipmentPage, printShipment} from '../../../api/shipment'
+import {cancelShipment, getShipmentPage, printShipment} from '../../../api/shipment'
 import {getShipmentDetailList} from '../../../api/shipment/detail'
 import ShipmentBox from './outWarehouse/shipmentBox.vue'
 import {addShipmentBox, getShipmentBoxList} from '../../../api/shipment/box'
@@ -351,6 +351,22 @@ export default {
         this.$message.error(error)
       })
     },
+    handleCancel(row){
+      let params = {
+        shipmentId: row.shipmentId,
+        site:this.$store.state.user.site,
+      }
+      cancelShipment(params).then(({data})=>{
+        if (data && data.code === 0){
+          this.$message.success(data.msg)
+          this.getDataList()
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+    },
     handleQueryRoll(row){
       getShipmentRollDataByShipmentId(row).then(({data})=>{
         if (data && data.code === 0){
@@ -444,10 +460,11 @@ export default {
       </el-form>
     </div>
     <el-table :data="dataList" v-loading="loading" border :height="height" @row-click="handleRowClick" :row-style="rowStyle">
-      <el-table-column align="center" header-align="center" label="操作" width="150">
+      <el-table-column align="center" header-align="center" label="操作" width="180">
         <template slot-scope="scope">
           <el-link  v-if="scope.row.createDate" @click="handlePrint(scope.row)">装箱单标签</el-link>
-          <el-link  v-else  @click="handleOutWarehouse(scope.row)">装箱出库</el-link>
+          <el-link  v-if="scope.row.createDate" @click="handleCancel(scope.row)">取消出库</el-link>
+          <el-link  v-if="!scope.row.createDate"  @click="handleOutWarehouse(scope.row)">装箱出库</el-link>
           <el-link @click="handleQueryRoll(scope.row)">卷明细</el-link>
         </template>
       </el-table-column>