修改

src/views/order/orderAssignment/splitAssignDialog.vue

@@ -319,7 +319,7 @@ const open = async (orderId: string | number, status: string) => {
       orderNo: res.data.orderNo,
       id: res.data.id,
       platformCode: res.data.platformCode,
-      customerName: res.data.customerName || '--',
+      customerName: res.data.customerName || res.data.assigneeName || '--',
       businessStaff: res.data.businessStaff || '--',
       productQuantity: res.data.productQuantity || 0,
 

src/views/order/orderDeliver/index.vue

@@ -81,7 +81,7 @@
               >发货</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"
@@ -110,7 +110,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 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 handleViewLogistics = (row?: OrderMainVO) => {
   if (!row?.id) {

src/views/order/orderDeliver/indexProject.vue

@@ -90,7 +90,7 @@
               >发货</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"
@@ -119,7 +119,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';
@@ -312,6 +313,20 @@ const handleCloseOrder = async (row?: OrderMainVO) => {
   await getList();
 };
 
+/** 取消订单按钮操作 */
+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 cancel = () => {
   reset();

src/views/order/saleOrder/index.vue

@@ -478,20 +478,15 @@ const handleCheck = async (row?: OrderMainVO) => {
   }
 };
 
-/** 审核按钮操作 */
+/** 取消订单按钮操作 */
 const handleCancel = async (row?: OrderMainVO) => {
-  const oldValue = row.checkStatus; // 保存旧值
-
-  // 弹出审核选择对话框
   try {
-    // 调用接口，传入用户选择的值
+    await proxy?.$modal.confirm('是否确认取消该订单？');
     await changeStatus(row.id, '7');
     getList();
     proxy?.$modal.msgSuccess('操作成功');
   } catch (error) {
-    // 用户取消或操作失败
     if (error !== 'cancel' && error !== 'close') {
-      row.checkStatus = oldValue; // 失败回滚
       proxy?.$modal.msgError('操作失败，请重试');
     }
   }

src/views/order/saleOrder/indexProject.vue

@@ -478,20 +478,15 @@ const handleCheck = async (row?: OrderMainVO) => {
   }
 };
 
-/** 审核按钮操作 */
+/** 取消订单按钮操作 */
 const handleCancel = async (row?: OrderMainVO) => {
-  const oldValue = row.checkStatus; // 保存旧值
-
-  // 弹出审核选择对话框
   try {
-    // 调用接口，传入用户选择的值
+    await proxy?.$modal.confirm('是否确认取消该订单？');
     await changeStatus(row.id, '7');
     getList();
     proxy?.$modal.msgSuccess('操作成功');
   } catch (error) {
-    // 用户取消或操作失败
     if (error !== 'cancel' && error !== 'close') {
-      row.checkStatus = oldValue; // 失败回滚
       proxy?.$modal.msgError('操作失败，请重试');
     }
   }