Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_42566577
o2oa
提交
dc079a52
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,发现更多精彩内容 >>
提交
dc079a52
编写于
11月 13, 2020
作者:
NoSubject
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
base认证异步
上级
f49252ba
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
38 addition
and
25 deletion
+38
-25
o2web/source/x_component_process_Work/Main.js
o2web/source/x_component_process_Work/Main.js
+5
-5
o2web/source/x_desktop/js/base.js
o2web/source/x_desktop/js/base.js
+31
-20
o2web/source/x_desktop/workmobile.html
o2web/source/x_desktop/workmobile.html
+1
-0
o2web/source/x_desktop/workmobilewithaction.html
o2web/source/x_desktop/workmobilewithaction.html
+1
-0
未找到文件。
o2web/source/x_component_process_Work/Main.js
浏览文件 @
dc079a52
...
...
@@ -165,13 +165,13 @@ MWF.xApplication.process.Work.Main = new Class({
delete
this
.
options
.
workcompletedid
;
this
.
loadWork
();
}
else
{
this
.
close
();
//
this.close();
}
}
}
}.
bind
(
this
);
if
(
this
.
options
.
form
&&
this
.
options
.
form
.
id
){
if
(
(
this
.
options
.
form
&&
this
.
options
.
form
.
id
)
||
this
.
options
.
form
id
){
o2
.
Actions
.
invokeAsync
([
{
"
action
"
:
this
.
action
,
"
name
"
:
"
loadWorkV2
"
},
{
"
action
"
:
this
.
action
,
"
name
"
:
"
getWorkLog
"
},
...
...
@@ -187,7 +187,7 @@ MWF.xApplication.process.Work.Main = new Class({
check
();
}.
bind
(
this
),
"
failure
"
:
function
(){
//this.close();
}.
bind
(
this
)},
id
,
id
,
id
,
[
this
.
options
.
form
.
id
]);
}.
bind
(
this
)},
id
,
id
,
id
,
[
this
.
options
.
form
id
||
this
.
options
.
form
.
id
]);
}
else
{
this
.
action
.
lookupFormWithWork
(
id
,
function
(
json
){
var
formId
=
json
.
data
.
id
;
...
...
@@ -322,10 +322,10 @@ MWF.xApplication.process.Work.Main = new Class({
}
}
}
else
{
this
.
close
();
//
this.close();
}
}.
bind
(
this
),
function
(){
this
.
close
();
//
this.close();
}.
bind
(
this
));
},
loadWorkByDraft
:
function
(
work
,
data
){
...
...
o2web/source/x_desktop/js/base.js
浏览文件 @
dc079a52
...
...
@@ -437,11 +437,13 @@ o2.addReady(function () {
var
_load
=
function
()
{
var
_loadApp
=
function
(
json
)
{
//用户已经登录
layout
.
user
=
json
.
data
;
layout
.
session
=
layout
.
session
||
{};
layout
.
session
.
user
=
json
.
data
;
layout
.
session
.
token
=
json
.
data
.
token
;
layout
.
desktop
.
session
=
layout
.
session
;
if
(
json
){
layout
.
user
=
json
.
data
;
layout
.
session
=
layout
.
session
||
{};
layout
.
session
.
user
=
json
.
data
;
layout
.
session
.
token
=
json
.
data
.
token
;
layout
.
desktop
.
session
=
layout
.
session
;
}
_loadProgressBar
(
true
);
while
(
layout
.
readys
&&
layout
.
readys
.
length
)
{
...
...
@@ -456,27 +458,36 @@ o2.addReady(function () {
Cookie
.
write
(
"
x-token
"
,
options
[
"
x-token
"
]);
}
_loadApp
();
//先判断用户是否登录
o2
.
Actions
.
get
(
"
x_organization_assemble_authentication
"
).
getAuthentication
(
function
(
json
)
{
//已经登录
_loadProgressBar
();
_loadApp
(
json
);
//_loadProgressBar();
layout
.
user
=
json
.
data
;
layout
.
session
=
layout
.
session
||
{};
layout
.
session
.
user
=
json
.
data
;
layout
.
session
.
token
=
json
.
data
.
token
;
layout
.
desktop
.
session
=
layout
.
session
;
//_loadApp(json);
}.
bind
(
this
),
function
(
json
)
{
_loadProgressBar
();
//
_loadProgressBar();
//允许匿名访问
if
(
layout
.
anonymous
)
{
_loadProgressBar
(
true
);
_loadApp
({
data
:
{
user
:
"
anonymous
"
,
session
:
{
user
:
{
name
:
"
anonymous
"
,
roleList
:
[]
}
}
}
});
//
_loadProgressBar(true);
//
_loadApp({
//
data : {
//
user: "anonymous",
//
session: {
//
user: {
//
name: "anonymous",
//
roleList: []
//
}
//
}
//
}
//
});
}
else
{
_loadProgressBar
(
true
);
if
(
layout
.
yqwx
)
{
...
...
o2web/source/x_desktop/workmobile.html
浏览文件 @
dc079a52
...
...
@@ -5,6 +5,7 @@
<link
rel=
"stylesheet"
type=
"text/css"
href=
"css/style.css"
charset=
"UTF-8"
/>
<link
rel=
"stylesheet"
href=
"css/mBoxNotice.css"
charset=
"UTF-8"
/>
<link
rel=
"stylesheet"
href=
"css/mBoxTooltip.css"
charset=
"UTF-8"
/>
<link
rel=
"icon"
href=
"data:;"
>
<script
src=
"../o2_core/o2.min.js"
></script>
<script
src=
"js/base_work.min.js"
></script>
...
...
o2web/source/x_desktop/workmobilewithaction.html
浏览文件 @
dc079a52
...
...
@@ -6,6 +6,7 @@
<link
rel=
"stylesheet"
type=
"text/css"
href=
"css/style.css"
charset=
"UTF-8"
/>
<link
rel=
"stylesheet"
href=
"css/mBoxNotice.css"
charset=
"UTF-8"
/>
<link
rel=
"stylesheet"
href=
"css/mBoxTooltip.css"
charset=
"UTF-8"
/>
<link
rel=
"icon"
href=
"data:;"
>
<script
src=
"../o2_core/o2.min.js"
></script>
<script
src=
"js/base_work.min.js"
></script>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录