Merge remote-tracking branch 'origin/master' into master

src/api/order/orderMain/types.ts

@@ -9,6 +9,8 @@ export interface OrderMainVO {
    */
   orderNo: string;
 
+  parentOrderId: string | number;
+
   /**
    * 发货单号
    */

src/views/order/saleOrder/index.vue

@@ -631,12 +631,12 @@ const getButtonsByStatus = (orderStatus: string, checkStatus: string): ActionBut
   // 待支付状态：显示查看按钮
   if (orderStatus === OrderStatus.PENDING_PAYMENT) {
     buttons.push({ label: '查看', handler: handleReview });
-    // buttons.push({ label: '确认订单', handler: handleAffirm });
+    buttons.push({ label: '确认订单', handler: handleAffirm });
   }
   // 待确认状态：显示确认订单按钮
   if (orderStatus === OrderStatus.PENDING_CONFIRM) {
     buttons.push({ label: '查看', handler: handleReview });
-    // buttons.push({ label: '确认订单', handler: handleAffirm });
+    buttons.push({ label: '确认订单', handler: handleAffirm });
   }
 
   // 待审核：显示审核按钮