Merge branch 'hurx'

src/views/order/orderDeliver/index.vue

@@ -346,7 +346,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: 'deliver' }
   });
 };
 

src/views/order/orderDeliver/indexProject.vue

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

src/views/order/saleOrder/index.vue

@@ -296,6 +296,7 @@ const data = reactive<PageData<OrderMainForm, OrderMainQuery>>({
     expenseType: undefined,
     status: undefined,
     checkStatus: '1',
+    currentLevelStr: '2,3',
     platformCode: undefined,
     params: {}
   },

src/views/order/saleOrder/orderAffirm.vue

@@ -413,7 +413,13 @@ const confirmOrder = async () => {
     proxy?.$modal.msgSuccess('订单确认成功');
 
     // 返回订单列表
-    router.push('/order-manage/order-list');
+    // 根据来源返回对应列表页
+    const source = route.query.source;
+    if (source === 'project') {
+      router.push('/order-manage/order-delivet-project');
+    } else {
+      router.push('/order-manage/order-deliver-list');
+    }
   } catch (error) {
     console.error('确认订单失败:', error);
     proxy?.$modal.msgError('确认订单失败，请重试');