Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
2e5f05a3
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,发现更多精彩内容 >>
提交
2e5f05a3
编写于
1月 10, 2021
作者:
L
luojing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
考勤,前端添加历史申述查询统计及历史申述审批
上级
cf873bd2
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
90 addition
and
19 deletion
+90
-19
o2web/source/x_component_Attendance/$MyDetail/listItem.json
o2web/source/x_component_Attendance/$MyDetail/listItem.json
+1
-1
o2web/source/x_component_Attendance/$PeopleDetail/listItem.json
...source/x_component_Attendance/$PeopleDetail/listItem.json
+1
-1
o2web/source/x_component_Attendance/$TopUnitDetail/listItem.json
...ource/x_component_Attendance/$TopUnitDetail/listItem.json
+1
-1
o2web/source/x_component_Attendance/$UnitDetail/listItem.json
...b/source/x_component_Attendance/$UnitDetail/listItem.json
+1
-1
o2web/source/x_component_Attendance/AppealExplorer.js
o2web/source/x_component_Attendance/AppealExplorer.js
+7
-7
o2web/source/x_component_Attendance/MyAppeal.js
o2web/source/x_component_Attendance/MyAppeal.js
+40
-5
o2web/source/x_component_Attendance/MyDetail.js
o2web/source/x_component_Attendance/MyDetail.js
+39
-3
未找到文件。
o2web/source/x_component_Attendance/$MyDetail/listItem.json
浏览文件 @
2e5f05a3
...
...
@@ -72,7 +72,7 @@
"contentStyles"
:
"normalTdNode"
,
"item"
:
"function( d ){ if(d.isExternal){ return '是' }else{ return '否' }}"
,
"name"
:
"appealStatus"
,
"width"
:
"
6
%"
"width"
:
"
7
%"
},
{
"title"
:
"申诉状态"
,
...
...
o2web/source/x_component_Attendance/$PeopleDetail/listItem.json
浏览文件 @
2e5f05a3
...
...
@@ -72,7 +72,7 @@
"contentStyles"
:
"normalTdNode"
,
"item"
:
"function( d ){ if(d.isExternal){ return '是' }else{ return '否' }}"
,
"name"
:
"appealStatus"
,
"width"
:
"
6
%"
"width"
:
"
7
%"
},
{
"title"
:
"申诉状态"
,
...
...
o2web/source/x_component_Attendance/$TopUnitDetail/listItem.json
浏览文件 @
2e5f05a3
...
...
@@ -72,7 +72,7 @@
"contentStyles"
:
"normalTdNode"
,
"item"
:
"function( d ){ if(d.isExternal){ return '是' }else{ return '否' }}"
,
"name"
:
"appealStatus"
,
"width"
:
"
6
%"
"width"
:
"
7
%"
},
{
"title"
:
"申诉状态"
,
...
...
o2web/source/x_component_Attendance/$UnitDetail/listItem.json
浏览文件 @
2e5f05a3
...
...
@@ -72,7 +72,7 @@
"contentStyles"
:
"normalTdNode"
,
"item"
:
"function( d ){ if(d.isExternal){ return '是' }else{ return '否' }}"
,
"name"
:
"appealStatus"
,
"width"
:
"
6
%"
"width"
:
"
7
%"
},
{
"title"
:
"申诉状态"
,
...
...
o2web/source/x_component_Attendance/AppealExplorer.js
浏览文件 @
2e5f05a3
...
...
@@ -95,14 +95,14 @@ MWF.xApplication.Attendance.AppealExplorer = new Class({
}).
inject
(
this
.
fileterNode
);
var
tr
=
new
Element
(
"
tr
"
).
inject
(
table
);
var
td
=
new
Element
(
"
td
"
,
{
"
styles
"
:
this
.
css
.
filterTableTitle
,
"
text
"
:
this
.
preMonthDate
.
format
(
this
.
app
.
lp
.
dateFormatMonth
)
}).
inject
(
tr
);
//
var td = new Element("td", { "styles" : this.css.filterTableTitle, "text" : this.preMonthDate.format(this.app.lp.dateFormatMonth) }).inject(tr);
this
.
createYearSelectTd
(
tr
);
this
.
createMonthSelectTd
(
tr
);
this
.
createStatusSelectTd
(
tr
);
this
.
createAppealReasonTd
(
tr
);
this
.
createUnitTd
(
tr
);
this
.
createPersonTd
(
tr
);
//this.createYearSelectTd( tr );
//this.createMonthSelectTd( tr );
this
.
createActionTd
(
tr
);
},
createStatusSelectTd
:
function
(
tr
){
...
...
@@ -192,16 +192,16 @@ MWF.xApplication.Attendance.AppealExplorer = new Class({
"
styles
"
:
this
.
css
.
filterButton
}).
inject
(
td
);
input
.
addEvent
(
"
click
"
,
function
(){
var
year
=
this
.
preMonthDate
.
getFullYear
().
toString
();
/*
var year = this.preMonthDate.getFullYear().toString();
var month = (this.preMonthDate.getMonth()+1).toString();
if
(
month
.
length
==
1
)
month
=
"
0
"
+
month
;
if( month.length == 1 )month = "0"+month;
*/
var
filterData
=
{
status
:
this
.
status
.
getValue
(),
appealReason
:
this
.
appealReason
.
getValue
(),
unitName
:
this
.
unitName
.
getValue
(),
empName
:
this
.
empName
.
getValue
(),
yearString
:
year
,
//
this.yearString.getValue(),
monthString
:
month
//
this.monthString.getValue()
yearString
:
this
.
yearString
.
getValue
(),
monthString
:
this
.
monthString
.
getValue
()
}
this
.
loadView
(
filterData
);
}.
bind
(
this
))
...
...
o2web/source/x_component_Attendance/MyAppeal.js
浏览文件 @
2e5f05a3
...
...
@@ -39,9 +39,12 @@ MWF.xApplication.Attendance.MyAppeal = new Class({
"
styles
"
:
this
.
css
.
fileterNode
}).
inject
(
this
.
node
);
var
html
=
"
<table width='100%' bordr='0' cellpadding='5' cellspacing='0' style='width: 5
6
0px;font-size: 14px;color:#666'>
"
+
var
html
=
"
<table width='100%' bordr='0' cellpadding='5' cellspacing='0' style='width: 5
8
0px;font-size: 14px;color:#666'>
"
+
"
<tr>
"
+
"
<td styles='filterTableTitle' item='date'></td>
"
+
"
<td styles='filterTableTitle' lable='yearString'></td>
"
+
"
<td styles='filterTableValue' item='yearString'></td>
"
+
"
<td styles='filterTableTitle' lable='monthString'></td>
"
+
"
<td styles='filterTableValue' item='monthString'></td>
"
+
"
<td styles='filterTableTitle' lable='status'></td>
"
+
"
<td styles='filterTableValue' item='status'></td>
"
+
"
<td styles='filterTableTitle' lable='appealReason'></td>
"
+
...
...
@@ -55,7 +58,39 @@ MWF.xApplication.Attendance.MyAppeal = new Class({
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
isEdited
:
true
,
itemTemplate
:
{
date
:
{
"
type
"
:
"
innerText
"
,
value
:
(
new
Date
).
format
(
this
.
app
.
lp
.
dateFormatMonth
)
},
yearString
:
{
text
:
"
年度
"
,
"
type
"
:
"
select
"
,
"
selectValue
"
:
function
(){
var
years
=
[];
var
year
=
new
Date
().
getFullYear
();
for
(
var
i
=
0
;
i
<
6
;
i
++
){
years
.
push
(
year
--
);
}
return
years
;
},
"
event
"
:
{
"
change
"
:
function
(
item
,
ev
){
var
values
=
this
.
getDateSelectValue
();
item
.
form
.
getItem
(
"
date
"
).
resetItemOptions
(
values
,
values
)
}.
bind
(
this
)
}
},
monthString
:
{
text
:
"
月份
"
,
"
type
"
:
"
select
"
,
"
defaultValue
"
:
function
(){
var
month
=
(
new
Date
().
getMonth
()
+
1
).
toString
();
return
month
.
length
==
1
?
"
0
"
+
month
:
month
;
},
"
selectValue
"
:[
""
,
"
01
"
,
"
02
"
,
"
03
"
,
"
04
"
,
"
05
"
,
"
06
"
,
"
07
"
,
"
08
"
,
"
09
"
,
"
10
"
,
"
11
"
,
"
12
"
],
"
event
"
:
{
"
change
"
:
function
(
item
,
ev
){
var
values
=
this
.
getDateSelectValue
();
item
.
form
.
getItem
(
"
date
"
).
resetItemOptions
(
values
,
values
)
}.
bind
(
this
)
}
},
status
:
{
"
text
"
:
"
申述状态
"
,
"
type
"
:
"
select
"
,
...
...
@@ -263,10 +298,10 @@ MWF.xApplication.Attendance.MyAppeal.View = new Class({
var
id
=
(
this
.
items
.
length
)
?
this
.
items
[
this
.
items
.
length
-
1
].
data
.
id
:
"
(0)
"
;
var
filter
=
this
.
filterData
||
{};
var
month
=
(
new
Date
().
getMonth
()
+
1
).
toString
();
/*
var month = (new Date().getMonth()+1).toString();
if( month.length == 1 )month = "0"+month;
filter.yearString = new Date().getFullYear().toString();
filter
.
monthString
=
month
;
filter.monthString = month;
*/
filter
.
empName
=
layout
.
desktop
.
session
.
user
.
distinguishedName
;
this
.
actions
.
listAppealFilterNext
(
id
,
count
,
filter
,
function
(
json
){
...
...
o2web/source/x_component_Attendance/MyDetail.js
浏览文件 @
2e5f05a3
...
...
@@ -153,7 +153,10 @@ MWF.xApplication.Attendance.MyDetail.Explorer = new Class({
var
html
=
"
<table width='100%' bordr='0' cellpadding='5' cellspacing='0' styles='filterTable'>
"
+
"
<tr>
"
+
"
<td styles='filterTableTitle'>
"
+
(
new
Date
()).
format
(
"
%Y年%m月
"
)
+
"
</td>
"
+
"
<td styles='filterTableTitle' lable='cycleYear'></td>
"
+
"
<td styles='filterTableValue' item='cycleYear'></td>
"
+
"
<td styles='filterTableTitle' lable='cycleMonth'></td>
"
+
"
<td styles='filterTableValue' item='cycleMonth'></td>
"
+
"
<td styles='filterTableTitle' lable='date'></td>
"
+
"
<td styles='filterTableValue' item='date'></td>
"
+
"
<td styles='filterTableTitle' lable='isAbsent'></td>
"
+
...
...
@@ -171,6 +174,39 @@ MWF.xApplication.Attendance.MyDetail.Explorer = new Class({
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
isEdited
:
true
,
itemTemplate
:
{
cycleYear
:
{
text
:
"
年度
"
,
"
type
"
:
"
select
"
,
"
selectValue
"
:
function
(){
var
years
=
[];
var
year
=
new
Date
().
getFullYear
();
for
(
var
i
=
0
;
i
<
6
;
i
++
){
years
.
push
(
year
--
);
}
return
years
;
},
"
event
"
:
{
"
change
"
:
function
(
item
,
ev
){
var
values
=
this
.
getDateSelectValue
();
item
.
form
.
getItem
(
"
date
"
).
resetItemOptions
(
values
,
values
)
}.
bind
(
this
)
}
},
cycleMonth
:
{
text
:
"
月份
"
,
"
type
"
:
"
select
"
,
"
defaultValue
"
:
function
(){
var
month
=
(
new
Date
().
getMonth
()
+
1
).
toString
();
return
month
.
length
==
1
?
"
0
"
+
month
:
month
;
},
"
selectValue
"
:[
""
,
"
01
"
,
"
02
"
,
"
03
"
,
"
04
"
,
"
05
"
,
"
06
"
,
"
07
"
,
"
08
"
,
"
09
"
,
"
10
"
,
"
11
"
,
"
12
"
],
"
event
"
:
{
"
change
"
:
function
(
item
,
ev
){
var
values
=
this
.
getDateSelectValue
();
item
.
form
.
getItem
(
"
date
"
).
resetItemOptions
(
values
,
values
)
}.
bind
(
this
)
}
},
date
:
{
text
:
"
日期
"
,
"
type
"
:
"
select
"
,
"
selectValue
"
:
function
(){
var
year
=
this
.
preMonthDate
.
getFullYear
()
;
var
month
=
this
.
preMonthDate
.
getMonth
()
;
...
...
@@ -193,11 +229,11 @@ MWF.xApplication.Attendance.MyDetail.Explorer = new Class({
click
:
function
(){
var
result
=
this
.
form
.
getResult
(
false
,
null
,
false
,
true
,
false
);
var
year
=
this
.
preMonthDate
.
getFullYear
().
toString
();
/*
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
;
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
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录