Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
S
szse
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaochengxiang
szse
Commits
da27d97d
Commit
da27d97d
authored
May 16, 2023
by
zhaochengxiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
不显示工号
parent
c29c4f0a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
23 deletions
+15
-23
AssetAction.jsx
src/view/Manage/AssetManage/Component/AssetAction.jsx
+1
-1
AssetDetail.jsx
src/view/Manage/AssetManage/Component/AssetDetail.jsx
+1
-1
AssetTable.jsx
src/view/Manage/AssetManage/Component/AssetTable.jsx
+12
-20
SelectUsers.jsx
src/view/Manage/Model/Component/SelectUsers.jsx
+1
-1
No files found.
src/view/Manage/AssetManage/Component/AssetAction.jsx
View file @
da27d97d
...
...
@@ -822,7 +822,7 @@ const AssetAction = (props) => {
return <IndexCode value={item.value||''} terms={terms} />;
}
if (item.name==='数据关键用户' || item.name?.toLowerCase()==='业务数据owner' || item.name?.toLowerCase()==='it责任人') {
if (item.name==='数据关键用户' || item.name?.toLowerCase()==='业务数据owner' || item.name?.toLowerCase()==='it责任人'
|| item.name==='创建人' || item.name==='更新人'
) {
return <SelectUser
type='detail'
users={users}
...
...
src/view/Manage/AssetManage/Component/AssetDetail.jsx
View file @
da27d97d
...
...
@@ -94,7 +94,7 @@ const AssetDetail = (props)=>{
return
<
IndexCode
value=
{
item
.
value
||
''
}
terms=
{
terms
}
/>;
}
if
(
item
.
name
===
'数据关键用户'
||
item
.
name
===
'业务部门负责人'
||
item
.
name
?.
toLowerCase
()
===
'it责任人'
)
{
if
(
item
.
name
===
'数据关键用户'
||
item
.
name
===
'业务部门负责人'
||
item
.
name
?.
toLowerCase
()
===
'it责任人'
||
item
.
name
===
'创建人'
||
item
.
name
===
'更新人'
)
{
return
<
SelectUser
type=
'detail'
users=
{
users
}
...
...
src/view/Manage/AssetManage/Component/AssetTable.jsx
View file @
da27d97d
...
...
@@ -231,31 +231,23 @@ const AssetTable = (props) => {
const
realAssets
=
useMemo
(()
=>
{
const
newAssets
=
[...
assets
];
if
(
users
?.
length
>
0
&&
assets
?.
length
>
0
&&
columns
?.
length
>
0
)
{
const
index1
=
columns
.
findIndex
(
item
=>
item
.
title
===
'数据关键用户'
);
const
index2
=
columns
.
findIndex
(
item
=>
item
.
title
===
'业务部门负责人'
);
const
index3
=
columns
.
findIndex
(
item
=>
item
.
title
?.
toLowerCase
()
===
'it责任人'
);
const
specialCol
=
[
'数据关键用户'
,
'业务数据owner'
,
'it责任人'
,
'创建人'
,
'更新人'
];
newAssets
?.
forEach
(
item
=>
{
if
(
index1
!==
-
1
)
{
const
user
=
users
?.
filter
((
user
)
=>
(
user
.
pernr
===
item
[
`element
${
index1
+
1
}
`
]));
if
(
user
?.
length
>
0
)
{
item
[
`element
${
index1
+
1
}
`
]
=
user
[
0
].
nachn
;
}
}
if
(
index2
!==
-
1
)
{
const
user
=
users
?.
filter
((
user
)
=>
(
user
.
pernr
===
item
[
`element
${
index2
+
1
}
`
]));
if
(
user
?.
length
>
0
)
{
item
[
`element
${
index2
+
1
}
`
]
=
user
[
0
].
nachn
;
}
const
indexArray
=
[];
columns
.
forEach
((
item
,
index
)
=>
{
if
(
specialCol
.
indexOf
(
item
.
title
?.
toLowerCase
())
!==
-
1
)
{
indexArray
.
push
(
index
);
}
});
if
(
index3
!==
-
1
)
{
const
user
=
users
?.
filter
((
user
)
=>
(
user
.
pernr
===
item
[
`element
${
index3
+
1
}
`
]));
if
(
user
?.
length
>
0
)
{
item
[
`element
${
index3
+
1
}
`
]
=
user
[
0
].
nachn
;
}
newAssets
?.
forEach
((
item
)
=>
{
indexArray
?.
forEach
(
index
=>
{
const
user
=
users
?.
filter
((
user
)
=>
(
user
.
pernr
===
item
[
`element
${
index
+
1
}
`
]));
if
(
user
&&
user
.
length
>
0
)
{
item
[
`element
${
index
+
1
}
`
]
=
user
[
0
].
nachn
?
`
${
user
[
0
].
nachn
}
(
${
user
[
0
].
pernr
}
)`
:
user
[
0
].
pernr
;
}
})
})
}
return
newAssets
;
...
...
src/view/Manage/Model/Component/SelectUsers.jsx
View file @
da27d97d
...
...
@@ -52,7 +52,7 @@ const SelectUser:React.FC=(props)=>{
}
else
if
(
type
===
'detail'
){
try
{
const
user
=
users
?.
filter
((
item
)
=>
(
item
.
pernr
===
value
))
return
user
[
0
].
nachn
return
`
${
user
[
0
].
nachn
}
(
${
user
[
0
].
pernr
}
)`
;
}
catch
(
error
)
{
return
value
}
...
...
Write
Preview
Markdown
is supported
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