From 2217ed1e30afe3dddbfeb205195534f356a18b8a Mon Sep 17 00:00:00 2001 From: deartibers <947466799@qq.com> Date: Mon, 17 Oct 2022 11:34:42 +0800 Subject: [PATCH] 1 --- .../assets/images/hrImg/defaultAvatar.png | Bin 0 -> 13944 bytes .../src/sections/auth/containers/login.jsx | 3 +- .../humanAffairs/actions/personnelFiles.js | 58 ++- .../humanAffairs/components/city.json | 360 +----------------- .../humanAffairs/components/deleteModal.jsx | 117 ++++++ .../components/personnelModal.jsx | 152 ++++++-- .../humanAffairs/components/style.less | 15 + .../containers/personnelFiles.jsx | 73 ++-- .../containers/personnelFilesDetail.jsx | 67 +++- web/client/src/utils/webapi.js | 6 +- 10 files changed, 433 insertions(+), 418 deletions(-) create mode 100644 web/client/assets/images/hrImg/defaultAvatar.png create mode 100644 web/client/src/sections/humanAffairs/components/deleteModal.jsx create mode 100644 web/client/src/sections/humanAffairs/components/style.less diff --git a/web/client/assets/images/hrImg/defaultAvatar.png b/web/client/assets/images/hrImg/defaultAvatar.png new file mode 100644 index 0000000000000000000000000000000000000000..ebf478e698c2d24cbd46adcb9880ee8c7d9119f7 GIT binary patch literal 13944 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 Xbe(45b}!~C8KCxDOQ});7V>`qa~RUG literal 0 HcmV?d00001 diff --git a/web/client/src/sections/auth/containers/login.jsx b/web/client/src/sections/auth/containers/login.jsx index 949e12e..3870091 100644 --- a/web/client/src/sections/auth/containers/login.jsx +++ b/web/client/src/sections/auth/containers/login.jsx @@ -59,13 +59,14 @@ const Login = props => { width: 388, marginTop: "18.33%" }}> -
+
FS-CRM企业信息管理系统
{ dispatch(login(values.username, values.password)).then(res => { const data = res.payload.user + localStorage.setItem('word', JSON.stringify(values.password)) dispatch(actions.layout.initWebSocket({ ioUrl: apiRoot, token: data.token, hrUserId: data.hrUserInfo.id })) }) }} diff --git a/web/client/src/sections/humanAffairs/actions/personnelFiles.js b/web/client/src/sections/humanAffairs/actions/personnelFiles.js index f835534..fea5a7d 100644 --- a/web/client/src/sections/humanAffairs/actions/personnelFiles.js +++ b/web/client/src/sections/humanAffairs/actions/personnelFiles.js @@ -23,4 +23,60 @@ export function membersBulkAdd(values) { data: values, msg: { option: '导入员工信息' }, }); -} \ No newline at end of file +} + +export function postMember (data) {//添加/编辑成员 + let msg = '' + if (data) { + msg = data.msg + } + return (dispatch) => + basicAction({ + type: "post", + dispatch: dispatch, + data, + actionType: "POST_MEMBER", + url: `${ApiTable.postMember}`, + msg: { option: msg }, //添加/编辑成员 + reducer: { name: "" }, + }); +} + +export function getMemberList(query) {//查询人员列表 + return (dispatch) => basicAction({ + type: "get", + dispatch: dispatch, + actionType: "GET_MENBERLIST", + query: query, + url: `${ApiTable.getMemberList}`, + msg: { option: "查询人员列表" }, + reducer: { name: "MemberList", params: { noClear: true } }, + }); +} +export function delMember (data) {//删除人员信息 + let msg = '' + if (data) { + msg = data.msg + } + return (dispatch) => + basicAction({ + type: "del", + query:data, + dispatch: dispatch, + actionType: "DEL_MEMBER", + url: `${ApiTable.delMember}`, + msg: { option: msg }, //删除人员信息 + reducer: {}, + }); +} +export function getMemberOvertime(query) {//查询单个人员加班统计数据 + return (dispatch) => basicAction({ + type: "get", + dispatch: dispatch, + actionType: "GET_MemberOVERTIME", + query: query, + url: `${ApiTable.getMemberOvertime}`, + msg: { option: "查询人员加班统计数据" }, + reducer: { name: "MemberOvertime", params: { noClear: true } }, + }); +} diff --git a/web/client/src/sections/humanAffairs/components/city.json b/web/client/src/sections/humanAffairs/components/city.json index 020decd..0042b5f 100644 --- a/web/client/src/sections/humanAffairs/components/city.json +++ b/web/client/src/sections/humanAffairs/components/city.json @@ -1,143 +1,11 @@ [ { "code": "11", - "name": "北京市", - "children": [ - { - "code": "110101", - "name": "东城区" - }, - { - "code": "110102", - "name": "西城区" - }, - { - "code": "110105", - "name": "朝阳区" - }, - { - "code": "110106", - "name": "丰台区" - }, - { - "code": "110107", - "name": "石景山区" - }, - { - "code": "110108", - "name": "海淀区" - }, - { - "code": "110109", - "name": "门头沟区" - }, - { - "code": "110111", - "name": "房山区" - }, - { - "code": "110112", - "name": "通州区" - }, - { - "code": "110113", - "name": "顺义区" - }, - { - "code": "110114", - "name": "昌平区" - }, - { - "code": "110115", - "name": "大兴区" - }, - { - "code": "110116", - "name": "怀柔区" - }, - { - "code": "110117", - "name": "平谷区" - }, - { - "code": "110118", - "name": "密云区" - }, - { - "code": "110119", - "name": "延庆区" - } - ] + "name": "北京市" }, { "code": "12", - "name": "天津市", - "children": [ - { - "code": "120101", - "name": "和平区" - }, - { - "code": "120102", - "name": "河东区" - }, - { - "code": "120103", - "name": "河西区" - }, - { - "code": "120104", - "name": "南开区" - }, - { - "code": "120105", - "name": "河北区" - }, - { - "code": "120106", - "name": "红桥区" - }, - { - "code": "120110", - "name": "东丽区" - }, - { - "code": "120111", - "name": "西青区" - }, - { - "code": "120112", - "name": "津南区" - }, - { - "code": "120113", - "name": "北辰区" - }, - { - "code": "120114", - "name": "武清区" - }, - { - "code": "120115", - "name": "宝坻区" - }, - { - "code": "120116", - "name": "滨海新区" - }, - { - "code": "120117", - "name": "宁河区" - }, - { - "code": "120118", - "name": "静海区" - }, - { - "code": "120119", - "name": "蓟州区" - } - ] + "name": "天津市" }, { "code": "13", @@ -457,73 +325,7 @@ }, { "code": "31", - "name": "上海市", - "children": [ - { - "code": "310101", - "name": "黄浦区" - }, - { - "code": "310104", - "name": "徐汇区" - }, - { - "code": "310105", - "name": "长宁区" - }, - { - "code": "310106", - "name": "静安区" - }, - { - "code": "310107", - "name": "普陀区" - }, - { - "code": "310109", - "name": "虹口区" - }, - { - "code": "310110", - "name": "杨浦区" - }, - { - "code": "310112", - "name": "闵行区" - }, - { - "code": "310113", - "name": "宝山区" - }, - { - "code": "310114", - "name": "嘉定区" - }, - { - "code": "310115", - "name": "浦东新区" - }, - { - "code": "310116", - "name": "金山区" - }, - { - "code": "310117", - "name": "松江区" - }, - { - "code": "310118", - "name": "青浦区" - }, - { - "code": "310120", - "name": "奉贤区" - }, - { - "code": "310151", - "name": "崇明区" - } - ] + "name": "上海市" }, { "code": "32", @@ -1315,161 +1117,7 @@ }, { "code": "50", - "name": "重庆市", - "children": [ - { - "code": "500101", - "name": "万州区" - }, - { - "code": "500102", - "name": "涪陵区" - }, - { - "code": "500103", - "name": "渝中区" - }, - { - "code": "500104", - "name": "大渡口区" - }, - { - "code": "500105", - "name": "江北区" - }, - { - "code": "500106", - "name": "沙坪坝区" - }, - { - "code": "500107", - "name": "九龙坡区" - }, - { - "code": "500108", - "name": "南岸区" - }, - { - "code": "500109", - "name": "北碚区" - }, - { - "code": "500110", - "name": "綦江区" - }, - { - "code": "500111", - "name": "大足区" - }, - { - "code": "500112", - "name": "渝北区" - }, - { - "code": "500113", - "name": "巴南区" - }, - { - "code": "500114", - "name": "黔江区" - }, - { - "code": "500115", - "name": "长寿区" - }, - { - "code": "500116", - "name": "江津区" - }, - { - "code": "500117", - "name": "合川区" - }, - { - "code": "500118", - "name": "永川区" - }, - { - "code": "500119", - "name": "南川区" - }, - { - "code": "500120", - "name": "璧山区" - }, - { - "code": "500151", - "name": "铜梁区" - }, - { - "code": "500152", - "name": "潼南区" - }, - { - "code": "500153", - "name": "荣昌区" - }, - { - "code": "500154", - "name": "开州区" - }, - { - "code": "500155", - "name": "梁平区" - }, - { - "code": "500156", - "name": "武隆区" - }, - { - "code": "500229", - "name": "城口县" - }, - { - "code": "500230", - "name": "丰都县" - }, - { - "code": "500231", - "name": "垫江县" - }, - { - "code": "500233", - "name": "忠县" - }, - { - "code": "500235", - "name": "云阳县" - }, - { - "code": "500236", - "name": "奉节县" - }, - { - "code": "500237", - "name": "巫山县" - }, - { - "code": "500238", - "name": "巫溪县" - }, - { - "code": "500240", - "name": "石柱土家族自治县" - }, - { - "code": "500241", - "name": "秀山土家族苗族自治县" - }, - { - "code": "500242", - "name": "酉阳土家族苗族自治县" - }, - { - "code": "500243", - "name": "彭水苗族土家族自治县" - } - ] + "name": "重庆市" }, { "code": "51", diff --git a/web/client/src/sections/humanAffairs/components/deleteModal.jsx b/web/client/src/sections/humanAffairs/components/deleteModal.jsx new file mode 100644 index 0000000..4d21b2f --- /dev/null +++ b/web/client/src/sections/humanAffairs/components/deleteModal.jsx @@ -0,0 +1,117 @@ +import React, { useState, useRef, useEffect } from "react"; +import { connect } from "react-redux"; +import { Modal, Form, Button, Upload, Toast } from "@douyinfe/semi-ui"; +import { IconAlertCircle } from '@douyinfe/semi-icons'; +import cityData from './city.json'; +import PerfectScrollbar from "perfect-scrollbar"; +import './style.less' +let Scrollbar; +function deleteModal (props) { + const { + close, + cancel, + visible, + dispatch, + actions, + pepUserId + } = props; + const { humanAffairs } = actions; + const form = useRef();//表单 + + const [idPhoto, setIdPhoto] = useState(); //证件照 + + const [word, setWord] = useState(); //简历 + //初始化 + useEffect(() => { + setWord(JSON.parse(localStorage.getItem('word'))) + }, []); + + useEffect(() => { + const Project = document.getElementById("myForm"); + if (Project) { + if (Project && Scrollbar) { + Scrollbar.update(); + } + Scrollbar = new PerfectScrollbar("#myForm", { + suppressScrollX: true, + }); + } + }); + function handleOk () { + //点击弹框确定 右边按钮 + form.current + .validate() + .then((values) => { + if (word == values.word) { + dispatch(humanAffairs.delMember({ pepUserId: pepUserId, msg: '删除档案' })).then((res) => {//获取项企(PEP)全部部门及其下用户 + if (res.success) { + close(); + } + }) + } + else { + Toast.error('密码错误'); + form.current.setValue('word', '') + } + + }) + } + function handleCancel () { + cancel(); + //点击弹框取消 左边按钮 + } + return ( + <> + +
+ { + console.log('values', values); + }} + getFormApi={(formApi) => (form.current = formApi)} + > +
+
+
+ +
+
+
+ +
+ + ); +} +function mapStateToProps (state) { + const { auth, global, members } = state; + return { + // loading: members.isRequesting, + user: auth.user, + actions: global.actions, + apiRoot: global.apiRoot, + // members: members.data, + }; +} + +export default connect(mapStateToProps)(deleteModal); diff --git a/web/client/src/sections/humanAffairs/components/personnelModal.jsx b/web/client/src/sections/humanAffairs/components/personnelModal.jsx index 7b3dd88..fd39986 100644 --- a/web/client/src/sections/humanAffairs/components/personnelModal.jsx +++ b/web/client/src/sections/humanAffairs/components/personnelModal.jsx @@ -4,7 +4,7 @@ import { Modal, Form, Button, Upload } from "@douyinfe/semi-ui"; import { IconAlertCircle } from '@douyinfe/semi-icons'; import cityData from './city.json'; import PerfectScrollbar from "perfect-scrollbar"; - +import './style.less' let Scrollbar; function pushModal (props) { const { @@ -16,7 +16,8 @@ function pushModal (props) { actions, adminEdit,//是否是编辑 editObj, - user + user, + apiRoot, } = props; const { humanAffairs } = actions; const form = useRef();//表单 @@ -26,16 +27,24 @@ function pushModal (props) { const [peoplePro, setPeoplePro] = useState({}); //人员信息 const [usecityData, setUsecityData] = useState(); //人员id + const [idPhoto, setIdPhoto] = useState(); //证件照 + const [idPhotoBtn, setIdPhotoBtn] = useState(true); //证件照 + + const [vitae, setVitae] = useState(); //简历 + const [vitaeBtn, setVitaeBtn] = useState(true); //简历按钮 + //初始化 useEffect(() => { let mycityData = JSON.parse(JSON.stringify(cityData)); for (let i = 0; i < mycityData.length; i++) { mycityData[i].value = mycityData[i].name mycityData[i].label = mycityData[i].name - for (let j = 0; j < mycityData[i].children.length; j++) { - mycityData[i].children[j].value = mycityData[i].children[j].name - mycityData[i].children[j].label = mycityData[i].children[j].name + if (mycityData[i].children) { + for (let j = 0; j < mycityData[i].children.length; j++) { + mycityData[i].children[j].value = mycityData[i].children[j].name + mycityData[i].children[j].label = mycityData[i].children[j].name + } } } setUsecityData(mycityData) @@ -64,24 +73,64 @@ function pushModal (props) { }); } }); - function memberSeach (id) { + function memberSeach (id) {//搜索项企用户 dispatch(humanAffairs.getMemberSearch({ keyword: id })).then((res) => {//搜索项企用户 if (res.success) { - console.log('res.payload.data', res.payload.data); setPeoplePro(res.payload.data[0]) } }) } + function uploadOnChange (fileList, currentFile, event) {//证件照 + if (fileList.currentFile.status == "success") { + setIdPhoto(fileList.currentFile.response.key) + setIdPhotoBtn(false) + } + if (fileList.fileList.length == 0) { + setIdPhotoBtn(true); + setIdPhoto(''); + } + } + function uploadPdfOnChange (fileList, currentFile, event) {//简历 + if (fileList.currentFile.status == "success") { + setVitae(fileList.currentFile.response.key) + setVitaeBtn(false) + } + if (fileList.fileList.length == 0) { + setVitaeBtn(true); + setVitae(''); + } + } function handleOk () { //点击弹框确定 右边按钮 form.current .validate() .then((values) => { + let obj = values + if (values.nativePlace) { + if (values.nativePlace.length > 1) { + obj.nativePlace = values.nativePlace.join('-') + } + else { + obj.nativePlace = values.nativePlace[0] + } + } + if (values.workPlace) { + if (values.workPlace.length > 1) { + obj.workPlace = values.workPlace.join('-') + } + else { + obj.workPlace = values.workPlace[0] + } + } if (adminEdit) { } else { - + dispatch(humanAffairs.postMember({ idPhoto: idPhoto, vitae: vitae, msg: '新增档案', ...obj })).then((res) => {//获取项企(PEP)全部部门及其下用户 + if (res.success) { + close(); + } + }) } }) } @@ -103,7 +152,7 @@ function pushModal (props) {
{/* idPhoto */} -
+
上传照片:
- 请上传照片 + { + !idPhotoBtn ? '' : () + } -
- 请上传照片，不超过10m，支持png、jpg、bmp格式。 + 请上传照片，不超过10M，支持png、jpg、bmp格式。
@@ -277,7 +328,8 @@ function pushModal (props) { label='出生年月:' placeholder="请选择出生年月" style={{ width: 184 }} - initValue={new Date()} /> + // initValue={new Date()} + />
+
+
+ + + 已婚已育 + + + 已婚 + + + 未婚 + + +
+
{/* 学历信息 */} @@ -404,7 +478,8 @@ function pushModal (props) { label='毕业时间:' placeholder="请选择毕业时间" style={{ width: 300 }} - initValue={new Date()} /> + // initValue={new Date()} + /> @@ -423,7 +498,8 @@ function pushModal (props) { label='入职时间:' placeholder="请选择入职时间" style={{ width: 288 }} - initValue={new Date()} /> + // initValue={new Date()} . + />
+ // initValue={new Date()} + />
@@ -446,7 +523,8 @@ function pushModal (props) { label='转正时间:' placeholder="请选择转正时间" style={{ width: 288 }} - initValue={new Date()} /> + // initValue={new Date()} + />
+ // initValue={new Date()} + />
@@ -481,18 +560,30 @@ function pushModal (props) { /> {/* vitae */} -
+
上传简历:
-
-
- 请上传简历.pdf -
-
- -
-
+ +
+ 请上传简历.pdf +
+
+ +
+
+ ) + } + +
+
+ 请上传简历，不超过10M，支持pdf格式。
@@ -507,7 +598,7 @@ function pushModal (props) {
- + ); } @@ -517,6 +608,7 @@ function mapStateToProps (state) { // loading: members.isRequesting, user: auth.user, actions: global.actions, + apiRoot: global.apiRoot, // members: members.data, }; } diff --git a/web/client/src/sections/humanAffairs/components/style.less b/web/client/src/sections/humanAffairs/components/style.less new file mode 100644 index 0000000..aae9a02 --- /dev/null +++ b/web/client/src/sections/humanAffairs/components/style.less @@ -0,0 +1,15 @@ +.upload{ + .semi-upload-file-card{ + width:182px; + } +} +.vitae{ + .semi-upload-file-card{ + width:288px; + height: 32px; + .semi-upload-file-card-preview{ + height: 30px; + width: 30px; + } + } +} \ No newline at end of file diff --git a/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx b/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx index 9c996d3..0c66ccd 100644 --- a/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx +++ b/web/client/src/sections/humanAffairs/containers/personnelFiles.jsx @@ -1,10 +1,11 @@ import React, { useEffect, useState } from 'react'; import { connect } from 'react-redux'; -import { Select, Input, Button, CheckboxGroup } from '@douyinfe/semi-ui'; +import { Select, Input, Button, CheckboxGroup, Tooltip } from '@douyinfe/semi-ui'; import { IconSearch } from '@douyinfe/semi-icons'; import PersonnelModal from '../components/personnelModal'; import ExportMembersModal from './import-members-modal' import '../style.less' +import moment from 'moment' const Rest = (props) => { const { dispatch, actions, history, user, loading, socket } = props @@ -12,7 +13,7 @@ const Rest = (props) => { const { humanAffairs } = actions; let [departmentValue, setDepartmentValue] = useState(''); - let [archivesList, setArchivesList] = useState(['', '', '', '', '', '', '', '', '', '']); + let [archivesList, setArchivesList] = useState([]); const [personnelModal, setPersonnelModal] = useState(false);//档案弹框 const [exportModalVs, setExportModalVs] = useState(false); const options = [ @@ -29,9 +30,11 @@ const Rest = (props) => { getMemberSearchList() }, []) - function getMemberSearchList() {//搜索项企用户 - dispatch(humanAffairs.getMemberSearch()).then((res) => {//搜索项企用户 + function getMemberSearchList () {//搜索项企用户 + dispatch(humanAffairs.getMemberList()).then((res) => {//搜索项企用户 if (res.success) { + console.log('res.success', res.payload.data); + setArchivesList(res.payload.data) // let mytableData = JSON.parse(JSON.stringify(res.payload.data.rows)); // let mytableKey = [] // for (let index = 0; index < mytableData.length; index++) { @@ -46,11 +49,11 @@ const Rest = (props) => { }) } - function typeOnChange(e) {//角色选择 + function typeOnChange (e) {//角色选择 console.log('e.target.value', e.target.value); setTypeChoose(e.target.value); } - function seachValueChange() { + function seachValueChange () { } return ( @@ -146,19 +149,40 @@ const Rest = (props) => { return (
- +
- 0012 + {item.pepUserId}
-
- 行业服务部 -
- {/*
+ { + item.departmrnt.map((ite, idx) => { + let departmentsArr = [] + for (let i = 0; i < item.departmrnt.length; i++) { + departmentsArr.push(item.departmrnt[i].name) + } + return ( +
+ {idx == 0 ? + (
+ {ite.name} +
) : ('') -
*/} + } + { + item.departmrnt.length > 1 && idx == 1 ? ( + +
+ ... +
+ + ) : ('') + } +
+ ) + }) + }
@@ -166,27 +190,27 @@ const Rest = (props) => {
- 刘昊然 + {item.userName}
请假中
- 23岁 + {item.birthday ? moment(new Date()).diff(item.birthday, 'years') + '岁' : '暂无'}
- +
- 男 + {item.gender || '暂无'}
- 未婚 + {item.marital || '暂无'}
@@ -195,11 +219,11 @@ const Rest = (props) => {
- 人力资源部副部长 + {item.roleName || '暂无'}
- 9年经验 + {item.experienceYear ? item.experienceYear + '年经验' : '暂无'}
@@ -208,17 +232,17 @@ const Rest = (props) => {
- 入职3年 + {item.hiredate ? '入职' + moment(new Date()).diff(item.hiredate, 'years') + '年' : '暂无'}
- 本科 + {item.educationBackground || '暂无'}
@@ -242,6 +266,7 @@ const Rest = (props) => { // anxincloudArr={anxincloudArr} cancel={() => { setPersonnelModal(false); + getMemberSearchList() }} close={() => { setPersonnelModal(false); @@ -257,7 +282,7 @@ const Rest = (props) => { ) } -function mapStateToProps(state) { +function mapStateToProps (state) { const { auth, global, members, webSocket } = state; return { // loading: members.isRequesting, diff --git a/web/client/src/sections/humanAffairs/containers/personnelFilesDetail.jsx b/web/client/src/sections/humanAffairs/containers/personnelFilesDetail.jsx index eed1147..793cd98 100644 --- a/web/client/src/sections/humanAffairs/containers/personnelFilesDetail.jsx +++ b/web/client/src/sections/humanAffairs/containers/personnelFilesDetail.jsx @@ -4,17 +4,21 @@ import { Select, Input, Button, CheckboxGroup, DatePicker, Table } from '@douyin import { IconSearch } from '@douyinfe/semi-icons'; import ReactECharts from 'echarts-for-react'; import * as echarts from 'echarts'; +import DeleteModal from '../components/deleteModal'; + import '../style.less' const Rest = (props) => { - const { dispatch, actions, user, loading, socket } = props + const { dispatch, actions, user, loading, socket, history } = props const { humanAffairs } = actions; const [option, setOption] = useState({}); const [leaveoption, setLeaveOption] = useState({}); const [tableData, setTableData] = useState([{}, {}, {}, {}, {}, {}, {}]) //表格数据 const [leaveData, setLeaveData] = useState([{}, {}, {}, {}, {}, {}, {}]) //表格数据 + + const [deleteModal, setDeleteModal] = useState(false) //表格数据 const [columns, setColumns] = useState([//表格属性 { title: "实例号", @@ -119,14 +123,41 @@ const Rest = (props) => { }, }, ]) + + const [pepUserId, setPepUserId] = useState(''); const scroll = useMemo(() => ({ y: 248 }), []); useEffect(() => { getMemberSearchList() - getWorkOption() - getLeaveOption() + getWorkOption()//加班信息 + getLeaveOption()//请假信息 + setPepUserId(history?.location?.search.slice(1)) + peopleDetail() }, []) + function peopleDetail () { + dispatch(humanAffairs.getMemberList({keywordTarget:'number',keyword:history?.location?.search.slice(1)})).then((res) => {//搜索项企用户 + if (res.success) { + console.log('res.success', res.payload.data); + // setArchivesList(res.payload.data) + // let mytableData = JSON.parse(JSON.stringify(res.payload.data.rows)); + // let mytableKey = [] + // for (let index = 0; index < mytableData.length; index++) { + // mytableData[index].key = mytableData[index].id + // mytableKey.push(mytableData[index].id) + // } + // setTableKey(mytableKey) + // setTableData(mytableData) + // setLimits(res.payload.data.count) + // mylimits.current = res.payload.data.rows.length + } + }) + } function getWorkOption () {//请假折线图 + dispatch(humanAffairs.getMemberOvertime({pepUserId:history?.location?.search.slice(1),startDate:'',endDate:''})).then((res) => {//搜索项企用户 + if (res.success) { + console.log('res.success', res.payload.data); + } + }) var date = []; date.push([2017, 6, 1].join("/")); date.push([2017, 6, 2].join("/")); @@ -309,7 +340,9 @@ const Rest = (props) => {
-
+
{ + history.goBack(); + }}>
@@ -319,7 +352,9 @@ const Rest = (props) => {
编辑档案
-
+
{ setDeleteModal(true) }} + > 删除档案
@@ -734,6 +769,28 @@ const Rest = (props) => {
+ {//删除弹框 + deleteModal ? + { + setDeleteModal(false); + // getMemberSearchList() + }} + close={() => { + setDeleteModal(false); + // getUserList() + history.goBack() + }} > + : '' + } ) } diff --git a/web/client/src/utils/webapi.js b/web/client/src/utils/webapi.js index 0bc8f48..d2a55e7 100644 --- a/web/client/src/utils/webapi.js +++ b/web/client/src/utils/webapi.js @@ -18,7 +18,11 @@ export const ApiTable = { //人事管理-人员档案 getMemberSearch: 'member/search',//搜索项企用户 - addMembersBulk: 'add/members/bulk' + addMembersBulk: 'add/members/bulk', + postMember: 'member',//添加人员信息 + getMemberList: 'member/list',//查询人员列表 + delMember: 'member',//删除人员信息 + getMemberOvertime: 'member/overtime',//查询单个人员加班统计数据 }; export const RouteTable = {