Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev
| | |
| | | this.hform.HRelBeginTime = getDateTime.dateTimeSetHoureStr(7, 40, 0, 0,'y-m-d h:i'); |
| | | this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime); |
| | | }else{ |
| | | this.hform.HRelBeginTime = maxDate.replace(/(:\d{2})(:\d{2}\.\d{3})/, '$1');//使用正则表达式去除秒和毫秒 |
| | | this.hform.HRelBeginTime = getDateTime.formatDate(maxDate); |
| | | this.hform.HWorkTimes=getDateTime.calculateHoursDiff(this.hform.HRelBeginTime,this.hform.HRelEndTime); |
| | | } |
| | | } |
| | |
| | | |
| | | return `${newYYYY}-${newMM}-${newDD} ${newHH}:${newMin}`; |
| | | } |
| | | /** 将时间转换成 YYYY-MM-DD HH:MM格式 |
| | | * @param {Object} date 时间 |
| | | */ |
| | | function formatDate(date) { |
| | | const year = date.getFullYear(); |
| | | const month = String(date.getMonth() + 1).padStart(2, '0'); |
| | | const day = String(date.getDate()).padStart(2, '0'); |
| | | const hours = String(date.getHours()).padStart(2, '0'); |
| | | const minutes = String(date.getMinutes()).padStart(2, '0'); |
| | | |
| | | return `${year}-${month}-${day} ${hours}:${minutes}`; |
| | | } |
| | | module.exports = { |
| | | dateTimeStr: dateTimeStr, |
| | | dateTimeSetHoureStr:dateTimeSetHoureStr, |
| | | calculateHoursDiff:calculateHoursDiff, |
| | | addHoursToDate:addHoursToDate, |
| | | formatDate:formatDate, |
| | | } |