From 231c2117fbec839bc808b21c858ced904fcd7b6b Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 18 Mar 2024 17:51:34 +0800
Subject: [PATCH] 从业人员入职和离职时间

---
 subPackage/workbench/components/formItem.vue |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/subPackage/workbench/components/formItem.vue b/subPackage/workbench/components/formItem.vue
index dd86384..063ce18 100644
--- a/subPackage/workbench/components/formItem.vue
+++ b/subPackage/workbench/components/formItem.vue
@@ -35,13 +35,15 @@
 			</u-form-item>
 			<u-form-item v-if="addressType == 2" @click="showEmploymentTime = true" class="form-item" label="入职时间"
 				prop="ethnicity">
-				<u--input border="none" v-model="nationValue" disabled disabledColor="#ffffff" placeholder="请选择入职时间">
+				<u--input border="none" v-model="form.employmentTime" disabled disabledColor="#ffffff"
+					placeholder="请选择入职时间">
 				</u--input>
 				<u-icon slot="right" name="arrow-right"></u-icon>
 			</u-form-item>
 			<u-form-item v-if="addressType == 2" @click="showResignationTime = true" class="form-item" label="离职时间"
 				prop="ethnicity">
-				<u--input border="none" v-model="nationValue" disabled disabledColor="#ffffff" placeholder="请选择离职时间">
+				<u--input border="none" v-model="form.resignationTime" disabled disabledColor="#ffffff"
+					placeholder="请选择离职时间">
 				</u--input>
 				<u-icon slot="right" name="arrow-right"></u-icon>
 			</u-form-item>
@@ -61,12 +63,12 @@
 			</u-form-item>
 		</u-form>
 
-		<u-datetime-picker ref="datetimePicker" :show="showEmploymentTime" v-model="workTime" mode="datetime"
-			:formatter="formatter" @confirm="confirmResignationTime"
+		<u-datetime-picker ref="datetimePicker" :show="showEmploymentTime" v-model="workTime" mode="date"
+			:formatter="formatter" @confirm="confirmEmploymentTime"
 			@cancel="showEmploymentTime = false"></u-datetime-picker>
 
-		<u-datetime-picker ref="datetimePicker" :show="showResignationTime" v-model="workTime" mode="datetime"
-			:formatter="formatter" @confirm="confirmEmploymentTime"
+		<u-datetime-picker ref="datetimePicker" :show="showResignationTime" v-model="workTime" mode="date"
+			:formatter="formatter" @confirm="confirmResignationTime"
 			@cancel="showResignationTime = false"></u-datetime-picker>
 
 		<u-picker :defaultIndex="nationTypeListIndex" :closeOnClickOverlay="true" :show="showNationPicker"
@@ -202,13 +204,13 @@
 			},
 
 			confirmResignationTime(e) {
+				this.form.resignationTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
 				this.showResignationTime = false;
-				this.form.resignationTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
 			},
 
 			confirmEmploymentTime(e) {
+				this.form.employmentTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
 				this.showEmploymentTime = false;
-				this.form.employmentTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
 			},
 
 

--
Gitblit v1.9.3