Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
acb30103
o2oa
项目概览
fuyue82
/
o2oa
与 Fork 源项目一致
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
o2oa
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
acb30103
编写于
10月 21, 2020
作者:
S
st
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
【考勤管理】修复申诉打开bug
上级
de82bf0b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
56 addition
and
53 deletion
+56
-53
o2web/source/x_component_Attendance/MyDetail.js
o2web/source/x_component_Attendance/MyDetail.js
+56
-53
未找到文件。
o2web/source/x_component_Attendance/MyDetail.js
浏览文件 @
acb30103
...
...
@@ -19,10 +19,10 @@ MWF.xApplication.Attendance.MyDetail = new Class({
},
load
:
function
(){
//options = {
// "name": "直接主管",
// "personName": this.workContext.getWork().creatorPerson
//}
//return this.org.getPersonAttribute(options);
// "name": "直接主管",
// "personName": this.workContext.getWork().creatorPerson
//}
//return this.org.getPersonAttribute(options);
this
.
loadTab
();
},
loadTab
:
function
(){
...
...
@@ -190,25 +190,25 @@ MWF.xApplication.Attendance.MyDetail.Explorer = new Class({
isLate
:
{
text
:
"
迟到
"
,
"
type
"
:
"
select
"
,
"
selectValue
"
:
[
""
,
"
true
"
,
"
false
"
],
"
selectText
"
:
[
""
,
"
迟到
"
,
"
未迟到
"
]
},
isLackOfTime
:
{
text
:
"
工时不足
"
,
"
type
"
:
"
select
"
,
"
selectValue
"
:
[
""
,
"
true
"
,
"
false
"
],
"
selectText
"
:
[
""
,
"
是
"
,
"
否
"
]
},
action
:
{
"
value
"
:
"
查询
"
,
type
:
"
button
"
,
className
:
"
filterButton
"
,
event
:
{
click
:
function
(){
var
result
=
this
.
form
.
getResult
(
false
,
null
,
false
,
true
,
false
);
click
:
function
(){
var
result
=
this
.
form
.
getResult
(
false
,
null
,
false
,
true
,
false
);
var
year
=
this
.
preMonthDate
.
getFullYear
().
toString
();
var
month
=
(
this
.
preMonthDate
.
getMonth
()
+
1
).
toString
();
if
(
month
.
length
==
1
)
month
=
"
0
"
+
month
;
result
.
cycleYear
=
year
;
result
.
cycleMonth
=
month
;
var
year
=
this
.
preMonthDate
.
getFullYear
().
toString
();
var
month
=
(
this
.
preMonthDate
.
getMonth
()
+
1
).
toString
();
if
(
month
.
length
==
1
)
month
=
"
0
"
+
month
;
result
.
cycleYear
=
year
;
result
.
cycleMonth
=
month
;
if
(
typeOf
(
result
.
isAbsent
)
==
"
string
"
)
result
.
isAbsent
=
this
.
getBoolean
(
result
.
isAbsent
);
if
(
typeOf
(
result
.
isLate
)
==
"
string
"
)
result
.
isLate
=
this
.
getBoolean
(
result
.
isLate
);
if
(
typeOf
(
result
.
isLackOfTime
)
==
"
string
"
)
result
.
isLackOfTime
=
this
.
getBoolean
(
result
.
isLackOfTime
);
if
(
typeOf
(
result
.
isAbsent
)
==
"
string
"
)
result
.
isAbsent
=
this
.
getBoolean
(
result
.
isAbsent
);
if
(
typeOf
(
result
.
isLate
)
==
"
string
"
)
result
.
isLate
=
this
.
getBoolean
(
result
.
isLate
);
if
(
typeOf
(
result
.
isLackOfTime
)
==
"
string
"
)
result
.
isLackOfTime
=
this
.
getBoolean
(
result
.
isLackOfTime
);
if
(
result
.
date
&&
result
.
date
!=
""
){
result
.
q_date
=
year
+
"
-
"
+
month
+
"
-
"
+
result
.
date
;
}
this
.
loadView
(
result
);
}.
bind
(
this
)
}}
if
(
result
.
date
&&
result
.
date
!=
""
){
result
.
q_date
=
year
+
"
-
"
+
month
+
"
-
"
+
result
.
date
;
}
this
.
loadView
(
result
);
}.
bind
(
this
)
}}
}
},
this
.
app
,
this
.
css
);
this
.
form
.
load
();
...
...
@@ -636,7 +636,7 @@ MWF.xApplication.Attendance.MyDetail.DetailStaticView = new Class({
if
(
month
.
length
==
1
)
month
=
"
0
"
+
month
;
filter
.
cycleMonth
=
month
;
this
.
actions
.
listStaticMonthPerson
(
filter
.
q_empName
,
filter
.
cycleYear
,
filter
.
cycleMonth
,
function
(
json
){
if
(
callback
)
callback
(
json
);
}.
bind
(
this
))
},
...
...
@@ -776,14 +776,17 @@ MWF.xApplication.Attendance.MyDetail.Document = new Class({
}.
bind
(
this
)});
},
seeAppeal
:
function
(){
if
(
!
this
.
data
.
appealInfos
){
var
form
=
new
MWF
.
xApplication
.
Attendance
.
MyDetail
.
Appeal
(
this
.
explorer
,
this
.
data
);
form
.
open
();
}
else
{
var
workid
=
this
.
data
.
appealInfos
[
0
].
appealAuditInfo
.
workId
;
var
options
=
{
"
workId
"
:
workid
,
"
appId
"
:
"
process.Work
"
+
workid
};
this
.
app
.
desktop
.
openApplication
(
null
,
"
process.Work
"
,
options
);
if
(
this
.
data
.
appealInfos
[
0
].
appealAuditInfo
){
if
(
this
.
data
.
appealInfos
[
0
].
appealAuditInfo
.
workId
){
var
workid
=
this
.
data
.
appealInfos
[
0
].
appealAuditInfo
.
workId
;
var
options
=
{
"
workId
"
:
workid
,
"
appId
"
:
"
process.Work
"
+
workid
};
this
.
app
.
desktop
.
openApplication
(
null
,
"
process.Work
"
,
options
);
return
;
}
}
var
form
=
new
MWF
.
xApplication
.
Attendance
.
MyDetail
.
Appeal
(
this
.
explorer
,
this
.
data
);
form
.
open
();
}
});
...
...
@@ -916,8 +919,8 @@ MWF.xApplication.Attendance.MyDetail.Appeal = new Class({
}
if
(
d
.
isGetSelfHolidays
&&
d
.
selfHolidayDayTime
==
"
下午
"
){
status
.
push
(
"
请假或外出报备
"
);
//}else if(d.isLeaveEarlier){
// status.push( '早退')
//}else if(d.isLeaveEarlier){
// status.push( '早退')
}
else
if
(
d
.
isAbsent
&&
d
.
absentDayTime
==
"
下午
"
){
status
.
push
(
'
缺勤
'
)
}
else
if
(
d
.
isAbnormalDuty
&&
d
.
abnormalDutyDayTime
==
"
下午
"
){
...
...
@@ -934,13 +937,13 @@ MWF.xApplication.Attendance.MyDetail.Appeal = new Class({
}
else
if
(
d
.
status
==
-
1
)
{
appealStatus
=
"
审批未通过
"
}
//if (d.appealStatus == 1) {
// appealStatus = "申诉中"
//} else if (d.appealStatus == -1) {
// appealStatus = "申诉未通过"
//} else if (d.appealStatus == 9) {
// appealStatus = "申诉通过"
//}
//if (d.appealStatus == 1) {
// appealStatus = "申诉中"
//} else if (d.appealStatus == -1) {
// appealStatus = "申诉未通过"
//} else if (d.appealStatus == 9) {
// appealStatus = "申诉通过"
//}
this
.
data
.
appealStatusShow
=
appealStatus
;
//var auditors = this.getAuditor();
...
...
@@ -955,25 +958,25 @@ MWF.xApplication.Attendance.MyDetail.Appeal = new Class({
+
"
<tr><td styles='formTableTitle' lable='onDutyTime'></td>
"
+
"
<td styles='formTableValue' item='onDutyTime'></td>
"
+
((
this
.
data
.
signProxy
==
"
2
"
||
this
.
data
.
signProxy
==
"
3
"
)?
"
<td styles='formTableTitle' lable='morningOffDutyTime'></td>
"
+
"
<td styles='formTableValue' item='morningOffDutyTime'></td></tr>
"
+
"
<tr><td styles='formTableTitle' lable='afternoonOnDutyTime'></td>
"
+
"
<td styles='formTableValue' item='afternoonOnDutyTime'></td>
"
:
""
"
<td styles='formTableTitle' lable='morningOffDutyTime'></td>
"
+
"
<td styles='formTableValue' item='morningOffDutyTime'></td></tr>
"
+
"
<tr><td styles='formTableTitle' lable='afternoonOnDutyTime'></td>
"
+
"
<td styles='formTableValue' item='afternoonOnDutyTime'></td>
"
:
""
)
+
"
<td styles='formTableTitle' lable='offDutyTime'></td>
"
+
"
<td styles='formTableValue' item='offDutyTime'></td></tr>
"
+
(
(
this
.
isNew
&&
identityList
.
identities
.
length
>
1
)
?
"
<tr><td styles='formTableTitle' lable='identity'></td>
"
+
"
<td styles='formTableValue' item='identity' colspan='3'></td></tr>
"
:
""
"
<tr><td styles='formTableTitle' lable='identity'></td>
"
+
"
<td styles='formTableValue' item='identity' colspan='3'></td></tr>
"
:
""
)
+
(
this
.
isNew
?
"
<tr><td styles='formTableTitle' lable='statusShow'></td>
"
+
"
<td styles='formTableValue' item='statusShow'></td>
"
+
"
<td styles='formTableTitle' lable='appealStatusShow'></td>
"
+
"
<td styles='formTableValue' item='appealStatusShow'></td></tr>
"
:
"
<tr><td styles='formTableTitle' lable='appealStatusShow'></td>
"
+
"
<td styles='formTableValue' item='appealStatusShow' colspan='3'></td></tr>
"
"
<tr><td styles='formTableTitle' lable='statusShow'></td>
"
+
"
<td styles='formTableValue' item='statusShow'></td>
"
+
"
<td styles='formTableTitle' lable='appealStatusShow'></td>
"
+
"
<td styles='formTableValue' item='appealStatusShow'></td></tr>
"
:
"
<tr><td styles='formTableTitle' lable='appealStatusShow'></td>
"
+
"
<td styles='formTableValue' item='appealStatusShow' colspan='3'></td></tr>
"
)
+
"
<tr><td styles='formTableTitle' lable='appealReason'></td>
"
+
...
...
@@ -1016,8 +1019,8 @@ MWF.xApplication.Attendance.MyDetail.Appeal = new Class({
type
:
"
select
"
,
selectValue
:
[
""
,
"
临时请假
"
,
"
出差
"
,
"
因公外出
"
,
"
其他
"
],
event
:
{
change
:
function
(
mdi
){
_self
.
switchFieldByAppealReason
(
mdi
.
getValue
());
}}
_self
.
switchFieldByAppealReason
(
mdi
.
getValue
());
}}
},
identity
:
{
notEmpty
:
true
,
...
...
@@ -1138,7 +1141,7 @@ MWF.xApplication.Attendance.MyDetail.Appeal = new Class({
}.
bind
(
this
),
null
,
false
);
}
else
if
(
setting
.
APPEAL_AUDITOR_TYPE
.
configValue
==
"
人员属性
"
){
this
.
app
.
personActions
.
getPerson
(
function
(
json
){
var
attribute
=
setting
.
APPEAL_AUDITOR_VALUE
.
configValue
;
var
attribute
=
setting
.
APPEAL_AUDITOR_VALUE
.
configValue
;
json
.
data
.
woPersonAttributeList
.
each
(
function
(
attr
){
if
(
attr
.
name
==
attribute
){
var
p
=
attr
.
attributeList
[
0
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录