diff --git a/src/api/shopOrder/shopOrder.js b/src/api/shopOrder/shopOrder.js
index f46559b..d9515f3 100644
--- a/src/api/shopOrder/shopOrder.js
+++ b/src/api/shopOrder/shopOrder.js
@@ -43,3 +43,7 @@ export const getShopOrderDetail = data => createAPI(`/shopOrder/getShopOrderDeta
 export const getOrderInfo = data => createAPI(`/shopOrder/getOrderInfo`,'post',data)
 // 获取 shoporder sap sobom 信息
 export const getShopOrderSapSOBOM = data => createAPI(`/shopOrder/getShopOrderSapSOBOM`,'post',data)
+
+//取消shopOrder
+export const cancelShopOrderBun = data => createAPI(`/shopOrder/cancelShopOrderBun`,'post',data)
+
diff --git a/src/views/modules/shopOrder/shopOrder/shopOrder.vue b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
index 1c8696f..fb4ef7c 100644
--- a/src/views/modules/shopOrder/shopOrder/shopOrder.vue
+++ b/src/views/modules/shopOrder/shopOrder/shopOrder.vue
@@ -37,6 +37,8 @@
           <el-button @click="deleteData" type="primary" style="margin-left: 2px;margin-top: 0px">{{ '删除' }}</el-button>
           <el-button @click="printOrder()" type="primary" style="margin-left: 2px;margin-top: 0px">{{ '打印' }}
           </el-button>
+          <el-button @click="warnCancelOrderConfirm()" type="primary" style="margin-left: 2px;margin-top: 0px">{{ '取消' }}
+          </el-button>
         </el-form>
         <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 10px;">
           <el-form-item :label="'订单类型：'">
@@ -475,7 +477,8 @@ import {
   saveShopOrderData,
   getShopOrderDetail,
   getOrderInfo,
-  getShopOrderSapSOBOM
+  getShopOrderSapSOBOM,
+  cancelShopOrderBun,
 } from "@/api/shopOrder/shopOrder.js"
 import Chooselist from '@/views/modules/common/Chooselist'
 
@@ -1865,6 +1868,37 @@ export default {
         console.log("操作成功！")
       }
     },
+
+    //提示是否取消订单
+    warnCancelOrderConfirm() {
+      //判断是否存在订单
+      if (!this.modelData.orderNo) {
+        return this.$message.warning('请先选择订单')
+      }
+      //
+      this.$confirm('确实要取消该生产订单吗?', '提示', {
+        confirmButtonText: '确认',
+        celButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        //执行重新打开sfdcRolls记录的操作
+        this.cancelShopOrder();
+      });
+    },
+
+    /*执行取消工单的操作*/
+    cancelShopOrder(){
+      //组合数据
+      cancelShopOrderBun(this.modelData).then(({data}) => {
+        //判断是否成功
+        if(data.code == 200){
+          this.$message.success(data.msg);
+        }else{
+          this.$message.error(data.msg);
+        }
+      })
+    },
+
     getBaseData(val) {
       if (this.tagNo === 16) {
         this.updateData.orderType = val.OrderType