From ba95ecfa37981720c090f82af7884a6090b06989 Mon Sep 17 00:00:00 2001
From: xiaocp2009 <39615122+xiaocp2009@users.noreply.github.com>
Date: Tue, 9 Sep 2025 08:58:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=97=A5=E6=9C=9F=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/mps/batch/index.vue             | 22 +++++++++----------
 .../batch/modules/batch-operate-drawer.vue    | 16 ++------------
 .../views/mps/batch/modules/batch-search.vue  |  2 +-
 .../java/org/dromara/mps/domain/MpsBatch.java |  4 ++--
 .../org/dromara/mps/domain/bo/MpsBatchBo.java |  4 ++--
 .../mps/domain/bo/MpsBatchImprtBo.java        |  4 ++--
 .../org/dromara/mps/domain/vo/MpsBatchVo.java |  4 ++--
 7 files changed, 22 insertions(+), 34 deletions(-)

diff --git a/cds-fontend-2025.V1/src/views/mps/batch/index.vue b/cds-fontend-2025.V1/src/views/mps/batch/index.vue
index 5ebec71..d2b032b 100644
--- a/cds-fontend-2025.V1/src/views/mps/batch/index.vue
+++ b/cds-fontend-2025.V1/src/views/mps/batch/index.vue
@@ -123,15 +123,6 @@ const {
         );
       }
     },
-    {
-      key: 'preBatchDate',
-      title: '预批量时间',
-      align: 'center',
-      minWidth: 120,
-      width: 160,
-      ellipsis: true,
-      resizable: true
-    },
     {
       key: 'preBatchStatus',
       title: '预批量状态',
@@ -144,8 +135,8 @@ const {
       }
     },
     {
-      key: 'afterBatchDate',
-      title: '正式批量时间',
+      key: 'preBatchDate',
+      title: '预批量时间',
       align: 'center',
       minWidth: 120,
       width: 160,
@@ -163,6 +154,15 @@ const {
         return <DictTag size="small" value={row.afterBatchStatus} dictCode="after_batch_status" />;
       }
     },
+    {
+      key: 'afterBatchDate',
+      title: '正式批量时间',
+      align: 'center',
+      minWidth: 120,
+      width: 160,
+      ellipsis: true,
+      resizable: true
+    },
     {
       key: 'checkStatus',
       title: '核对状态',
diff --git a/cds-fontend-2025.V1/src/views/mps/batch/modules/batch-operate-drawer.vue b/cds-fontend-2025.V1/src/views/mps/batch/modules/batch-operate-drawer.vue
index 0d8e7dc..fa044c8 100644
--- a/cds-fontend-2025.V1/src/views/mps/batch/modules/batch-operate-drawer.vue
+++ b/cds-fontend-2025.V1/src/views/mps/batch/modules/batch-operate-drawer.vue
@@ -141,13 +141,7 @@ watch(visible, () => {
           />
         </NFormItem>
         <NFormItem  label="预批量时间" path="preBatchDate">
-          <NDatePicker style="width: 100%"
-              :disabled="true"
-            v-model:formatted-value="model.preBatchDate"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            clearable
-          />
+          <NInput v-model:value="model.preBatchDate" :disabled="true" placeholder="请输入预批量时间" />
         </NFormItem>
         <NFormItem label="预批量状态" path="preBatchStatus">
           <NSelect
@@ -159,13 +153,7 @@ watch(visible, () => {
           />
         </NFormItem>
         <NFormItem label="正式批量时间" path="afterBatchDate">
-          <NDatePicker style="width: 100%"
-              :disabled="true"
-            v-model:formatted-value="model.afterBatchDate"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            clearable
-          />
+          <NInput v-model:value="model.afterBatchDate" :disabled="true" placeholder="请输入正式批量时间" />
         </NFormItem>
         <NFormItem label="正式批量状态" path="afterBatchStatus">
           <NSelect
diff --git a/cds-fontend-2025.V1/src/views/mps/batch/modules/batch-search.vue b/cds-fontend-2025.V1/src/views/mps/batch/modules/batch-search.vue
index bef4a19..90c63d8 100644
--- a/cds-fontend-2025.V1/src/views/mps/batch/modules/batch-search.vue
+++ b/cds-fontend-2025.V1/src/views/mps/batch/modules/batch-search.vue
@@ -48,7 +48,7 @@ function disablePreviousDate(ts) {
                 format="y年 M月"
                 year-format="y年"
                 month-format="M月"
-                value-format="yyyyMM"
+                value-format="yyyy-MM"
                 clearable
                 :is-date-disabled="disablePreviousDate"
                 :update-value-on-close="true"
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/MpsBatch.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/MpsBatch.java
index f144a93..717b95f 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/MpsBatch.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/MpsBatch.java
@@ -48,7 +48,7 @@ public class MpsBatch extends BaseEntity {
     /**
      * 预批量时间
      */
-    private Date preBatchDate;
+    private String preBatchDate;
 
     /**
      * 预批量状态（0初始 1成功 9失败）
@@ -58,7 +58,7 @@ public class MpsBatch extends BaseEntity {
     /**
      * 正式批量时间
      */
-    private Date afterBatchDate;
+    private String afterBatchDate;
 
     /**
      * 正式批量状态（0初始 1成功 9失败）
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsBatchBo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsBatchBo.java
index c356b19..ea1586a 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsBatchBo.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsBatchBo.java
@@ -46,7 +46,7 @@ public class MpsBatchBo extends BaseEntity {
     /**
      * 预批量时间
      */
-    private Date preBatchDate;
+    private String preBatchDate;
 
     /**
      * 预批量状态（0初始 1成功 9失败）
@@ -56,7 +56,7 @@ public class MpsBatchBo extends BaseEntity {
     /**
      * 正式批量时间
      */
-    private Date afterBatchDate;
+    private String afterBatchDate;
 
     /**
      * 正式批量状态（0初始 1成功 9失败）
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsBatchImprtBo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsBatchImprtBo.java
index 79776f4..54758ed 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsBatchImprtBo.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsBatchImprtBo.java
@@ -46,7 +46,7 @@ public class MpsBatchImprtBo extends BaseEntity {
     /**
      * 预批量时间
      */
-    private Date preBatchDate;
+    private String preBatchDate;
 
     /**
      * 预批量状态（0初始 1成功 9失败）
@@ -56,7 +56,7 @@ public class MpsBatchImprtBo extends BaseEntity {
     /**
      * 正式批量时间
      */
-    private Date afterBatchDate;
+    private String afterBatchDate;
 
     /**
      * 正式批量状态（0初始 1成功 9失败）
diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsBatchVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsBatchVo.java
index b34011b..28ed63a 100644
--- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsBatchVo.java
+++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsBatchVo.java
@@ -54,7 +54,7 @@ public class MpsBatchVo implements Serializable {
     /**
      * 预批量时间
      */
-    private Date preBatchDate;
+    private String preBatchDate;
 
     /**
      * 预批量状态（0初始 1成功 9失败）
@@ -64,7 +64,7 @@ public class MpsBatchVo implements Serializable {
     /**
      * 正式批量时间
      */
-    private Date afterBatchDate;
+    private String afterBatchDate;
 
     /**
      * 正式批量状态（0初始 1成功 9失败）