Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
ghsby
o2oa
提交
7f7a4c41
o2oa
项目概览
ghsby
/
o2oa
落后 Fork 源项目 2880 个版本
Fork自
浙江兰德纵横网络技术股份有限公司 / o2oa
通知
1
Star
1
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,发现更多精彩内容 >>
提交
7f7a4c41
编写于
10月 09, 2020
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
人员选择组织范围出错
上级
0013a944
变更
7
显示空白变更内容
内联
并排
Showing
7 changed file
with
36 addition
and
7 deletion
+36
-7
o2web/source/x_component_Selector/Identity.js
o2web/source/x_component_Selector/Identity.js
+4
-0
o2web/source/x_component_Selector/IdentityWidthDuty.js
o2web/source/x_component_Selector/IdentityWidthDuty.js
+4
-1
o2web/source/x_component_Selector/IdentityWidthDutyCategoryByUnit.js
...e/x_component_Selector/IdentityWidthDutyCategoryByUnit.js
+4
-0
o2web/source/x_component_Selector/Unit.js
o2web/source/x_component_Selector/Unit.js
+6
-0
o2web/source/x_component_Selector/UnitWithType.js
o2web/source/x_component_Selector/UnitWithType.js
+6
-0
o2web/source/x_component_process_Work/Processor.js
o2web/source/x_component_process_Work/Processor.js
+6
-3
o2web/source/x_component_process_Xform/Org.js
o2web/source/x_component_process_Xform/Org.js
+6
-3
未找到文件。
o2web/source/x_component_Selector/Identity.js
浏览文件 @
7f7a4c41
...
@@ -23,6 +23,10 @@ MWF.xApplication.Selector.Identity = new Class({
...
@@ -23,6 +23,10 @@ MWF.xApplication.Selector.Identity = new Class({
this
.
className
=
"
Identity
"
;
this
.
className
=
"
Identity
"
;
},
},
loadSelectItems
:
function
(){
loadSelectItems
:
function
(){
if
(
this
.
options
.
disabled
){
this
.
afterLoadSelectItem
();
return
;
}
if
(
this
.
className
===
"
Identity
"
&&
(
this
.
options
.
isCheckStatus
||
this
.
options
.
showSelectedCount
))
{
if
(
this
.
className
===
"
Identity
"
&&
(
this
.
options
.
isCheckStatus
||
this
.
options
.
showSelectedCount
))
{
var
unitList
=
[];
var
unitList
=
[];
...
...
o2web/source/x_component_Selector/IdentityWidthDuty.js
浏览文件 @
7f7a4c41
...
@@ -24,8 +24,11 @@ MWF.xApplication.Selector.IdentityWidthDuty = new Class({
...
@@ -24,8 +24,11 @@ MWF.xApplication.Selector.IdentityWidthDuty = new Class({
this
.
className
=
"
IdentityWidthDuty
"
this
.
className
=
"
IdentityWidthDuty
"
},
},
loadSelectItems
:
function
(
addToNext
){
loadSelectItems
:
function
(
addToNext
){
var
afterLoadSelectItemFun
=
this
.
afterLoadSelectItem
.
bind
(
this
);
var
afterLoadSelectItemFun
=
this
.
afterLoadSelectItem
.
bind
(
this
);
if
(
this
.
options
.
disabled
){
this
.
afterLoadSelectItem
();
return
;
}
if
(
this
.
options
.
resultType
===
"
person
"
){
if
(
this
.
options
.
resultType
===
"
person
"
){
if
(
this
.
titleTextNode
){
if
(
this
.
titleTextNode
){
...
...
o2web/source/x_component_Selector/IdentityWidthDutyCategoryByUnit.js
浏览文件 @
7f7a4c41
...
@@ -33,6 +33,10 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
...
@@ -33,6 +33,10 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
this
.
options
.
title
=
MWF
.
xApplication
.
Selector
.
LP
.
selectPerson
;
this
.
options
.
title
=
MWF
.
xApplication
.
Selector
.
LP
.
selectPerson
;
}
}
}
}
if
(
this
.
options
.
disabled
){
this
.
afterLoadSelectItem
();
return
;
}
if
(
this
.
options
.
dutys
.
length
){
if
(
this
.
options
.
dutys
.
length
){
this
.
loadInclude
(
function
()
{
this
.
loadInclude
(
function
()
{
...
...
o2web/source/x_component_Selector/Unit.js
浏览文件 @
7f7a4c41
...
@@ -21,6 +21,12 @@ MWF.xApplication.Selector.Unit = new Class({
...
@@ -21,6 +21,12 @@ MWF.xApplication.Selector.Unit = new Class({
this
.
className
=
"
Unit
"
;
this
.
className
=
"
Unit
"
;
},
},
loadSelectItems
:
function
(
addToNext
){
loadSelectItems
:
function
(
addToNext
){
if
(
this
.
options
.
disabled
){
this
.
afterLoadSelectItem
();
return
;
}
var
afterLoadSelectItemFun
=
this
.
afterLoadSelectItem
.
bind
(
this
);
var
afterLoadSelectItemFun
=
this
.
afterLoadSelectItem
.
bind
(
this
);
if
(
this
.
options
.
units
.
length
){
if
(
this
.
options
.
units
.
length
){
...
...
o2web/source/x_component_Selector/UnitWithType.js
浏览文件 @
7f7a4c41
...
@@ -21,6 +21,12 @@ MWF.xApplication.Selector.UnitWithType = new Class({
...
@@ -21,6 +21,12 @@ MWF.xApplication.Selector.UnitWithType = new Class({
this
.
className
=
"
UnitWithType
"
;
this
.
className
=
"
UnitWithType
"
;
},
},
loadSelectItems
:
function
(
addToNext
){
loadSelectItems
:
function
(
addToNext
){
if
(
this
.
options
.
disabled
){
this
.
afterLoadSelectItem
();
return
;
}
var
afterLoadSelectItemFun
=
this
.
afterLoadSelectItem
.
bind
(
this
);
var
afterLoadSelectItemFun
=
this
.
afterLoadSelectItem
.
bind
(
this
);
var
data
=
{};
var
data
=
{};
...
...
o2web/source/x_component_process_Work/Processor.js
浏览文件 @
7f7a4c41
...
@@ -1725,13 +1725,15 @@ if( MWF.xApplication.process.Xform && MWF.xApplication.process.Xform.Form ){
...
@@ -1725,13 +1725,15 @@ if( MWF.xApplication.process.Xform && MWF.xApplication.process.Xform.Form ){
if
(
this
.
json
.
identityRange
!==
"
all
"
){
if
(
this
.
json
.
identityRange
!==
"
all
"
){
if
(
!
identityOpt
.
noUnit
&&
(
!
identityOpt
.
units
||
!
identityOpt
.
units
.
length
)
){
if
(
!
identityOpt
.
noUnit
&&
(
!
identityOpt
.
units
||
!
identityOpt
.
units
.
length
)
){
this
.
form
.
notice
(
MWF
.
xApplication
.
process
.
Xform
.
LP
.
noIdentitySelectRange
,
"
error
"
,
this
.
node
);
this
.
form
.
notice
(
MWF
.
xApplication
.
process
.
Xform
.
LP
.
noIdentitySelectRange
,
"
error
"
,
this
.
node
);
return
false
;
identityOpt
.
disabled
=
true
;
// return false;
}
}
}
}
if
(
!
identityOpt
.
noUnit
&&
this
.
json
.
dutyRange
&&
this
.
json
.
dutyRange
!==
"
all
"
){
if
(
!
identityOpt
.
noUnit
&&
this
.
json
.
dutyRange
&&
this
.
json
.
dutyRange
!==
"
all
"
){
if
(
!
identityOpt
.
dutys
||
!
identityOpt
.
dutys
.
length
){
if
(
!
identityOpt
.
dutys
||
!
identityOpt
.
dutys
.
length
){
this
.
form
.
notice
(
MWF
.
xApplication
.
process
.
Xform
.
LP
.
noIdentityDutySelectRange
,
"
error
"
,
this
.
node
);
this
.
form
.
notice
(
MWF
.
xApplication
.
process
.
Xform
.
LP
.
noIdentityDutySelectRange
,
"
error
"
,
this
.
node
);
return
false
;
identityOpt
.
disabled
=
true
;
// return false;
}
}
}
}
if
(
this
.
ignoreOldData
){
if
(
this
.
ignoreOldData
){
...
@@ -1748,7 +1750,8 @@ if( MWF.xApplication.process.Xform && MWF.xApplication.process.Xform.Form ){
...
@@ -1748,7 +1750,8 @@ if( MWF.xApplication.process.Xform && MWF.xApplication.process.Xform.Form ){
if
(
this
.
json
.
unitRange
!==
"
all
"
){
if
(
this
.
json
.
unitRange
!==
"
all
"
){
if
(
!
unitOpt
.
units
||
!
unitOpt
.
units
.
length
){
if
(
!
unitOpt
.
units
||
!
unitOpt
.
units
.
length
){
this
.
form
.
notice
(
MWF
.
xApplication
.
process
.
Xform
.
LP
.
noUnitSelectRange
,
"
error
"
,
this
.
node
);
this
.
form
.
notice
(
MWF
.
xApplication
.
process
.
Xform
.
LP
.
noUnitSelectRange
,
"
error
"
,
this
.
node
);
return
false
;
unitOpt
.
disabled
=
true
;
// return false;
}
}
}
}
if
(
this
.
ignoreOldData
){
if
(
this
.
ignoreOldData
){
...
...
o2web/source/x_component_process_Xform/Org.js
浏览文件 @
7f7a4c41
...
@@ -166,13 +166,15 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg = new Class({
...
@@ -166,13 +166,15 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg = new Class({
if
(
this
.
json
.
identityRange
!==
"
all
"
){
if
(
this
.
json
.
identityRange
!==
"
all
"
){
if
(
!
identityOpt
.
noUnit
&&
(
!
identityOpt
.
units
||
!
identityOpt
.
units
.
length
)
){
if
(
!
identityOpt
.
noUnit
&&
(
!
identityOpt
.
units
||
!
identityOpt
.
units
.
length
)
){
this
.
form
.
notice
(
MWF
.
xApplication
.
process
.
Xform
.
LP
.
noIdentitySelectRange
,
"
error
"
,
this
.
node
);
this
.
form
.
notice
(
MWF
.
xApplication
.
process
.
Xform
.
LP
.
noIdentitySelectRange
,
"
error
"
,
this
.
node
);
return
false
;
identityOpt
.
disabled
=
true
;
// return false;
}
}
}
}
if
(
!
identityOpt
.
noUnit
&&
this
.
json
.
dutyRange
&&
this
.
json
.
dutyRange
!==
"
all
"
){
if
(
!
identityOpt
.
noUnit
&&
this
.
json
.
dutyRange
&&
this
.
json
.
dutyRange
!==
"
all
"
){
if
(
!
identityOpt
.
dutys
||
!
identityOpt
.
dutys
.
length
){
if
(
!
identityOpt
.
dutys
||
!
identityOpt
.
dutys
.
length
){
this
.
form
.
notice
(
MWF
.
xApplication
.
process
.
Xform
.
LP
.
noIdentityDutySelectRange
,
"
error
"
,
this
.
node
);
this
.
form
.
notice
(
MWF
.
xApplication
.
process
.
Xform
.
LP
.
noIdentityDutySelectRange
,
"
error
"
,
this
.
node
);
return
false
;
identityOpt
.
disabled
=
true
;
// return false;
}
}
}
}
identityOpt
.
values
=
(
this
.
json
.
isInput
)
?
[]
:
values
;
identityOpt
.
values
=
(
this
.
json
.
isInput
)
?
[]
:
values
;
...
@@ -186,7 +188,8 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg = new Class({
...
@@ -186,7 +188,8 @@ MWF.xApplication.process.Xform.Org = MWF.APPOrg = new Class({
if
(
this
.
json
.
unitRange
!==
"
all
"
){
if
(
this
.
json
.
unitRange
!==
"
all
"
){
if
(
!
unitOpt
.
units
||
!
unitOpt
.
units
.
length
){
if
(
!
unitOpt
.
units
||
!
unitOpt
.
units
.
length
){
this
.
form
.
notice
(
MWF
.
xApplication
.
process
.
Xform
.
LP
.
noUnitSelectRange
,
"
error
"
,
this
.
node
);
this
.
form
.
notice
(
MWF
.
xApplication
.
process
.
Xform
.
LP
.
noUnitSelectRange
,
"
error
"
,
this
.
node
);
return
false
;
unitOpt
.
disabled
=
true
;
// return false;
}
}
}
}
unitOpt
.
values
=
(
this
.
json
.
isInput
)
?
[]
:
values
;
unitOpt
.
values
=
(
this
.
json
.
isInput
)
?
[]
:
values
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录