Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
fuyue82
o2oa
提交
a43a281c
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,发现更多精彩内容 >>
提交
a43a281c
编写于
1月 12, 2021
作者:
U
unknown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
人员按职务选择允许cn对不上,unique对的上的情况
上级
c3f20095
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
47 addition
and
18 deletion
+47
-18
o2web/source/x_component_Selector/IdentityWidthDutyCategoryByUnit.js
...e/x_component_Selector/IdentityWidthDutyCategoryByUnit.js
+46
-18
o2web/source/x_component_process_FormDesigner/Property.js
o2web/source/x_component_process_FormDesigner/Property.js
+1
-0
未找到文件。
o2web/source/x_component_Selector/IdentityWidthDutyCategoryByUnit.js
浏览文件 @
a43a281c
...
...
@@ -92,6 +92,12 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
// }
// }
// },
getUnitUniqueFormDn
:
function
(
dn
){
if
(
!
dn
)
return
""
;
var
arr
=
dn
.
split
(
"
@
"
);
if
(
arr
.
length
===
3
)
return
arr
[
1
];
return
dn
;
},
loadSelectItems
:
function
(
addToNext
)
{
//根据组织分类展现职务
if
(
this
.
options
.
resultType
===
"
person
"
)
{
...
...
@@ -115,15 +121,19 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
}.
bind
(
this
));
var
units
=
[];
var
unitUniques
=
[];
for
(
var
i
=
0
;
i
<
this
.
options
.
units
.
length
;
i
++
)
{
var
unit
=
this
.
options
.
units
[
i
];
if
(
typeOf
(
unit
)
===
"
string
"
)
{
units
.
push
(
unit
)
units
.
push
(
unit
);
unitUniques
.
push
(
this
.
getUnitUniqueFormDn
(
unit
)
);
}
else
{
units
.
push
(
unit
.
distinguishedName
||
unit
.
unique
||
unit
.
id
||
unit
.
levelName
)
units
.
push
(
unit
.
distinguishedName
||
unit
.
unique
||
unit
.
id
||
unit
.
levelName
);
unitUniques
.
push
(
unit
.
distinguishedName
?
this
.
getUnitUniqueFormDn
(
unit
.
distinguishedName
)
:
(
unit
.
unique
||
unit
.
id
||
unit
.
levelName
)
);
}
}
this
.
unitStringList
=
units
;
this
.
unitUniqueList
=
unitUniques
;
o2
.
Actions
.
load
(
"
x_organization_assemble_express
"
).
UnitDutyAction
.
listIdentityWithUnitWithNameObject
({
nameList
:
this
.
options
.
dutys
,
...
...
@@ -224,6 +234,8 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
if
(
idx
==
-
1
&&
unit
.
id
)
idx
=
this
.
unitStringList
.
indexOf
(
unit
.
id
);
if
(
idx
==
-
1
&&
unit
.
unique
)
idx
=
this
.
unitStringList
.
indexOf
(
unit
.
unique
);
if
(
idx
==
-
1
&&
unit
.
levelName
)
idx
=
this
.
unitStringList
.
indexOf
(
unit
.
levelName
);
if
(
idx
==
-
1
&&
unit
.
unique
)
idx
=
this
.
unitUniqueList
.
indexOf
(
unit
.
unique
);
if
(
idx
==
-
1
&&
!
unit
.
unique
&&
unit
.
distinguishedName
)
idx
=
this
.
unitUniqueList
.
indexOf
(
unit
.
distinguishedName
.
split
(
"
@
"
)[
1
]
||
""
);
return
idx
},
isUnitContain
:
function
(
d
)
{
...
...
@@ -235,27 +247,43 @@ MWF.xApplication.Selector.IdentityWidthDutyCategoryByUnit = new Class({
this
.
unitFlagMap
[
typeOf
(
e
)
===
"
string
"
?
e
:
(
e
.
distinguishedName
||
e
.
id
||
e
.
unique
||
e
.
employee
||
e
.
levelName
)]
=
true
;
}.
bind
(
this
));
}
if
(
!
this
.
unitUniqueMap
)
{
this
.
unitUniqueMap
=
{};
this
.
unitUniqueList
.
each
(
function
(
e
)
{
if
(
!
e
)
return
;
this
.
unitUniqueMap
[
e
]
=
true
;
}.
bind
(
this
));
}
var
map
=
this
.
unitFlagMap
;
return
(
d
.
distinguishedName
&&
map
[
d
.
distinguishedName
])
||
var
uniqueMap
=
this
.
unitUniqueMap
;
var
flag
=
(
d
.
distinguishedName
&&
map
[
d
.
distinguishedName
])
||
(
d
.
levelName
&&
map
[
d
.
levelName
])
||
(
d
.
id
&&
map
[
d
.
id
])
||
(
d
.
unique
&&
map
[
d
.
unique
]);
},
listAllIdentityInUnitObject
:
function
()
{
var
unitArray
=
[];
for
(
var
i
=
0
;
i
<
identityList
.
length
;
i
++
)
{
unitArray
.
push
(
identityList
[
i
].
unit
||
identityList
[
i
].
unitLevelName
);
(
d
.
unique
&&
map
[
d
.
unique
])
||
(
d
.
unique
&&
uniqueMap
[
d
.
unique
]);
if
(
!
flag
&&
!
d
.
unique
&&
d
.
distinguishedName
){
var
arr
=
d
.
distinguishedName
.
split
(
"
@
"
);
if
(
arr
.
length
===
3
&&
arr
[
1
]
&&
uniqueMap
[
arr
[
1
]]
){
flag
=
true
;
}
}
o2
.
Actions
.
load
(
"
x_organization_assemble_express
"
).
UnitAction
.
listObject
({
unitList
:
unitArray
},
function
(
json
)
{
this
.
allIdentityInUnitObject
=
{};
json
.
data
.
each
(
function
(
u
)
{
this
.
allIdentityInUnitObject
[
u
.
levelName
]
=
u
;
}.
bind
(
this
));
if
(
callback
)
callback
();
}.
bind
(
this
),
null
,
false
)
return
flag
;
},
// listAllIdentityInUnitObject: function () {
// var unitArray = [];
// for (var i = 0; i < identityList.length; i++) {
// unitArray.push(identityList[i].unit || identityList[i].unitLevelName);
// }
// o2.Actions.load("x_organization_assemble_express").UnitAction.listObject({
// unitList: unitArray
// }, function (json) {
// this.allIdentityInUnitObject = {};
// json.data.each(function (u) {
// this.allIdentityInUnitObject[u.levelName] = u;
// }.bind(this));
// if (callback) callback();
// }.bind(this), null, false)
// },
getUnitOrderNumber
:
function
(
unit
)
{
return
this
.
allIdentityInUnitObject
[
unit
.
levelName
].
orderNumber
;
},
...
...
o2web/source/x_component_process_FormDesigner/Property.js
浏览文件 @
a43a281c
...
...
@@ -1296,6 +1296,7 @@ debugger;
}.
bind
(
this
));
dutyNameNodes
.
each
(
function
(
node
){
debugger
;
new
MWF
.
xApplication
.
process
.
ProcessDesigner
.
widget
.
PersonSelector
(
node
,
this
.
form
.
designer
,
{
"
type
"
:
"
dutyName
"
,
"
names
"
:
this
.
data
[
node
.
get
(
"
name
"
)],
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录