修改

src/views/order/orderDeliver/index.vue

@@ -76,7 +76,7 @@
           <template #default="scope">
             <el-button link type="primary" v-if="scope.row.orderStatus != '4'" @click="handleDeliver(scope.row)">发货</el-button>
             <el-button link type="primary" @click="handleReview(scope.row)">查看发货信息</el-button>
-            <el-button link type="primary">取消订单</el-button>
+            <el-button link type="primary" @click="handleCancel(scope.row)">取消订单</el-button>
             <el-button
               link
               type="primary"
@@ -106,7 +106,8 @@ import {
   addOrderMain,
   updateOrderMain,
   queryOrderStatusStats,
-  closeOrderMain
+  closeOrderMain,
+  changeStatus
 } from '@/api/order/orderMain';
 import { OrderMainVO, OrderMainQuery, OrderMainForm } from '@/api/order/orderMain/types';
 import DeliverDialog from '../saleOrder/deliverDialog.vue';
@@ -275,6 +276,20 @@ const queryOrderStatusStatsMethod = async () => {
   orderStatusStats.value = res as any;
 };
 
+/** 取消订单按钮操作 */
+const handleCancel = async (row?: OrderMainVO) => {
+  try {
+    await proxy?.$modal.confirm('是否确认取消该订单？');
+    await changeStatus(row.id, '7');
+    getList();
+    proxy?.$modal.msgSuccess('操作成功');
+  } catch (error) {
+    if (error !== 'cancel' && error !== 'close') {
+      proxy?.$modal.msgError('操作失败，请重试');
+    }
+  }
+};
+
 /** 查看物流按钮操作 */
 const handleViewLogistics = (row?: OrderMainVO) => {
   if (!row?.id) {

src/views/order/orderDeliver/indexProject.vue

@@ -85,7 +85,7 @@
           <template #default="scope">
             <el-button link type="primary" v-if="scope.row.orderStatus != '4'" @click="handleDeliver(scope.row)">发货</el-button>
             <el-button link type="primary" @click="handleReview(scope.row)">查看发货信息</el-button>
-            <el-button link type="primary">取消订单</el-button>
+            <el-button link type="primary" @click="handleCancel(scope.row)">取消订单</el-button>
             <el-button
               link
               type="primary"
@@ -115,7 +115,8 @@ import {
   addOrderMain,
   updateOrderMain,
   queryOrderStatusStats,
-  closeOrderMain
+  closeOrderMain,
+  changeStatus
 } from '@/api/order/orderMain';
 import { getOrderMainCrrcExt } from '@/api/order/orderMainCrrcExt';
 import { OrderMainVO, OrderMainQuery, OrderMainForm } from '@/api/order/orderMain/types';
@@ -283,6 +284,20 @@ const getList = async () => {
   queryOrderStatusStatsMethod();
 };
 
+/** 取消订单按钮操作 */
+const handleCancel = async (row?: OrderMainVO) => {
+  try {
+    await proxy?.$modal.confirm('是否确认取消该订单？');
+    await changeStatus(row.id, '7');
+    getList();
+    proxy?.$modal.msgSuccess('操作成功');
+  } catch (error) {
+    if (error !== 'cancel' && error !== 'close') {
+      proxy?.$modal.msgError('操作失败，请重试');
+    }
+  }
+};
+
 // 批量获取平台订单号
 const fetchCrrcOrderNos = async (rows: OrderMainVO[]) => {
   const results = await Promise.allSettled(

src/views/order/saleOrder/index.vue

@@ -513,19 +513,17 @@ const handleCheck = async (row?: OrderMainVO) => {
   }
 };
 
-/** 审核按钮操作 */
+/** 取消订单按钮操作 */
 const handleCancel = async (row?: OrderMainVO) => {
-  const oldValue = row.orderStatus; // 保存旧值
-  await proxy?.$modal.confirm('是否确认取消订单编号【' + row.orderNo + '】的订单吗？').finally(() => (loading.value = false));
-  //todo 发送
   try {
-    // 调用接口，传入用户选择的值
+    await proxy?.$modal.confirm('是否确认取消该订单？');
     await changeStatus(row.id, '7');
     getList();
     proxy?.$modal.msgSuccess('操作成功');
-  } catch (e) {
-    // 恢复旧值
-    row.orderStatus = oldValue;
+  } catch (error) {
+    if (error !== 'cancel' && error !== 'close') {
+      proxy?.$modal.msgError('操作失败，请重试');
+    }
   }
 };