free-sun
/
HumanResource
18
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

员工卡片，职位换为岗位。关键字搜索职位替换为岗位

master
zmh 2 years ago
parent
fa5c998626
commit
f268eaf219
5 changed files with 16 additions and 60 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      api/app/lib/controllers/member/index.js
  2. 12
      api/app/lib/utils/member.js
  3. 27
      web/client/src/sections/humanAffairs/components/personnelModal.jsx
  4. 2
      web/client/src/sections/humanAffairs/containers/employeeInformation.jsx
  5. 27
      web/client/src/sections/humanAffairs/containers/personnelFiles.jsx

4
api/app/lib/controllers/member/index.js
View File

@ -104,6 +104,7 @@ async function searchPepMember (ctx) {
SELECT
user.id AS pepUserId,
user.people_code AS userCode,
basicdata_post.name AS userPost,
user.name AS userName,
role.name AS roleName,
role.id AS roleId,
@ -119,6 +120,8 @@ async function searchPepMember (ctx) {
ON department_user.user = user.id
LEFT JOIN department
ON department.id = department_user.department
LEFT JOIN basicdata_post
ON basicdata_post.id = user.post
WHERE
user.delete = '0'
${whereOption.length ? `AND ${whereOption.join(' OR ')}` : ''}
@ -154,6 +157,7 @@ async function searchPepMember (ctx) {
id: u.roleId,
name: u.roleName
}] : [],
userPost:u.userPost
})
}
})

12
api/app/lib/utils/member.js
View File

@ -200,13 +200,11 @@ module.exports = function (app, opts) {
`: ''}
WHERE
member.del = '0'
${keywordTarget == 'role' && keyword ? `
AND user.id IN (
SELECT user_role.user
FROM ${pepEmis}.user_role AS user_role
INNER JOIN ${pepEmis}.role AS role
ON role.id = user_role.role
AND role.name LIKE '%${keyword}%'
${keywordTarget == 'post' && keyword ? `
AND user.post IN (
SELECT basicDataPost.id
FROM ${pepEmis}.basicdata_post AS basicDataPost
where basicDataPost.name LIKE '%${keyword}%'
)
` : ''}
${keywordTarget == 'dep' && keyword ? `

27
web/client/src/sections/humanAffairs/components/personnelModal.jsx
View File

@ -240,33 +240,10 @@ function pushModal (props) {
<img src="/assets/images/hrImg/position.png" alt="" style={{ width: '100%', height: '100%' }} />
</div>
<div style={{ color: 'rgba(0,0,0,0.6)', fontSize: 12 }}>
职位：
岗位：
</div>
<div style={{ color: '#4A4A4A', fontSize: 12, display: 'flex', alignItems: 'center' }}>
{
peoplePro.role.map((ite, idx) => {
let roleArr = []
for (let i = 0; i < peoplePro.role.length; i++) {
roleArr.push(peoplePro.role[i].name)
}
return (
<div key={idx} style={{ display: 'flex', alignItems: 'center' }}>
{idx == 0 ?
(ite.name) : ('')
}
{
peoplePro.role.length > 1 && idx == 1 ? (
<Tooltip content={roleArr.join(',')} trigger="click" style={{ lineHeight: 2 }}>
<div style={{ color: 'rgba(0,90,189,0.8)', fontSize: 12, marginRight: 4, cursor: "pointer", }}>
+{peoplePro.role.length - 1}
</div>
</Tooltip>
) : ('')
}
</div>
)
})
}
{peoplePro.userPost || ''}
</div>
</div>
</div>

2
web/client/src/sections/humanAffairs/containers/employeeInformation.jsx
View File

@ -492,7 +492,7 @@ const employeeInformation = (props) => {
style={{ width: 200 }}
initValue={"name"}
>
<Form.Select.Option value='role'>职位</Form.Select.Option>
<Form.Select.Option value='post'>岗位</Form.Select.Option>
<Form.Select.Option value='dep'>部门</Form.Select.Option>
<Form.Select.Option value='number'>编号</Form.Select.Option>
<Form.Select.Option value='name'>姓名</Form.Select.Option>

27
web/client/src/sections/humanAffairs/containers/personnelFiles.jsx
View File

@ -87,7 +87,7 @@ const Rest = (props) => {
<div style={{ display: 'flex', marginTop: 16, marginBottom: 17 }}>
<div>
<Select value={keywordTarget} onChange={setKeywordTarget} placeholder='请选择搜索类型' style={{ width: 200 }} >
<Select.Option value='role'>职位</Select.Option>
<Select.Option value='post'>岗位</Select.Option>
<Select.Option value='dep'>部门</Select.Option>
<Select.Option value='number'>编号</Select.Option>
<Select.Option value='name'>姓名</Select.Option>
@ -232,30 +232,7 @@ const Rest = (props) => {
<img src="/assets/images/hrImg/post.png" alt="" style={{ width: '100%', height: '100%' }} />
</div>
<div style={{ fontSize: 14, color: '#282828', marginLeft: 12, marginRight: 9, display: 'flex', }}>
{
item.role.map((ite, idx) => {
let roleArr = []
for (let i = 0; i < item.role.length; i++) {
roleArr.push(item.role[i].name)
}
return (
<div key={idx} style={{ display: 'flex', alignItems: 'center' }}>
{idx == 0 ?
(ite.name.substring(0, 6)) : ('')
}
{
item.role.length > 1 && idx == 1 ? (
<Tooltip content={roleArr.join(',')} trigger="click" style={{ lineHeight: 2 }}>
<div style={{ color: 'rgba(0,90,189,0.8)', fontSize: 12, marginRight: 4, cursor: "pointer", }}>
+{item.role.length - 1}
</div>
</Tooltip>
) : ('')
}
</div>
)
})
}
{item.userPost || '暂无'}
</div>
</div>
<div style={{ color: 'rgba(0,0,0,0.65)', fontSize: 12 }}>

Write Preview
Loading…
Cancel
Save