GTsoft/mps-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

批量日期类型调整

Browse Source
This commit is contained in:
xiaocp2009 2025-09-09 08:58:14 +08:00
parent c9a2797e79
commit ba95ecfa37
7 changed files with 22 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cds-fontend-2025.V1/src/views/mps/batch/index.vue
View File

@ -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: '核对状态',

16
cds-fontend-2025.V1/src/views/mps/batch/modules/batch-operate-drawer.vue
View File

@ -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

2
cds-fontend-2025.V1/src/views/mps/batch/modules/batch-search.vue
View File

@ -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"

4
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/MpsBatch.java
View File

@ -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失败）

4
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsBatchBo.java
View File

@ -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失败）

4
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/bo/MpsBatchImprtBo.java
View File

@ -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失败）

4
cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/mps/domain/vo/MpsBatchVo.java
View File

@ -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失败）