hurx 1 өдөр өмнө
parent
commit
2059abb118

+ 2 - 0
src/api/order/orderMain/types.ts

@@ -817,6 +817,8 @@ export interface OrderMainQuery extends PageQuery {
 
   assigneeType?: string;
 
+  projectOrderNo?: string;
+
   /**
    * 日期范围参数
    */

+ 4 - 1
src/views/order/orderAssignment/indexProject.vue

@@ -3,10 +3,13 @@
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="120px">
             <el-form-item label="订单编号" prop="orderNo">
               <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <el-form-item label="平台/项目订单号" prop="projectOrderNo">
+              <el-input v-model="queryParams.projectOrderNo" placeholder="请输入平台/项目订单号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
             <el-form-item label="客户编号" prop="customerCode">
               <el-input v-model="queryParams.customerCode" placeholder="请输入客户编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>

+ 25 - 1
src/views/order/saleOrder/indexProject.vue

@@ -3,10 +3,13 @@
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
       <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="120px">
             <el-form-item label="订单编号" prop="orderNo">
               <el-input v-model="queryParams.orderNo" placeholder="请输入订单编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
+            <el-form-item label="平台/项目订单号" prop="projectOrderNo">
+              <el-input v-model="queryParams.projectOrderNo" placeholder="请输入平台/项目订单号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
             <el-form-item label="客户编号" prop="customerCode">
               <el-input v-model="queryParams.customerCode" placeholder="请输入客户编号" clearable @keyup.enter="handleQuery" />
             </el-form-item>
@@ -57,6 +60,7 @@
           <span style="font-size: 16px; font-weight: 500">销售订单信息列表</span>
 
           <div style="display: flex; flex-wrap: nowrap; gap: 10px">
+            <el-button type="primary" @click="handleBatchConfirm()" :disabled="!ids.length" plain>批量确认订单</el-button>
             <el-button type="primary" @click="handleCloseOrder()" :disabled="!ids.length" plain>关闭订单</el-button>
             <el-button type="primary" @click="handleDelete()" :disabled="!ids.length" plain>删除订单</el-button>
             <el-button type="primary" :disabled="!ids.length" plain>导出订单</el-button>
@@ -163,6 +167,7 @@ import {
   changeCheckStatus
 } from '@/api/order/orderMain';
 import { OrderMainVO, OrderMainQuery, OrderMainForm } from '@/api/order/orderMain/types';
+import { oneKeyConfirmOrder } from '@/api/order/orderMainCrrcExt';
 import DeliverDialog from './deliverDialog.vue';
 import LogisticsDetail from './logisticsDetail.vue';
 import { getOrderMainCrrcExt } from '@/api/order/orderMainCrrcExt';
@@ -504,6 +509,25 @@ const handleDelete = async (row?: OrderMainVO) => {
   await getList();
 };
 
+/** 批量确认订单 */
+const handleBatchConfirm = async () => {
+  if (!ids.value.length) {
+    proxy?.$modal.msgWarning('请先选择需要确认的订单');
+    return;
+  }
+  await proxy?.$modal.confirm('是否确认批量确认选中的 ' + ids.value.length + ' 条订单?');
+  try {
+    loading.value = true;
+    await oneKeyConfirmOrder(ids.value.join(','));
+    proxy?.$modal.msgSuccess('批量确认成功');
+    await getList();
+  } catch (error) {
+    console.error('批量确认订单失败:', error);
+  } finally {
+    loading.value = false;
+  }
+};
+
 /** 关闭订单操作 */
 const handleCloseOrder = async (row?: OrderMainVO) => {
   const _ids = row?.id || ids.value;