|
|
@@ -157,7 +157,7 @@ import { gettrainingList, getsignUserList } from '@/api/training.js'
|
|
|
import { deptTreeList } from '@/api/toConsult.js'
|
|
|
|
|
|
import OrgTree from '@/components/orgTree'
|
|
|
-import { newDateMonth } from '@/utils/date.js'
|
|
|
+import { newDateMonth,compatibleWithIOSStringToDate } from '@/utils/date.js'
|
|
|
export default {
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -248,8 +248,8 @@ export default {
|
|
|
//当前时间再时间范围内且签名是待签名状态且签名列表存在当前登录人未签名的情况才可以进行签名
|
|
|
if (list.startDate && list.endDate && list.status == 1) {
|
|
|
let date = new Date().getTime()
|
|
|
- let startDate = Date.parse(new Date(list.startDate))
|
|
|
- let endDate = Date.parse(new Date(list.endDate))
|
|
|
+ let startDate =compatibleWithIOSStringToDate(list.startDate);// Date.parse(new Date(list.startDate))
|
|
|
+ let endDate =compatibleWithIOSStringToDate(list.endDate);// Date.parse(new Date(list.endDate))
|
|
|
|
|
|
if (date >= startDate && date <= endDate) {
|
|
|
console.log(list.id, 'ssss')
|
|
|
@@ -278,8 +278,8 @@ export default {
|
|
|
let timefalg = false
|
|
|
//value1 当前登陆用户ID
|
|
|
let date = new Date().getTime()
|
|
|
- let startDate = Date.parse(new Date(list.startDate))
|
|
|
- let endDate = Date.parse(new Date(list.endDate))
|
|
|
+ let startDate =compatibleWithIOSStringToDate(list.startDate);// Date.parse(new Date(list.startDate))
|
|
|
+ let endDate =compatibleWithIOSStringToDate(list.endDate);// Date.parse(new Date(list.endDate))
|
|
|
//任务处于待培训状态,且任务在规定完成时间范围内,登录人所在机构和与任务培训机构一致才显示
|
|
|
|
|
|
if (list.startDate && list.endDate && (list.status == 0 || list.status == 4)) {
|