hurx 3 روز پیش
والد
کامیت
4fdbea4776
3فایلهای تغییر یافته به همراه10 افزوده شده و 4 حذف شده
  1. 1 1
      src/views/order/saleOrder/index.vue
  2. 7 1
      src/views/order/saleOrder/orderAffirm.vue
  3. 2 2
      src/views/order/saleOrder/sendDetail.vue

+ 1 - 1
src/views/order/saleOrder/index.vue

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

+ 7 - 1
src/views/order/saleOrder/orderAffirm.vue

@@ -538,7 +538,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('确认订单失败,请重试');

+ 2 - 2
src/views/order/saleOrder/sendDetail.vue

@@ -8,9 +8,9 @@
         <el-descriptions-item label="项目/平台订单号">{{ 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>