强制取消

hdPad/src/api/order/index.js

@@ -1,5 +1,9 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+export const cancelOrderFn = data => {
+	return https.get("/order/cancel", data);
+};
+
 export const onlinePrintOrder = data => {
 	return https.get("/order/print-order", data);
 };

hdPad/src/pages/home/components/orderInfo.vue

@@ -72,7 +72,7 @@
       <view :class="[orderInfo.status==1 || orderInfo.status==5 ? '' : 'active']" @click="printFn(orderInfo)">打印</view>
       <view :class="[orderInfo.status==1 ? 'active' : '']" @click="selectFn(orderInfo,0)">查微信</view>
       <view :class="[orderInfo.status==1 ? 'active' : '']" @click="selectFn(orderInfo,1)">查支付宝</view>
-      <view :class="[orderInfo.status==1 ? 'active' : '']" @click="cancelFn(orderInfo)">取消</view>
+      <view :class="[orderInfo.status==1 ? 'active' : '']" @click="cancelShow()">取消</view>
     </view>
 
     <!-- 选数量金额 -->
@@ -81,7 +81,7 @@
         @cancelWastageSelectNum="cancelWastageSelectNum"></wastageSelectNum>
     </uni-popup>
 
-    <uni-popup ref="cancelWorkRef" type="dialog">
+    <uni-popup ref="cancelOrderRef" type="dialog">
         <uni-popup-dialog type="info" cancelText="取消" confirmText="确认" title="提示" content="确认取消？" @confirm="confirmCancel"></uni-popup-dialog>
     </uni-popup>
 
@@ -101,7 +101,7 @@ import { getDetail,onlinePrintOrder } from '@/api/order'
 import wastageSelectNum from './wastageSelectNum.vue'
 import { mapGetters } from "vuex";
 import productMins from "@/mixins/product";
-import { codePayCheck} from "@/api/order/index";
+import { codePayCheck,cancelOrderFn} from "@/api/order";
 export default {
 	name: "workInfo",
 	components: {wastageSelectNum},
@@ -158,9 +158,6 @@ export default {
   methods:{
     confirmLock(){
 
-    },
-    confirmCancel(){
-
     },
     confirmWastageSelectNum(){
 
@@ -213,7 +210,20 @@ export default {
         }
       })
     },
-    cancelFn(){
+    cancelShow(){
+			this.$util.hitVoice()
+			this.$refs.cancelOrderRef.open()
+    },
+    confirmCancel(order){
+      let that = this
+      cancelOrderFn({id:that.orderInfo.id}).then(res=>{
+        if(res.code == 1){
+          that.$msg('操作成功')
+          setTimeout(function(){
+              that.getOrderDetail(that.orderInfo.id)
+          },1500)
+        }
+      })
     },
     selectFn(order,payWay){
       let that = this