diff --git a/web/client/src/sections/fillion/components/bridgeTable.js b/web/client/src/sections/fillion/components/bridgeTable.js index 64d77eb3..23d74b38 100644 --- a/web/client/src/sections/fillion/components/bridgeTable.js +++ b/web/client/src/sections/fillion/components/bridgeTable.js @@ -1767,13 +1767,13 @@ const BrideTable = (props) => { activeKey, onChange: (key) => setActiveKey(key), items: [ - { - key: 'tab1', - label: { - setWhichofits('qiaoliang') - setDifferentiate('bridge') - }}>桥梁{activeKey === 'tab1'}, - }, + // { + // key: 'tab1', + // label: { + // setWhichofits('qiaoliang') + // setDifferentiate('bridge') + // }}>桥梁{activeKey === 'tab1'}, + // }, // { // key: 'tab2', // label: { diff --git a/web/client/src/sections/fillion/components/buildingTable.js b/web/client/src/sections/fillion/components/buildingTable.js index a1a0b26e..da8bf6d7 100644 --- a/web/client/src/sections/fillion/components/buildingTable.js +++ b/web/client/src/sections/fillion/components/buildingTable.js @@ -280,15 +280,15 @@ const BuildingTable = (props) => { activeKey, onChange: (key) => setActiveKey(key), items: [ - { - key: 'tab1', - label: { - setWhichofits('在建项目') - setDifferentiate('project') - setGrade('在建项目') + // { + // key: 'tab1', + // label: { + // setWhichofits('在建项目') + // setDifferentiate('project') + // setGrade('在建项目') - }}>在建项目{activeKey === 'tab1'}, - }, + // }}>在建项目{activeKey === 'tab1'}, + // }, ], }, }} @@ -328,10 +328,10 @@ const BuildingTable = (props) => { optionRender: (searchConfig, formProps, dom) => [ ...dom.reverse(), { props.exports(rowSelected, grade, differentiate) }} - disabled={user?.username !== 'SuperAdmin' && user?.userResources?.find(i => i.resourceId === 'BUILDINGPROJECT').isshow === "true" ? true : ''} + disabled={user?.username !== 'SuperAdmin' && user?.userResources?.find(i => i.resourceId === 'BUILDINGPROJECT')?.isshow === "true" ? true : ''} > diff --git a/web/client/src/sections/fillion/components/feedback/nominateModal.js b/web/client/src/sections/fillion/components/feedback/nominateModal.js index 9cd0dba8..c14a2ca3 100644 --- a/web/client/src/sections/fillion/components/feedback/nominateModal.js +++ b/web/client/src/sections/fillion/components/feedback/nominateModal.js @@ -65,7 +65,7 @@ const NominateModal = (props) => { visible={visible} onVisibleChange={onVisibleChange} onFinish={handleFinish} - destroyOnClose={true} + destroyOnClose initialValues={{ departmentId: null, name: null }} > @@ -113,10 +113,23 @@ const NominateModal = (props) => { request={async () => { if (depId) { const res = await dispatch(getDepUser(depId)); - const processedUsers = res?.payload.data.map((user) => ({ - label: user.name, // 使用用户的名字作为选项的显示文本 - value: user.id, // 使用用户的id作为选项的值 - })); + const copy = res?.payload.data.filter((user) => { + if (user.isAdmin) { + return { + label: user.name, // 使用用户的名字作为选项的显示文本 + value: user.id, // 使用用户的id作为选项的值 + } + } + } + ) + let processedUsers = copy.map((item) => { + return { + label: item.name, // 使用用户的名字作为选项的显示文本 + value: item.id, // 使用用户的id作为选项的值 + } + }) + console.log('processedUsers', copy) + console.log('processedUsers', processedUsers) return Promise.resolve(processedUsers) } diff --git a/web/client/src/sections/fillion/components/maintenanceTable.js b/web/client/src/sections/fillion/components/maintenanceTable.js index 640f5772..d7377c55 100644 --- a/web/client/src/sections/fillion/components/maintenanceTable.js +++ b/web/client/src/sections/fillion/components/maintenanceTable.js @@ -435,7 +435,7 @@ const PatrolNameList = (props) => { return (
handleSearch(e.target.value)} /> diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js index f8a9132e..823f273a 100644 --- a/web/client/src/sections/fillion/components/patrolTable.js +++ b/web/client/src/sections/fillion/components/patrolTable.js @@ -253,10 +253,10 @@ const DetailList = (props) => { , - isAnomaly && record.handleState != '已处理' && record.performerId === null ? + isAnomaly && record.handleState != '已处理' && record.performerId === null && user?.username === 'SuperAdmin' ? : null, - isAnomaly && record.handleState != '已处理' && record.performerId === null ? + isAnomaly && record.handleState != '已处理' && record.performerId === null && user?.username === 'SuperAdmin' ? < Popover content={ [ diff --git a/web/client/src/sections/fillion/components/project/project.js b/web/client/src/sections/fillion/components/project/project.js index 1735405d..c6caac02 100644 --- a/web/client/src/sections/fillion/components/project/project.js +++ b/web/client/src/sections/fillion/components/project/project.js @@ -21,6 +21,7 @@ const ProjectModal = (props) => { const { visible, onVisibleChange, typecard, rewkeys, recortd, dispatch, setRecortd, setDelet, getData } = props //console.log('typecard', newlysay) const [newlys, setNewlys] = useState() //必填数据 + const [newlysay, setNewlysay] = useState() //处理hou const [records, setRecords] = useState()//处理 const [recordsay, setRecordsay] = useState()//必填数据 @@ -202,10 +203,10 @@ const ProjectModal = (props) => { /> })} - - - } + } + + {/* : '' } */} diff --git a/web/client/src/sections/fillion/nav-item.js b/web/client/src/sections/fillion/nav-item.js index 1a4061ee..0449594f 100644 --- a/web/client/src/sections/fillion/nav-item.js +++ b/web/client/src/sections/fillion/nav-item.js @@ -68,7 +68,7 @@ export function getNavItem(user, dispatch) { 建设上报 : ''} - {user?.username == 'SuperAdmin' || user?.userResources?.filter(i => i.resourceId === 'BUILDINGPROJECT') ? + {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'BUILDINGPROJECT') ? 在建项目 : ''}