From 8cab7220395b97d36d5384072213e56625287a43 Mon Sep 17 00:00:00 2001
From: TengXF <302828528@qq.com>
Date: Fri, 24 May 2024 10:09:14 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20update=20=E6=97=B6=E9=97=B4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/mes/reworkBatch/create.vue  | 10 +++++-----
 src/pages/mes/reworkSingle/create.vue | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/mes/reworkBatch/create.vue b/src/pages/mes/reworkBatch/create.vue
index 25af921..a5872c5 100644
--- a/src/pages/mes/reworkBatch/create.vue
+++ b/src/pages/mes/reworkBatch/create.vue
@@ -115,9 +115,9 @@
 					year: true,
 					month: true,
 					day: true,
-					hour: false,
-					minute: false,
-					second: false,
+					hour: true,
+					minute: true,
+					second: true,
 					timestamp: true,
 				})
 	const form = ref({
@@ -200,9 +200,9 @@
 	// 选择返工返修时间回调函数
 	function selectReworkTime(index){
 		console.log(index)
-		const dateStr = `${index.year}-${index.month}-${index.day}`
+		const dateStr = `${index.year}-${index.month}-${index.day} ${index.hour}:${index.minute}:${index.second}`
 		form.value.reworkStr = dateStr
-		form.value.reworkTime = index.timestamp
+		form.value.reworkTime = index.timestamp + '000'
 		console.log(form.value.reworkTime)
 		showReworkTime.value = false
 	}
diff --git a/src/pages/mes/reworkSingle/create.vue b/src/pages/mes/reworkSingle/create.vue
index a4f482a..86575d8 100644
--- a/src/pages/mes/reworkSingle/create.vue
+++ b/src/pages/mes/reworkSingle/create.vue
@@ -103,9 +103,9 @@
 					year: true,
 					month: true,
 					day: true,
-					hour: false,
-					minute: false,
-					second: false,
+					hour: true,
+					minute: true,
+					second: true,
 					timestamp: true,
 				})
 	const form = ref({
@@ -191,9 +191,9 @@
 	}
 	// 选择返工返修时间回调函数
 	function selectReworkTime(index){
-		const dateStr = `${index.year}-${index.month}-${index.day}`
+		const dateStr = `${index.year}-${index.month}-${index.day} ${index.hour}:${index.minute}:${index.second}`
 		form.value.reworkStr = dateStr
-		form.value.reworkTime = index.timestamp
+		form.value.reworkTime = index.timestamp + '000'
 		console.log(form.value.reworkTime)
 		showReworkTime.value = false
 	}