diff --git a/pages/apply/subPages/FO/jobFireTwoEdit.vue b/pages/apply/subPages/FO/jobFireTwoEdit.vue index e4e5172..ea2224e 100644 --- a/pages/apply/subPages/FO/jobFireTwoEdit.vue +++ b/pages/apply/subPages/FO/jobFireTwoEdit.vue @@ -235,7 +235,7 @@ dateTimePickerInfo: { showCheckDate: false, dataIndex: undefined, - defaultDateTime: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd'), + defaultDateTime: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss'), value: '', name: '', mode: '' @@ -359,9 +359,9 @@ this.model.ID = this.ID this.model.EVALUATE_LEVELName = res.EVALUATE_LEVEL !== '' && res.EVALUATE_LEVEL !== undefined ? this.enumsData['SKEvaluateLevelEnum'].find(item => item.code === res.EVALUATE_LEVEL).name : '' this.model.ACT_END_DATE = uni.$u.timeFormat(this.model.ACT_END_DATE, - 'yyyy-mm-dd') + 'yyyy-mm-dd hh:MM:ss') this.model.LEAVE_DATE = uni.$u.timeFormat(this.model.LEAVE_DATE, - 'yyyy-mm-dd') + 'yyyy-mm-dd hh:MM:ss') this.model.IS_LEAVEName = res.IS_LEAVE !== '' && res.IS_LEAVE !== undefined ? this.enumsData['FOYesOrNoEnum'].find(item => item.code === res.IS_LEAVE).name : '' }) @@ -794,20 +794,20 @@ showCheckDate(dataIndex, item) { this.dateTimePickerInfo = { showCheckDate: true, - defaultDateTime: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd'), + defaultDateTime: uni.$u.timeFormat(new Date(), 'yyyy-mm-dd hh:MM:ss'), dataIndex: dataIndex, item: item, - mode: 'date' + mode: 'datetime' } }, //隐藏控件 显示时间 handleCheckDate(e) { if (this.dateTimePickerInfo.dataIndex == 1) { this.model.ACT_END_DATE = uni.$u.timeFormat(e.value, - 'yyyy-mm-dd') + 'yyyy-mm-dd hh:MM:ss') } else if (this.dateTimePickerInfo.dataIndex == 2) { this.model.LEAVE_DATE = uni.$u.timeFormat(e.value, - 'yyyy-mm-dd') + 'yyyy-mm-dd hh:MM:ss') } this.dateTimePickerInfo.showCheckDate = false