From 79370218e152be17382e792c3cab98e2f1a5a587 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期二, 30 一月 2024 16:45:07 +0800
Subject: [PATCH] 修改订单排产时间
---
jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 27 ++++++---------------------
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java | 6 ++++++
2 files changed, 12 insertions(+), 21 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
index 83eb39f..9df79cd 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
@@ -130,26 +130,32 @@
private String endTime;
/** 鍚堢涓婄嚎鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鍚堢涓婄嚎鏃堕棿")
private Date boxClosingOnlineTime;
/** 鍚堢涓嬬嚎鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鍚堢涓嬬嚎鏃堕棿")
private Date closingBoxOfflineTime;
/** 鎬昏涓婄嚎鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎬昏涓婄嚎鏃堕棿")
private Date finalAssemblyLaunchTime;
/** 鎬昏涓嬬嚎鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鎬昏涓嬬嚎鏃堕棿")
private Date finalAssemblyOfflineTime;
/** CVT涓婄嚎鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "CVT涓婄嚎鏃堕棿")
private Date cvtLaunchTime;
/** CVT涓嬬嚎鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "CVT涓嬬嚎鏃堕棿")
private Date cvtOfflineTime;
diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
index 4fb42a3..a90d455 100644
--- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
+++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -204,41 +204,26 @@
</el-table-column>
<el-table-column label="鍚堢涓婄嚎鏃堕棿" align="center" prop="boxClosingOnlineTime" width="160">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.boxClosingOnlineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
- </template>
+
</el-table-column>
<el-table-column label="鍚堢涓嬬嚎鏃堕棿" align="center" prop="closingBoxOfflineTime" width="160">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.closingBoxOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
- </template>
+
</el-table-column>
<el-table-column label="鎬昏涓婄嚎鏃堕棿" align="center" prop="finalAssemblyLaunchTime" width="160">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.finalAssemblyLaunchTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
- </template>
+
</el-table-column>
<el-table-column label="鎬昏涓嬬嚎鏃堕棿" align="center" prop="finalAssemblyOfflineTime" width="160">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.finalAssemblyOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
- </template>
+
</el-table-column>
<el-table-column label="CVT涓婄嚎鏃堕棿" align="center" prop="cvtLaunchTime" width="160">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.cvtLaunchTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
- </template>
+
</el-table-column>
<el-table-column label="CVT涓嬬嚎鏃堕棿" align="center" prop="cvtOfflineTime" width="160">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.cvtOfflineTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
- </template>
+
</el-table-column>
<el-table-column label="鎿嶄綔浜�" align="center" prop="operator">
</el-table-column>
<el-table-column label="鎿嶄綔鏃堕棿" align="center" prop="operateTime" width="160">
- <template slot-scope="scope">
- <span>{{ parseTime(scope.row.operateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
- </template>
</el-table-column>
</el-table>
--
Gitblit v1.9.3