From 4793fda2a2d717c4d32bbf25b09d184465507df9 Mon Sep 17 00:00:00 2001
From: xiaocp2009 <39615122+xiaocp2009@users.noreply.github.com>
Date: Mon, 1 Sep 2025 14:59:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=88=E6=9C=AC=E8=A7=84=E6=95=B4V4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/custom/batch-status-switch.vue | 62 ++++++++++++++
.../src/service/api/mps/batch.ts | 10 +++
.../src/typings/api/mps.batch.api.d.ts | 25 ++++--
.../src/views/mps/batch/index.vue | 61 +++++++++++++-
.../batch/modules/batch-operate-drawer.vue | 25 ++++--
.../views/mps/batch/modules/batch-search.vue | 4 -
.../mps/controller/MpsBatchController.java | 14 +++-
.../java/org/dromara/mps/domain/MpsBatch.java | 15 ++++
.../org/dromara/mps/domain/bo/MpsBatchBo.java | 15 ++++
.../mps/domain/bo/MpsBatchImprtBo.java | 82 +++++++++++++++++++
.../org/dromara/mps/domain/vo/MpsBatchVo.java | 15 ++++
.../dromara/mps/service/IMpsBatchService.java | 2 +
.../mps/service/impl/MpsBatchServiceImpl.java | 9 ++
.../resources/mapper/mps/MpsBatchMapper.xml | 6 ++
14 files changed, 325 insertions(+), 20 deletions(-)
create mode 100644 cds-fontend-2025.V1/src/components/custom/batch-status-switch.vue
create mode 100644 cds-platform-2025.V1/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/mps/domain/bo/MpsBatchImprtBo.java
diff --git a/cds-fontend-2025.V1/src/components/custom/batch-status-switch.vue b/cds-fontend-2025.V1/src/components/custom/batch-status-switch.vue
new file mode 100644
index 0000000..3a60310
--- /dev/null
+++ b/cds-fontend-2025.V1/src/components/custom/batch-status-switch.vue
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
diff --git a/cds-fontend-2025.V1/src/service/api/mps/batch.ts b/cds-fontend-2025.V1/src/service/api/mps/batch.ts
index 6a294c5..2b267be 100644
--- a/cds-fontend-2025.V1/src/service/api/mps/batch.ts
+++ b/cds-fontend-2025.V1/src/service/api/mps/batch.ts
@@ -19,3 +19,13 @@ export function fetchUpdateBatch (data: Api.Mps.BatchOperateParams) {
});
}
+/** 切换导入状态 */
+export function switchImportDataStatus (data: Api.Mps.BatchOperateParams) {
+ return request({
+ url: '/mps/batch/switchImportDataStatus',
+ method: 'put',
+ data
+ });
+}
+
+
diff --git a/cds-fontend-2025.V1/src/typings/api/mps.batch.api.d.ts b/cds-fontend-2025.V1/src/typings/api/mps.batch.api.d.ts
index f8a8984..0062b15 100644
--- a/cds-fontend-2025.V1/src/typings/api/mps.batch.api.d.ts
+++ b/cds-fontend-2025.V1/src/typings/api/mps.batch.api.d.ts
@@ -15,21 +15,27 @@ declare namespace Api {
/** batch */
type Batch = Common.CommonRecord<{
/** 批次月份 */
- batchMonth: string;
+ batchMonth: string;
+ /** 批量代码 */
+ batchCode: string;
+ /** 批量名称 */
+ batchName: string;
+ /** 数据导入状态 */
+ importStatus: string;
/** 预批量时间 */
- preBatchDate: string;
+ preBatchDate: string;
/** 预批量状态(0初始 1成功 9失败) */
- preBatchStatus: string;
+ preBatchStatus: string;
/** 正式批量时间 */
- afterBatchDate: string;
+ afterBatchDate: string;
/** 正式批量状态(0初始 1成功 9失败) */
- afterBatchStatus: string;
+ afterBatchStatus: string;
/** 核对状态(0未核对 1已核对) */
- checkStatus: string;
+ checkStatus: string;
/** 核对人 */
- checkBy: number;
+ checkBy: number;
/** 核对备注 */
- checkRemark: string;
+ checkRemark: string;
}>;
/** batch search params */
@@ -47,6 +53,9 @@ declare namespace Api {
Pick<
Api.Mps.Batch,
| 'batchMonth'
+ | 'batchCode'
+ | 'batchName'
+ | 'importStatus'
| 'preBatchDate'
| 'preBatchStatus'
| 'afterBatchDate'
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 5723886..5ebec71 100644
--- a/cds-fontend-2025.V1/src/views/mps/batch/index.vue
+++ b/cds-fontend-2025.V1/src/views/mps/batch/index.vue
@@ -1,6 +1,5 @@