Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
ef3d8de0
o2oa
项目概览
weixin_42566577
/
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,发现更多精彩内容 >>
提交
ef3d8de0
编写于
6月 29, 2022
作者:
楼
楼国栋
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'fix/attendance' into 'develop'
考勤相关的问题修改 See merge request o2oa/o2oa!735
上级
d386a4e5
7e96b87e
变更
9
显示空白变更内容
内联
并排
Showing
9 changed file
with
431 addition
and
213 deletion
+431
-213
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionReciveAttendanceMobile.java
.../jaxrs/attendancedetail/ActionReciveAttendanceMobile.java
+3
-0
o2web/source/x_component_Attendance/AppealExplorer.js
o2web/source/x_component_Attendance/AppealExplorer.js
+1
-1
o2web/source/x_component_Attendance/PeopleDetail.js
o2web/source/x_component_Attendance/PeopleDetail.js
+14
-2
o2web/source/x_component_Attendance/PeopleDingdingDetail.js
o2web/source/x_component_Attendance/PeopleDingdingDetail.js
+14
-2
o2web/source/x_component_Attendance/PeopleQywxDetail.js
o2web/source/x_component_Attendance/PeopleQywxDetail.js
+14
-2
o2web/source/x_component_Attendance/UnitDetail.js
o2web/source/x_component_Attendance/UnitDetail.js
+78
-43
o2web/source/x_component_Attendance/UnitDingdingDetail.js
o2web/source/x_component_Attendance/UnitDingdingDetail.js
+115
-81
o2web/source/x_component_Attendance/UnitQywxDetail.js
o2web/source/x_component_Attendance/UnitQywxDetail.js
+115
-81
o2web/source/x_desktop/js/o2m.api.js
o2web/source/x_desktop/js/o2m.api.js
+77
-1
未找到文件。
o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionReciveAttendanceMobile.java
浏览文件 @
ef3d8de0
...
...
@@ -72,6 +72,9 @@ public class ActionReciveAttendanceMobile extends BaseAction {
}
}
if
(
check
){
if
(
StringUtils
.
isNotEmpty
(
wrapIn
.
getDescription
()))
{
attendanceDetailMobile
.
setDescription
(
wrapIn
.
getDescription
());
}
if
(
StringUtils
.
isNotEmpty
(
wrapIn
.
getRecordAddress
())
){
attendanceDetailMobile
.
setRecordAddress
(
wrapIn
.
getRecordAddress
()
);
}
...
...
o2web/source/x_component_Attendance/AppealExplorer.js
浏览文件 @
ef3d8de0
...
...
@@ -241,7 +241,7 @@ MWF.xApplication.Attendance.AppealExplorer = new Class({
"
onComplete
"
:
function
(
items
){
var
arr
=
[];
items
.
each
(
function
(
item
){
arr
.
push
(
item
.
data
.
n
ame
);
arr
.
push
(
item
.
data
.
distinguishedN
ame
);
}.
bind
(
this
));
el
.
set
(
"
value
"
,
arr
.
join
(
"
,
"
));
}.
bind
(
this
)
...
...
o2web/source/x_component_Attendance/PeopleDetail.js
浏览文件 @
ef3d8de0
...
...
@@ -133,11 +133,17 @@ MWF.xApplication.Attendance.PeopleDetail.Explorer = new Class({
this
.
fileterNode
.
set
(
"
html
"
,
html
);
MWF
.
xDesktop
.
requireApp
(
"
Template
"
,
"
MForm
"
,
function
(){
var
empSelector
=
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
person
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
if
(
!
this
.
app
.
isAdmin
()
&&
this
.
app
.
manageUnits
){
empSelector
=
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
identity
"
,
"
units
"
:
this
.
app
.
manageUnits
,
orgOptions
:
{
"
resultType
"
:
"
person
"
,
}
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
{
q_empName
:
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
person
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
}
,
q_empName
:
empSelector
,
cycleYear
:
{
text
:
lp
.
annuaal
,
"
type
"
:
"
select
"
,
...
...
@@ -499,11 +505,17 @@ MWF.xApplication.Attendance.PeopleDetail.DetailStaticExplorer = new Class({
this
.
fileterNode
.
set
(
"
html
"
,
html
);
MWF
.
xDesktop
.
requireApp
(
"
Template
"
,
"
MForm
"
,
function
(){
var
empSelector
=
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
person
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
if
(
!
this
.
app
.
isAdmin
()
&&
this
.
app
.
manageUnits
){
empSelector
=
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
identity
"
,
"
units
"
:
this
.
app
.
manageUnits
,
orgOptions
:
{
"
resultType
"
:
"
person
"
,
}
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
{
q_empName
:
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
person
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
}
,
q_empName
:
empSelector
,
cycleYear
:
{
text
:
lp
.
annuaal
,
"
type
"
:
"
select
"
,
...
...
o2web/source/x_component_Attendance/PeopleDingdingDetail.js
浏览文件 @
ef3d8de0
...
...
@@ -114,11 +114,17 @@ MWF.xApplication.Attendance.PeopleDingdingDetail.Explorer = new Class({
this
.
fileterNode
.
set
(
"
html
"
,
html
);
MWF
.
xDesktop
.
requireApp
(
"
Template
"
,
"
MForm
"
,
function
()
{
var
empSelector
=
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
person
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
if
(
!
this
.
app
.
isAdmin
()
&&
this
.
app
.
manageUnits
){
empSelector
=
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
identity
"
,
"
units
"
:
this
.
app
.
manageUnits
,
orgOptions
:
{
"
resultType
"
:
"
person
"
,
}
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
{
person
:
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
person
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
}
,
person
:
empSelector
,
year
:
{
text
:
lp
.
annuaal
,
"
type
"
:
"
select
"
,
...
...
@@ -264,11 +270,17 @@ MWF.xApplication.Attendance.PeopleDingdingDetail.DetailStaticExplorer = new Clas
this
.
fileterNode
.
set
(
"
html
"
,
html
);
MWF
.
xDesktop
.
requireApp
(
"
Template
"
,
"
MForm
"
,
function
()
{
var
empSelector
=
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
person
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
if
(
!
this
.
app
.
isAdmin
()
&&
this
.
app
.
manageUnits
){
empSelector
=
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
identity
"
,
"
units
"
:
this
.
app
.
manageUnits
,
orgOptions
:
{
"
resultType
"
:
"
person
"
,
}
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
{
q_empName
:
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
person
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
}
,
q_empName
:
empSelector
,
cycleYear
:
{
text
:
lp
.
annuaal
,
"
type
"
:
"
select
"
,
...
...
o2web/source/x_component_Attendance/PeopleQywxDetail.js
浏览文件 @
ef3d8de0
...
...
@@ -114,11 +114,17 @@ MWF.xApplication.Attendance.PeopleQywxDetail.Explorer = new Class({
this
.
fileterNode
.
set
(
"
html
"
,
html
);
MWF
.
xDesktop
.
requireApp
(
"
Template
"
,
"
MForm
"
,
function
()
{
var
empSelector
=
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
person
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
if
(
!
this
.
app
.
isAdmin
()
&&
this
.
app
.
manageUnits
){
empSelector
=
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
identity
"
,
"
units
"
:
this
.
app
.
manageUnits
,
orgOptions
:
{
"
resultType
"
:
"
person
"
,
}
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
{
person
:
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
person
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
}
,
person
:
empSelector
,
year
:
{
text
:
lp
.
annuaal
,
"
type
"
:
"
select
"
,
...
...
@@ -264,11 +270,17 @@ MWF.xApplication.Attendance.PeopleQywxDetail.DetailStaticExplorer = new Class({
this
.
fileterNode
.
set
(
"
html
"
,
html
);
MWF
.
xDesktop
.
requireApp
(
"
Template
"
,
"
MForm
"
,
function
()
{
var
empSelector
=
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
person
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
if
(
!
this
.
app
.
isAdmin
()
&&
this
.
app
.
manageUnits
){
empSelector
=
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
identity
"
,
"
units
"
:
this
.
app
.
manageUnits
,
orgOptions
:
{
"
resultType
"
:
"
person
"
,
}
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
{
q_empName
:
{
text
:
lp
.
person
,
type
:
"
org
"
,
orgType
:
"
person
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
}
,
q_empName
:
empSelector
,
cycleYear
:
{
text
:
lp
.
annuaal
,
"
type
"
:
"
select
"
,
...
...
o2web/source/x_component_Attendance/UnitDetail.js
浏览文件 @
ef3d8de0
...
...
@@ -116,11 +116,7 @@ MWF.xApplication.Attendance.UnitDetail.Explorer = new Class({
this
.
fileterNode
.
set
(
"
html
"
,
html
);
MWF
.
xDesktop
.
requireApp
(
"
Template
"
,
"
MForm
"
,
function
(){
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
{
q_unitName
:
{
text
:
lp
.
unit
,
type
:
"
org
"
,
orgType
:
"
unit
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
},
var
itemTemplate
=
{
cycleYear
:
{
text
:
lp
.
annuaal
,
"
type
"
:
"
select
"
,
...
...
@@ -193,8 +189,29 @@ MWF.xApplication.Attendance.UnitDetail.Explorer = new Class({
debugger
;
this
.
actions
.
detailsExportStream
(
result
.
q_topUnitName
,
result
.
q_unitName
,
result
.
q_empName
,
result
.
cycleYear
,
result
.
cycleMonth
,
result
.
q_date
,
result
.
isAbsent
,
result
.
isLackOfTime
,
result
.
isLate
,
true
);
}.
bind
(
this
)
}}
}
}
};
if
(
this
.
app
.
isAdmin
()
){
itemTemplate
.
q_unitName
=
{
text
:
lp
.
unit
,
type
:
"
org
"
,
orgType
:
"
unit
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
else
{
var
unitNameArr
=
[]
var
unitValueArr
=
this
.
app
.
manageUnits
;
for
(
let
i
=
0
;
i
<
unitValueArr
.
length
;
i
++
)
{
const
element
=
unitValueArr
[
i
];
if
(
element
.
indexOf
(
"
@
"
)
>
-
1
){
const
name
=
element
.
split
(
"
@
"
)[
0
];
unitNameArr
.
push
(
name
);
}
else
{
unitNameArr
.
push
(
element
);
}
}
itemTemplate
.
q_unitName
=
{
text
:
lp
.
unit
,
type
:
"
select
"
,
selectValue
:
unitValueArr
,
"
selectText
"
:
unitNameArr
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
itemTemplate
},
this
.
app
,
this
.
app
.
css
);
this
.
form
.
load
();
}.
bind
(
this
),
true
);
...
...
@@ -492,10 +509,7 @@ MWF.xApplication.Attendance.UnitDetail.DetailStaticExplorer = new Class({
this
.
fileterNode
.
set
(
"
html
"
,
html
);
MWF
.
xDesktop
.
requireApp
(
"
Template
"
,
"
MForm
"
,
function
(){
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
{
var
itemTemplate
=
{
q_unitName
:
{
text
:
lp
.
unit
,
type
:
"
org
"
,
orgType
:
"
unit
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
},
cycleYear
:
{
text
:
lp
.
annuaal
,
...
...
@@ -532,7 +546,28 @@ MWF.xApplication.Attendance.UnitDetail.DetailStaticExplorer = new Class({
this
.
actions
.
exportUnitStatisticAttachment
(
result
.
q_unitName
,
result
.
cycleYear
,
result
.
cycleMonth
,
true
);
}.
bind
(
this
)
}}
};
if
(
this
.
app
.
isAdmin
()
){
itemTemplate
.
q_unitName
=
{
text
:
lp
.
unit
,
type
:
"
org
"
,
orgType
:
"
unit
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
else
{
var
unitNameArr
=
[]
var
unitValueArr
=
this
.
app
.
manageUnits
;
for
(
let
i
=
0
;
i
<
unitValueArr
.
length
;
i
++
)
{
const
element
=
unitValueArr
[
i
];
if
(
element
.
indexOf
(
"
@
"
)
>
-
1
){
const
name
=
element
.
split
(
"
@
"
)[
0
];
unitNameArr
.
push
(
name
);
}
else
{
unitNameArr
.
push
(
element
);
}
}
itemTemplate
.
q_unitName
=
{
text
:
lp
.
unit
,
type
:
"
select
"
,
selectValue
:
unitValueArr
,
"
selectText
"
:
unitNameArr
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
itemTemplate
},
this
.
app
,
this
.
app
.
css
);
this
.
form
.
load
();
}.
bind
(
this
),
true
);
...
...
o2web/source/x_component_Attendance/UnitDingdingDetail.js
浏览文件 @
ef3d8de0
...
...
@@ -113,10 +113,7 @@ MWF.xApplication.Attendance.UnitDingdingDetail.Explorer = new Class({
this
.
fileterNode
.
set
(
"
html
"
,
html
);
MWF
.
xDesktop
.
requireApp
(
"
Template
"
,
"
MForm
"
,
function
()
{
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
{
var
itemTemplate
=
{
unit
:
{
text
:
lp
.
unit
,
type
:
"
org
"
,
orgType
:
"
unit
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
},
year
:
{
text
:
lp
.
annuaal
,
...
...
@@ -167,6 +164,26 @@ MWF.xApplication.Attendance.UnitDingdingDetail.Explorer = new Class({
}
}
}
if
(
this
.
app
.
isAdmin
()
){
itemTemplate
.
q_unitName
=
{
text
:
lp
.
unit
,
type
:
"
org
"
,
orgType
:
"
unit
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
else
{
var
unitNameArr
=
[]
var
unitValueArr
=
this
.
app
.
manageUnits
;
for
(
let
i
=
0
;
i
<
unitValueArr
.
length
;
i
++
)
{
const
element
=
unitValueArr
[
i
];
if
(
element
.
indexOf
(
"
@
"
)
>
-
1
){
const
name
=
element
.
split
(
"
@
"
)[
0
];
unitNameArr
.
push
(
name
);
}
else
{
unitNameArr
.
push
(
element
);
}
}
itemTemplate
.
q_unitName
=
{
text
:
lp
.
unit
,
type
:
"
select
"
,
selectValue
:
unitValueArr
,
"
selectText
"
:
unitNameArr
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
itemTemplate
},
this
.
app
,
this
.
app
.
css
);
this
.
form
.
load
();
}.
bind
(
this
),
true
);
...
...
@@ -251,10 +268,7 @@ MWF.xApplication.Attendance.UnitDingdingDetail.DetailStaticExplorer = new Class(
this
.
fileterNode
.
set
(
"
html
"
,
html
);
MWF
.
xDesktop
.
requireApp
(
"
Template
"
,
"
MForm
"
,
function
()
{
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
{
var
itemTemplate
=
{
q_unitName
:
{
text
:
lp
.
unit
,
type
:
"
org
"
,
orgType
:
"
unit
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
},
cycleYear
:
{
text
:
lp
.
annuaal
,
...
...
@@ -287,6 +301,26 @@ MWF.xApplication.Attendance.UnitDingdingDetail.DetailStaticExplorer = new Class(
}
}
}
if
(
this
.
app
.
isAdmin
()
){
itemTemplate
.
q_unitName
=
{
text
:
lp
.
unit
,
type
:
"
org
"
,
orgType
:
"
unit
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
else
{
var
unitNameArr
=
[]
var
unitValueArr
=
this
.
app
.
manageUnits
;
for
(
let
i
=
0
;
i
<
unitValueArr
.
length
;
i
++
)
{
const
element
=
unitValueArr
[
i
];
if
(
element
.
indexOf
(
"
@
"
)
>
-
1
){
const
name
=
element
.
split
(
"
@
"
)[
0
];
unitNameArr
.
push
(
name
);
}
else
{
unitNameArr
.
push
(
element
);
}
}
itemTemplate
.
q_unitName
=
{
text
:
lp
.
unit
,
type
:
"
select
"
,
selectValue
:
unitValueArr
,
"
selectText
"
:
unitNameArr
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
itemTemplate
},
this
.
app
,
this
.
app
.
css
);
this
.
form
.
load
();
}.
bind
(
this
),
true
);
...
...
o2web/source/x_component_Attendance/UnitQywxDetail.js
浏览文件 @
ef3d8de0
...
...
@@ -113,10 +113,7 @@ MWF.xApplication.Attendance.UnitQywxDetail.Explorer = new Class({
this
.
fileterNode
.
set
(
"
html
"
,
html
);
MWF
.
xDesktop
.
requireApp
(
"
Template
"
,
"
MForm
"
,
function
()
{
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
{
var
itemTemplate
=
{
unit
:
{
text
:
lp
.
unit
,
type
:
"
org
"
,
orgType
:
"
unit
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
200px
"
}
},
year
:
{
text
:
lp
.
annuaal
,
...
...
@@ -167,6 +164,26 @@ MWF.xApplication.Attendance.UnitQywxDetail.Explorer = new Class({
}
}
}
if
(
this
.
app
.
isAdmin
()
){
itemTemplate
.
unit
=
{
text
:
lp
.
unit
,
type
:
"
org
"
,
orgType
:
"
unit
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
else
{
var
unitNameArr
=
[]
var
unitValueArr
=
this
.
app
.
manageUnits
;
for
(
let
i
=
0
;
i
<
unitValueArr
.
length
;
i
++
)
{
const
element
=
unitValueArr
[
i
];
if
(
element
.
indexOf
(
"
@
"
)
>
-
1
){
const
name
=
element
.
split
(
"
@
"
)[
0
];
unitNameArr
.
push
(
name
);
}
else
{
unitNameArr
.
push
(
element
);
}
}
itemTemplate
.
unit
=
{
text
:
lp
.
unit
,
type
:
"
select
"
,
selectValue
:
unitValueArr
,
"
selectText
"
:
unitNameArr
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
itemTemplate
},
this
.
app
,
this
.
app
.
css
);
this
.
form
.
load
();
}.
bind
(
this
),
true
);
...
...
@@ -251,10 +268,7 @@ MWF.xApplication.Attendance.UnitQywxDetail.DetailStaticExplorer = new Class({
this
.
fileterNode
.
set
(
"
html
"
,
html
);
MWF
.
xDesktop
.
requireApp
(
"
Template
"
,
"
MForm
"
,
function
()
{
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
{
var
itemTemplate
=
{
q_unitName
:
{
text
:
lp
.
unit
,
type
:
"
org
"
,
orgType
:
"
unit
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
200px
"
}
},
cycleYear
:
{
text
:
lp
.
annuaal
,
...
...
@@ -287,6 +301,26 @@ MWF.xApplication.Attendance.UnitQywxDetail.DetailStaticExplorer = new Class({
}
}
}
if
(
this
.
app
.
isAdmin
()
){
itemTemplate
.
q_unitName
=
{
text
:
lp
.
unit
,
type
:
"
org
"
,
orgType
:
"
unit
"
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
else
{
var
unitNameArr
=
[]
var
unitValueArr
=
this
.
app
.
manageUnits
;
for
(
let
i
=
0
;
i
<
unitValueArr
.
length
;
i
++
)
{
const
element
=
unitValueArr
[
i
];
if
(
element
.
indexOf
(
"
@
"
)
>
-
1
){
const
name
=
element
.
split
(
"
@
"
)[
0
];
unitNameArr
.
push
(
name
);
}
else
{
unitNameArr
.
push
(
element
);
}
}
itemTemplate
.
q_unitName
=
{
text
:
lp
.
unit
,
type
:
"
select
"
,
selectValue
:
unitValueArr
,
"
selectText
"
:
unitNameArr
,
notEmpty
:
true
,
style
:
{
"
min-width
"
:
"
100px
"
}
};
}
this
.
form
=
new
MForm
(
this
.
fileterNode
,
{},
{
style
:
"
attendance
"
,
isEdited
:
true
,
itemTemplate
:
itemTemplate
},
this
.
app
,
this
.
app
.
css
);
this
.
form
.
load
();
}.
bind
(
this
),
true
);
...
...
o2web/source/x_desktop/js/o2m.api.js
浏览文件 @
ef3d8de0
...
...
@@ -1167,6 +1167,28 @@
this
.
o2m
.
util
.
navigation
.
goBack
=
_o2m_u_navigation_goBack
;
//o2m.util.navigation.openOtherApp 功能不完整,有很多限制。暂时不开放
this
.
o2m
.
util
.
navigation
.
openOtherAppSuccess
=
function
(
result
)
{
console
.
log
(
"
util navigation openOtherApp back, result:
"
+
result
);
};
var
_o2m_u_navigation_openOtherApp
=
function
(
c
)
{
var
onSuccess
=
c
&&
c
.
onSuccess
?
c
.
onSuccess
:
null
;
var
onFail
=
c
&&
c
.
onFail
?
c
.
onFail
:
null
;
if
(
onSuccess
&&
typeof
onSuccess
===
"
function
"
)
{
o2m
.
util
.
navigation
.
openOtherAppSuccess
=
onSuccess
;
}
var
schema
=
c
&&
c
.
schema
?
c
.
schema
:
""
;
var
body
=
{
type
:
"
navigation.openOtherApp
"
,
callback
:
"
o2m.util.navigation.openOtherAppSuccess
"
,
data
:
{
schema
:
schema
}
};
_util_post
(
body
,
onFail
);
};
this
.
o2m
.
util
.
navigation
.
openOtherApp
=
_o2m_u_navigation_openOtherApp
;
/** ***** BEGIN BIZ BLOCK *****
...
...
@@ -1179,11 +1201,13 @@
o2m.biz.contact.departmentsPicker
o2m.biz.contact.ComplexPicker
o2m.biz.contact.GroupPicker
o2m.biz.file.previewDoc
* ***** END UTIL BLOCK ******/
this
.
o2m
.
biz
=
{
contact
:
{}
contact
:
{},
file
:{}
};
var
_biz_post
=
function
(
body
,
onFail
)
{
...
...
@@ -1651,4 +1675,56 @@
//o2m.biz.contact.ComplexPicker
this
.
o2m
.
biz
.
file
.
PreviewDocSuccess
=
function
(
result
)
{
console
.
log
(
"
biz file preview doc back, result:
"
+
result
);
};
var
_o2m_b_file_preview
=
function
(
c
)
{
var
onSuccess
=
c
&&
c
.
onSuccess
?
c
.
onSuccess
:
null
;
var
onFail
=
c
&&
c
.
onFail
?
c
.
onFail
:
null
;
if
(
onSuccess
&&
typeof
onSuccess
===
"
function
"
)
{
o2m
.
biz
.
file
.
PreviewDocSuccess
=
onSuccess
;
}
var
fileUrl
=
c
&&
c
.
url
?
c
.
url
:
""
;
var
fileName
=
c
&&
c
.
fileName
?
c
.
fileName
:
""
;
var
body
=
{
type
:
"
file.previewDoc
"
,
callback
:
"
o2m.biz.file.PreviewDocSuccess
"
,
data
:
{
url
:
fileUrl
,
fileName
:
fileName
}
};
_biz_post
(
body
,
onFail
);
};
/**
* 文件预览
* @method PreviewDoc
* @memberOf o2m
* @o2membercategory biz
* @static
* @param {Object} obj PreviewDoc需要传入对象
* <pre><code class='language-js'>{
* url: String, //文件下载地址,比如https://www.o2oa.net/file.pdf
* fileName:String 预览的文件名称,比如file.pdf
* "onSuccess": function, //成功回调
* "onFail": function, //失败回调
* }</code></pre>
* @example
* o2m.biz.file.PreviewDoc({
* url: "https://www.o2oa.net/file.pdf", //文件下载地址
* fileName: "file.pdf",//预览的文件名称
* onSuccess : function(result) {
* //返回结果样例
* {
* result:true,
* message:""
* }
* },
* onFail : function(err) {}
* });
*/
this
.
o2m
.
biz
.
file
.
PreviewDoc
=
_o2m_b_file_preview
;
})();
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录