diff --git a/web/client/src/sections/humanAffairs/containers/communication/employeeCommunication.jsx b/web/client/src/sections/humanAffairs/containers/communication/employeeCommunication.jsx index 61ee2a6..31f0c6f 100644 --- a/web/client/src/sections/humanAffairs/containers/communication/employeeCommunication.jsx +++ b/web/client/src/sections/humanAffairs/containers/communication/employeeCommunication.jsx @@ -12,6 +12,7 @@ const EmployeeCommunication = (props) => { const { humanAffairs } = actions; const [keywordTarget, setKeywordTarget] = useState('personalName'); const [keyword, setKeyword] = useState('');//搜索内容 + const [timeRange, setTimeRange] = useState('');//沟通时间范围 const [limits, setLimits] = useState()//每页实际条数 const [query, setQuery] = useState({ limit: 10, page: 0 }); //页码信息 const [modalV, setModalV] = useState(false); @@ -28,7 +29,7 @@ const EmployeeCommunication = (props) => { function getEmployeeCommunicateData(param) { let queryParam = param || query; - dispatch(humanAffairs.getEmployeeCommunicate({ keywordTarget, keyword, ...queryParam })).then(r => { + dispatch(humanAffairs.getEmployeeCommunicate({ keywordTarget, keyword, timeRange, ...queryParam })).then(r => { if (r.success) { setTableData(r.payload?.data?.rows); setLimits(r.payload?.data?.count); @@ -83,19 +84,20 @@ const EmployeeCommunication = (props) => { title: '沟通时间', dataIndex: 'communicateDate', key: 'communicateDate', - width: 130, + width: 120, + render: (text, record) => {text ? moment(text).format("YYYY-MM-DD") : '-'} }, { title: '沟通内容', dataIndex: 'communicateContent', key: 'communicateContent', - width: 140, + width: 150, render: (t, r) => { return (
{t}
@@ -172,7 +174,7 @@ const EmployeeCommunication = (props) => { }, { title: '操作', dataIndex: 'action', - width: 120, + width: 90, render: (text, record) => { return
onDetail(record)}>查看详情 @@ -189,6 +191,14 @@ const EmployeeCommunication = (props) => { setModalV(false) } + function handleChange (date) { + if (date.length > 1) { + setTimeRange(moment(date[0]).format('YYYY-MM-DD 00:00:00')+','+moment(date[1]).format('YYYY-MM-DD 23:59:59')) + } + else { + setTimeRange(''); + } + } const scroll = useMemo(() => ({}), []); return (
@@ -227,8 +237,7 @@ const EmployeeCommunication = (props) => {
沟通时间: -