From d5a4e102e4a7a50eeb7858c22f9feb1124d76704 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 19 Sep 2024 10:04:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../growingThroughLifeTask.vue                | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/views/childView/growingThroughLife/growingThroughLifeTask.vue b/src/views/childView/growingThroughLife/growingThroughLifeTask.vue
index cbf62c9..02794d9 100644
--- a/src/views/childView/growingThroughLife/growingThroughLifeTask.vue
+++ b/src/views/childView/growingThroughLife/growingThroughLifeTask.vue
@@ -64,7 +64,7 @@
 				<a-row :gutter="[16,16]">
 					<a-col :span="12">
 						<a-form-item label="Task Name" name="taskName">
-							<a-input :disabled="true" v-model:value="formState.taskName" size="large" placeholder="Please input task name" />
+							<a-input v-model:value="formState.taskName" size="large" placeholder="Please input task name" />
 						</a-form-item>
 					</a-col>
 					<a-col :span="12">
@@ -74,7 +74,9 @@
 					</a-col>
 				</a-row>
 				<a-form-item label="Date" name="Date">
-					<a-range-picker v-model:value="formState.time" show-time size="large" style="width: 100%;" :placeholder="['Start Time', 'End Time']" format="YYYY-MM-DD hh:mm:ss" valueFormat="YYYY-MM-DD hh:mm:ss"/>
+					<a-range-picker v-model:value="formState.time" size="large" style="width: 100%;" :placeholder="['Start Time', 'End Time']" :show-time="{ format: 'HH:mm:ss' }"
+							format="YYYY-MM-DD HH:mm:ss"
+							valueFormat="YYYY-MM-DD HH:mm:ss"/>
 				</a-form-item>
 				<a-form-item label="Description" name="description">
 					<a-textarea :disabled="true" style="max-height: 200px;" v-model:value="formState.description" />
@@ -148,7 +150,6 @@ export default defineComponent({
             addTime:ref<Moment[]>([])
         })
 		let setTime = (startTime:any,endTime:any)=>{
-		    console.log(startTime,endTime);
 			return endTime
 		}
 		let isEdit = [3,4,5,7]
@@ -160,7 +161,7 @@ export default defineComponent({
         ])
         let columns = reactive([
             { title: 'Task Name', align:'center', ellipsis: true,  dataIndex: 'taskName', key: 'taskName' },
-            { title: 'Star Value', align:'center', ellipsis: true,  dataIndex: 'targetValue', key: 'targetValue' },
+            { title: 'Target Value', align:'center', ellipsis: true,  dataIndex: 'targetValue', key: 'targetValue' },
             // { title: 'Task Product Counts', align:'center', ellipsis: true,  dataIndex: 'counts', key: 'counts' },
             { title: 'Add Time', align:'center', ellipsis: true,  dataIndex: 'createTime', key: 'createTime',customRender:(record:any)=>{
                 // let time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
@@ -200,12 +201,12 @@ export default defineComponent({
 			description:'',
 			taskConditionList:[],
 			targetValue:1,
-			time:[],
+			time:ref([]),
         });
         let rules = reactive({
-            // taskName: [
-            //     { required: true, message: 'Please input task name', trigger: 'blur' },
-            // ],
+            taskName: [
+                { required: true, message: 'Please input task name', trigger: 'blur' },
+            ],
 			targetValue: [
                 { required: true, message: 'Please enter the number of stars', trigger: 'blur' },
             ],
@@ -250,6 +251,7 @@ export default defineComponent({
                 description: data.description,
 				targetValue:data.targetValue,
 				taskConditionList:data.taskConditionList,
+				// time:[1726711071,1726721071],
 				time:[data.startTime.split('T')[0]+' '+data.startTime.split('T')[1],data.endTime.split('T')[0]+' '+data.endTime.split('T')[1]],
             }
         }
@@ -275,6 +277,8 @@ export default defineComponent({
                 ...formState.value,
                 timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
             }
+			data.startTime = data.time[0]
+			data.endTime = data.time[1]
             formRef.value.validate().then(()=>{
                 submit()
             })