取消订单

ghsApp/src/pagesOrder/detail.vue

@@ -222,9 +222,7 @@
 
 		</view>
 		<div class="app-footer">
-			<button @click="cancelOrderFn(detailInfo.cgInfo.id)" v-if="showCancelBtn && showCancelOrder(detailInfo.cgInfo)" class="admin-button-com default" :class="active">
-				取消订单
-			</button>
+			<button @click="cancelOrderFn(detailInfo)" v-if="detailInfo.status == 1" class="admin-button-com default" :class="active">取消</button>
 			<template v-for="s in detailInfo.buttonList">
 				<button :key="s.type" @click="clickBtn(s, detailInfo)" v-if="s.show == 1" :disabled="s.disable === 1" class="admin-button-com default" :class="s.disable === 1?'active':''">
 					{{ s.type === "print" ? s.name+`(${detailInfo.printNum})` : s.name}}
@@ -341,15 +339,15 @@ export default {
 		modalCancel() {
 			this.freeShipModal = false;
 		},
-		cancelOrderFn(cgId) {
+		cancelOrderFn(info) {
 			let that = this
-			that.$util.confirmModal({content:'确认取消此采购单？'},() => {
-				var params = {id:cgId}
+			that.$util.confirmModal({content:'确认取消？'},() => {
+				var params = {orderId:info.id}
 				cancelOrder(params).then((res) => {
 					if(res.code == 1){
 						this.showCancelBtn = false
 						this.detailInfo.status = 5
-						this.$msg("采购单取消成功")
+						this.$msg("取消成功")
 					}
 				}).catch((error) => {
 					console.error(error);