Commit 1eabae4e by zhaochengxiang

模型送审用户

parent 6bb906e9
......@@ -130,7 +130,7 @@ const Basic = React.forwardRef(function ({}, ref) {
// }, 1000)
dispatch({
type: 'user.getOAUsers',
type: 'datamodel.getCooperationUsers',
callback: data => {
setLoadingUsers(false)
setUsers(data)
......@@ -411,10 +411,10 @@ const DesignUsersItem = ({ value, onChange, loading, users }) => {
useDebounceEffect(() => {
setOptions(
(users??[])
.filter(item => !searchValue|| (item.loginName??'').indexOf(searchValue)!==-1 || (item.realName??'').indexOf(searchValue)!==-1)
.filter(item => !searchValue|| (item.name??'').indexOf(searchValue)!==-1 || (item.dname??'').indexOf(searchValue)!==-1)
.map(item => ({
label: `${item.realName}(${item.loginName})`,
value: `${item.id}`,
label: item.name,
value: item.name,
}))
)
}, [searchValue, users], { wait: 300 })
......@@ -422,7 +422,7 @@ const DesignUsersItem = ({ value, onChange, loading, users }) => {
return (
<Select showSearch loading={loading} allowClear
placeholder='请选择设计评审人员'
value={value?.map(item => item.userId)}
value={value?.map(item => item.userName)}
searchValue={searchValue}
onSearch={(val) => {
setSearchValue(val)
......@@ -435,8 +435,8 @@ const DesignUsersItem = ({ value, onChange, loading, users }) => {
onChange={(val) => {
onChange?.(
(users??[])
.filter(item => val===item.id)
.map(item => ({ userId: item.id, userName: item.loginName, userCnName: item.realName }))
.filter(item => val===item.name)
.map(item => ({ userId: item.id, userName: item.name, userCnName: item.dname }))
)
}}
/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment