From 7763f23f3224a0f609c4c483351edd656b0dfb26 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期一, 26 十月 2026 16:49:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

---
 src/views/erp/sale/order/index.vue |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/src/views/erp/sale/order/index.vue b/src/views/erp/sale/order/index.vue
index 5d32a61..bec1872 100644
--- a/src/views/erp/sale/order/index.vue
+++ b/src/views/erp/sale/order/index.vue
@@ -9,6 +9,7 @@
 import { downloadFileFromBlobPart, isEmpty } from '@vben/utils';
 
 import { message, Tag, Tooltip } from 'ant-design-vue';
+import dayjs from 'dayjs';
 
 import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import {
@@ -22,6 +23,7 @@
 } from '#/api/erp/sale/order';
 import { generateFromSaleOrder } from '#/api/mes/wm/salesnotice';
 import { $t } from '#/locales';
+import { automaticApproval } from '#/store/audit-policy';
 
 import { useGridColumns, useGridFormSchema } from './data';
 import Form from './modules/form.vue';
@@ -57,8 +59,25 @@
 
 /** 瀵煎嚭琛ㄦ牸 */
 async function handleExport() {
-  const data = await exportSaleOrder(await gridApi.formApi.getValues());
+  const data = await exportSaleOrder(
+    normalizeDateRange(await gridApi.formApi.getValues()),
+  );
   downloadFileFromBlobPart({ fileName: '閿�鍞鍗�.xls', source: data });
+}
+
+/** 鏃ユ湡绛涢�夎鐩栨墍閫夎捣姝㈡棩鏈熺殑鍏ㄥぉ锛屽吋瀹瑰悗绔椂闂寸被鍨嬨�� */
+function normalizeDateRange(values: Record<string, any>) {
+  const range = values.orderTime;
+  if (!Array.isArray(range) || range.length !== 2 || !range.every(Boolean)) {
+    return values;
+  }
+  return {
+    ...values,
+    orderTime: [
+      dayjs(range[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss'),
+      dayjs(range[1]).endOf('day').format('YYYY-MM-DD HH:mm:ss'),
+    ],
+  };
 }
 
 /** 瀵煎叆閿�鍞鍗� */
@@ -94,18 +113,18 @@
 /** 鎻愪氦閿�鍞鍗曞鎵癸紙鍗忓悓鍔炲叕锛� */
 async function handleSubmit(row: ErpSaleOrderApi.SaleOrder) {
   // 鑾峰彇鍙敤鐨勫鎵规祦绋嬪畾涔�
-  const processList = await getSaleOrderApproveProcessList();
-  if (isEmpty(processList)) {
+  const processList = automaticApproval.value ? [] : await getSaleOrderApproveProcessList();
+  if (!automaticApproval.value && isEmpty(processList)) {
     message.error('閿�鍞鍗曞鎵规祦绋嬫湭閰嶇疆锛岃鍏堝湪銆屽崗鍚屽姙鍏啋娴佺▼绠$悊銆嶄腑鍒涘缓骞跺彂甯冮攢鍞鍗曞鎵规祦绋�');
     return;
   }
   const hideLoading = message.loading({
-    content: '姝e湪鎻愪氦瀹℃壒...',
+    content: automaticApproval.value ? '姝e湪鎻愪氦鐢熸晥...' : '姝e湪鎻愪氦瀹℃壒...',
     duration: 0,
   });
   try {
-    await submitSaleOrder(row.id!, processList[0].key);
-    message.success('鎻愪氦瀹℃壒鎴愬姛锛岃鍒板崗鍚屽姙鍏腑澶勭悊');
+    await submitSaleOrder(row.id!, automaticApproval.value ? 'sale_order_approve' : processList[0]!.key);
+    message.success(automaticApproval.value ? '宸叉彁浜ょ敓鏁�' : '鎻愪氦瀹℃壒鎴愬姛锛岃鍒板崗鍚屽姙鍏腑澶勭悊');
     handleRefresh();
   } finally {
     hideLoading();
@@ -208,7 +227,7 @@
       ajax: {
         query: async ({ page }, formValues) => {
           // 鐢熶骇鐘舵�佹悳绱㈠弬鏁拌浆鎹細-1(鏃犻渶鐢熶骇) 鈫� needProduction=0
-          const { productionStatus, ...rest } = formValues;
+          const { productionStatus, ...rest } = normalizeDateRange(formValues);
           const params: Record<string, any> = { ...rest };
           if (productionStatus === -1) {
             params.needProduction = 0;

--
Gitblit v1.9.3