Browse Source

修改问题

master
deartibers 2 years ago
parent
commit
54a602d93b
  1. BIN
      web/client/assets/images/favicon.ico
  2. 2
      web/client/index.ejs
  3. 2
      web/client/index.html
  4. 2
      web/client/src/index.jsx
  5. 10
      web/client/src/sections/humanAffairs/containers/employeeInformation.jsx
  6. 10
      web/client/src/sections/humanAffairs/containers/leaveStatistics.jsx
  7. 10
      web/client/src/sections/humanAffairs/containers/overtimeStatistics.jsx

BIN
web/client/assets/images/favicon.ico

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

2
web/client/index.ejs

@ -7,7 +7,7 @@
<!-- <meta content="upgrade-insecure-requests" http-equiv="Content-Security-Policy"> --> <!-- <meta content="upgrade-insecure-requests" http-equiv="Content-Security-Policy"> -->
<link rel="shortcut icon" href="/assets/images/favicon.ico"> <!-- <link rel="shortcut icon" href="/assets/images/favicon.ico"> -->
<script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_20231_3.d613c57d3bf10acf9916c8162dae204a.es5.js"></script> <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_20231_3.d613c57d3bf10acf9916c8162dae204a.es5.js"></script>
</head> </head>

2
web/client/index.html

@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width" /> <meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width" />
<link rel="shortcut icon" href="/assets/images/favicon.ico"> <!-- <link rel="shortcut icon" href="/assets/images/favicon.ico"> -->
<script <script
src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_20231_3.d613c57d3bf10acf9916c8162dae204a.es5.js"></script> src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_20231_3.d613c57d3bf10acf9916c8162dae204a.es5.js"></script>

2
web/client/src/index.jsx

@ -6,4 +6,4 @@ import { render } from 'react-dom';
import App from './app'; import App from './app';
import './index.less'; import './index.less';
render((<App projectName="运维服务" />), document.getElementById('HrApp')); render((<App projectName="FS-EIMS企业信息管理系统" />), document.getElementById('HrApp'));

10
web/client/src/sections/humanAffairs/containers/employeeInformation.jsx

@ -20,6 +20,7 @@ const employeeInformation = (props) => {
const [setup, setSetup] = useState(false);// const [setup, setSetup] = useState(false);//
const [setupp, setSetupp] = useState([]);// const [setupp, setSetupp] = useState([]);//
const [lookup, setLookup] = useState({});//
const [query, setQuery] = useState({ limit: 10, page: 0 }); // const [query, setQuery] = useState({ limit: 10, page: 0 }); //
const [order, setOrder] = useState({ orderBy: 'hiredate', orderDirection: 'DESC' }); // const [order, setOrder] = useState({ orderBy: 'hiredate', orderDirection: 'DESC' }); //
const [limits, setLimits] = useState()// const [limits, setLimits] = useState()//
@ -88,10 +89,10 @@ const employeeInformation = (props) => {
function getMemberSearchList () {// function getMemberSearchList () {//
let obj = form.current.getValues() let obj = lookup
if (form.current.getValues().entryTime?.length > 1) { if (lookup.entryTime?.length > 1) {
obj.hiredateStart = moment(form.current.getValues().entryTime[0]).format('YYYY-MM-DD') obj.hiredateStart = moment(lookup.entryTime[0]).format('YYYY-MM-DD')
obj.hiredateEnd = moment(form.current.getValues().entryTime[1]).format('YYYY-MM-DD') obj.hiredateEnd = moment(lookup.entryTime[1]).format('YYYY-MM-DD')
} }
else { else {
obj.hiredateStart = '' obj.hiredateStart = ''
@ -582,6 +583,7 @@ const employeeInformation = (props) => {
/> />
<Button theme='solid' type='primary' style={{ width: 80, borderRadius: 2, height: 32, background: '#DBECFF', color: '#005ABD' }} <Button theme='solid' type='primary' style={{ width: 80, borderRadius: 2, height: 32, background: '#DBECFF', color: '#005ABD' }}
onClick={() => { onClick={() => {
setLookup(form.current.getValues())
setQuery({ limit: 10, page: 0 }) setQuery({ limit: 10, page: 0 })
}}>查询</Button> }}>查询</Button>
</div> </div>

10
web/client/src/sections/humanAffairs/containers/leaveStatistics.jsx

@ -19,6 +19,7 @@ const leaveStatistics = (props) => {
const [setup, setSetup] = useState(false);// const [setup, setSetup] = useState(false);//
const [setupp, setSetupp] = useState([]);// const [setupp, setSetupp] = useState([]);//
const [lookup, setLookup] = useState({});//
const [query, setQuery] = useState({ limit: 10, page: 0 }); // const [query, setQuery] = useState({ limit: 10, page: 0 }); //
const [order, setOrder] = useState({ orderBy: 'code', orderDirection: 'DESC' }); // const [order, setOrder] = useState({ orderBy: 'code', orderDirection: 'DESC' }); //
const [limits, setLimits] = useState()// const [limits, setLimits] = useState()//
@ -51,10 +52,10 @@ const leaveStatistics = (props) => {
function getAttendanceVacateList () {// function getAttendanceVacateList () {//
let obj = form.current.getValues() let obj = lookup
if (form.current.getValues().entryTime?.length > 1) { if (lookup.entryTime?.length > 1) {
obj.startDate = moment(form.current.getValues().entryTime[0]).format('YYYY-MM-DD') obj.startDate = moment(lookup.entryTime[0]).format('YYYY-MM-DD')
obj.endDate = moment(form.current.getValues().entryTime[1]).format('YYYY-MM-DD') obj.endDate = moment(lookup.entryTime[1]).format('YYYY-MM-DD')
} }
else { else {
obj.startDate = '' obj.startDate = ''
@ -336,6 +337,7 @@ const leaveStatistics = (props) => {
/> />
<Button theme='solid' type='primary' style={{ width: 80, borderRadius: 2, height: 32, background: '#DBECFF', color: '#005ABD' }} <Button theme='solid' type='primary' style={{ width: 80, borderRadius: 2, height: 32, background: '#DBECFF', color: '#005ABD' }}
onClick={() => { onClick={() => {
setLookup(form.current.getValues())
setQuery({ limit: 10, page: 0 }) setQuery({ limit: 10, page: 0 })
}}>查询</Button> }}>查询</Button>
</div> </div>

10
web/client/src/sections/humanAffairs/containers/overtimeStatistics.jsx

@ -19,6 +19,7 @@ const overtimeStatistics = (props) => {
const [setup, setSetup] = useState(false);// const [setup, setSetup] = useState(false);//
const [setupp, setSetupp] = useState([]);// const [setupp, setSetupp] = useState([]);//
const [lookup, setLookup] = useState({});//
const [query, setQuery] = useState({ limit: 10, page: 0 }); // const [query, setQuery] = useState({ limit: 10, page: 0 }); //
const [order, setOrder] = useState({ orderBy: 'code', orderDirection: 'DESC' }); // const [order, setOrder] = useState({ orderBy: 'code', orderDirection: 'DESC' }); //
const [limits, setLimits] = useState()// const [limits, setLimits] = useState()//
@ -59,10 +60,10 @@ const overtimeStatistics = (props) => {
function getAttendanceOvertimeList () {// function getAttendanceOvertimeList () {//
let obj = form.current.getValues() let obj = lookup
if (form.current.getValues().entryTime?.length > 1) { if (lookup.entryTime?.length > 1) {
obj.startDate = moment(form.current.getValues().entryTime[0]).format('YYYY-MM-DD') obj.startDate = moment(lookup.entryTime[0]).format('YYYY-MM-DD')
obj.endDate = moment(form.current.getValues().entryTime[1]).format('YYYY-MM-DD') obj.endDate = moment(lookup.entryTime[1]).format('YYYY-MM-DD')
} }
else { else {
obj.startDate = '' obj.startDate = ''
@ -431,6 +432,7 @@ const overtimeStatistics = (props) => {
/> />
<Button theme='solid' type='primary' style={{ width: 80, borderRadius: 2, height: 32, background: '#DBECFF', color: '#005ABD' }} <Button theme='solid' type='primary' style={{ width: 80, borderRadius: 2, height: 32, background: '#DBECFF', color: '#005ABD' }}
onClick={() => { onClick={() => {
setLookup(form.current.getValues())
setQuery({ limit: 10, page: 0 }) setQuery({ limit: 10, page: 0 })
}}>查询</Button> }}>查询</Button>
</div> </div>

Loading…
Cancel
Save