Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
barry cho
O2OA
Commits
6c4ca20e
Commit
6c4ca20e
authored
3 years ago
by
lingqiao
Browse files
Options
Download
Email Patches
Plain Diff
修改导入加MASK
parent
ca9072dd
develop
master
release
7.0.5
7.0.4
7.0.3
7.0.2
7.0.1
7.0.0
6.4.7
6.4.6
6.4.5
6.4.4
6.4.3
6.4.2
6.4.1
6.4.0
develop-7.1
develop-7.0
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
o2web/source/x_component_Org/Main.js
+12
-0
o2web/source/x_component_Org/Main.js
o2web/source/x_component_Org/lp/zh-cn.js
+1
-1
o2web/source/x_component_Org/lp/zh-cn.js
with
13 additions
and
1 deletion
+13
-1
o2web/source/x_component_Org/Main.js
+
12
-
0
View file @
6c4ca20e
...
...
@@ -181,6 +181,7 @@ MWF.xApplication.Org.Main = new Class({
},
loadPersonImport
:
function
(){
var
action
=
o2
.
Actions
.
get
(
"
x_organization_assemble_control
"
);
MWF
.
require
(
"
MWF.widget.MaskNode
"
,
null
,
false
);
var
url
=
o2
.
filterUrl
(
action
.
action
.
address
+
action
.
action
.
actions
.
getImportPersonTemplate
.
uri
);
var
infor
=
this
.
lp
.
importPersonInfor
.
replace
(
"
{url}
"
,
url
);
...
...
@@ -197,16 +198,27 @@ MWF.xApplication.Org.Main = new Class({
"
method
"
:
"
importPerson
"
,
"
multiple
"
:
false
,
"
onCompleted
"
:
function
(
json
){
if
(
!
this
.
maskNode
){
this
.
maskNode
=
new
MWF
.
widget
.
MaskNode
(
this
.
importConfiguratorContentNode
,
{
"
style
"
:
"
bam
"
});
this
.
maskNode
.
load
();
}
var
url
=
o2
.
filterUrl
(
action
.
action
.
address
+
action
.
action
.
actions
.
getImportPersonResault
.
uri
);
url
=
url
.
replace
(
"
{flag}
"
,
json
.
data
.
flag
);
var
result
=
this
.
lp
.
importPersonResult
.
replace
(
"
{url}
"
,
url
);
this
.
importPersonResultNode
.
set
(
"
html
"
,
result
);
this
.
importPersonResultNode
.
show
();
if
(
this
.
maskNode
)
this
.
maskNode
.
hide
(
function
(){
MWF
.
release
(
this
.
maskNode
);
this
.
maskNode
=
null
;
}.
bind
(
this
));
}.
bind
(
this
)
}).
load
();
}.
bind
(
this
));
}.
bind
(
this
));
var
exporturl
=
o2
.
filterUrl
(
o2
.
Actions
.
getHost
(
"
x_cms_assemble_control
"
)
+
"
/x_organization_assemble_control/jaxrs/export/export/all
"
);
this
.
exportPersonNode
.
set
(
"
text
"
,
this
.
lp
.
exportPersonText
);
this
.
exportPersonNode
.
set
(
"
href
"
,
exporturl
);
...
...
This diff is collapsed.
Click to expand it.
o2web/source/x_component_Org/lp/zh-cn.js
+
1
-
1
View file @
6c4ca20e
...
...
@@ -255,7 +255,7 @@ MWF.xApplication.Org.LP = {
"
importPersonTitle
"
:
"
组织导入导出
"
,
"
importPersonInfor
"
:
"
您可以通过Excel批量导入组织,<a target='_blank' href='{url}' >点击此处</a>获取组织导入模板
"
,
"
importPersonAction
"
:
"
上传Excel文件,导入组织
"
,
"
importPersonResult
"
:
"
组织已导入
,<a target='_blank' href='{url}' >点击此处</a>查看导入结果
"
,
"
importPersonResult
"
:
"
数据导入已处理
,<a target='_blank' href='{url}' >点击此处</a>查看导入结果
(如有校验未通过则不会导入任何数据)
"
,
"
exportPersonText
"
:
"
导出组织到excel文件
"
,
"
queryPrivateConfigTitle
"
:
"
个人通讯录权限配置
"
,
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help