|
@@ -618,11 +618,22 @@
|
|
|
},
|
|
|
// 获取周填报时间数据
|
|
|
getDateRange(){
|
|
|
- if(this.user.companyId == 817){
|
|
|
- this.weekIndex = 6
|
|
|
- }else{
|
|
|
+ // if(this.user.companyId == 817){
|
|
|
+ // this.weekIndex = 6
|
|
|
+ // }else{
|
|
|
+ // this.weekIndex = 5
|
|
|
+ // }
|
|
|
+ if(this.user.timeType.alertNonWorkday) {
|
|
|
+ if(this.user.timeType.alertNonWorkday == '110' || this.user.timeType.alertNonWorkday == '10') {
|
|
|
+ this.weekIndex = 7
|
|
|
+ }
|
|
|
+ if(this.user.timeType.alertNonWorkday == '100') {
|
|
|
+ this.weekIndex = 6
|
|
|
+ }
|
|
|
+ } else {
|
|
|
this.weekIndex = 5
|
|
|
}
|
|
|
+
|
|
|
let nowDate = new Date()
|
|
|
let nowWeekday = nowDate.getDay()
|
|
|
let shuldDate
|
|
@@ -1979,9 +1990,6 @@
|
|
|
this.timeRange.push(i)
|
|
|
}
|
|
|
this.getDateRange()
|
|
|
- // if(user.companyId == '817')
|
|
|
- // console.log('userId',this.user.companyId);
|
|
|
- // console.log(localStorage.getItem("formVal"))
|
|
|
var ua = navigator.userAgent.toLowerCase();
|
|
|
this.isIOSystem = this.isIOS();
|
|
|
if (ua.indexOf("wxwork") > 0) {
|