修改

src/views/order/orderDeliver/index.vue

@@ -307,7 +307,7 @@ const queryOrderStatusStatsMethod = async () => {
 const handleAffirm = (row?: OrderMainVO) => {
   router.push({
     path: '/order-manage/order-affirm',
-    query: { id: row.id }
+    query: { id: row.id, source: 'deliver' }
   });
 };
 

src/views/order/saleOrder/orderAffirm.vue

@@ -8,7 +8,7 @@
     </el-card>
 
     <!-- 订单基本信息 -->
-    <el-card shadow="never" class="mb-2">
+    <!-- <el-card shadow="never" class="mb-2">
       <template #header>
         <div class="card-header">
           <span>订单基本信息</span>
@@ -17,7 +17,7 @@
       </template>
 
       <el-form ref="orderMainFormRef" :model="orderInfo" label-width="100px">
-        <!-- <el-row :gutter="20">
+        <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="归属公司">
               <el-input :value="orderInfo.companyName || orderInfo.companyId" disabled />
@@ -114,7 +114,7 @@
               <el-input :value="orderInfo.userDeptName || orderInfo.userDept" disabled />
             </el-form-item>
           </el-col>
-        </el-row> -->
+        </el-row>
 
         <el-row :gutter="20">
           <el-col :span="24">
@@ -132,7 +132,7 @@
           </el-col>
         </el-row>
       </el-form>
-    </el-card>
+    </el-card> -->
 
     <!-- 收货地址 -->
     <el-card shadow="never" class="mb-2" v-if="!orderInfo.dataSource">
@@ -532,7 +532,13 @@ const confirmOrder = async () => {
     proxy?.$modal.msgSuccess('订单确认成功');
 
     // 返回订单列表
-    router.push('/order-manage/order-list');
+    // 根据来源返回对应列表页
+    const source = route.query.source;
+    if (source === 'list') {
+      router.push('/order-manage/order-list');
+    } else {
+      router.push('/order-manage/order-deliver-list');
+    }
   } catch (error) {
     console.error('确认订单失败:', error);
     proxy?.$modal.msgError('确认订单失败，请重试');

src/views/order/saleOrder/sendDetail.vue

@@ -8,9 +8,9 @@
         <el-descriptions-item label="项目/平台订单号" v-if="crrcExtInfo.crrcOrderNo">{{ crrcExtInfo.crrcOrderNo }}</el-descriptions-item>
         <el-descriptions-item label="发货单编号">{{ orderDetail.shipmentNo }}</el-descriptions-item>
         <el-descriptions-item label="订单总金额">{{ orderDetail.totalAmount }}</el-descriptions-item>
-        <el-descriptions-item label="支付状态">
+        <!-- <el-descriptions-item label="支付状态">
           <dict-tag :options="payment_status" :value="orderDetail.paymentStatus" />
-        </el-descriptions-item>
+        </el-descriptions-item> -->
         <el-descriptions-item label="订单状态">
           <dict-tag :options="order_status" :value="orderDetail.orderStatus" />
         </el-descriptions-item>