Merge branch 'master' of https://gitea.anxinyun.cn/gao.zhiyuan/HumanResource

web/client/src/sections/humanAffairs/containers/salersDistribution/personnelDistribution.jsx

@@ -12,6 +12,7 @@ const PersonnelDistribution = (props) => {
     const { dispatch, actions } = props
     const { humanAffairs } = actions;
     const [keywordTarget, setKeywordTarget] = useState('dep');
+    const [job, setJob] = useState('in');
     const [keyword, setKeyword] = useState('');//搜索内容
     const [limits, setLimits] = useState()//每页实际条数
     const [query, setQuery] = useState({ limit: 10, page: 0 }); //页码信息
@@ -37,7 +38,7 @@ const PersonnelDistribution = (props) => {
         let kt = keywordTarget == 'place' ? '' : keywordTarget;
         let k = keywordTarget == 'place' ? '' : keyword;
         let placeSearch = keywordTarget == 'place' ? keyword : '';
-        dispatch(humanAffairs.getSalesList({ keywordTarget: kt, keyword: k, placeSearch, ...query })).then(r => {
+        dispatch(humanAffairs.getSalesList({ keywordTarget: kt, keyword: k, job, placeSearch, ...query })).then(r => {
             if (r.success) {
                 setTableData(r.payload?.data?.rows);
                 setLimits(r.payload?.data?.count)
@@ -227,6 +228,13 @@ const PersonnelDistribution = (props) => {
                                 <Select.Option value='place'>地区</Select.Option>
                             </Select>
                         </div>
+                        <div>
+                            <Select value={job} style={{ width: 170, marginLeft: 15 }} onChange={setJob} >
+                                <Select.Option value='in'>在职</Select.Option>
+                                <Select.Option value='out'>离职</Select.Option>
+                                <Select.Option value='other'>特殊账号-特殊状态</Select.Option>
+                            </Select>
+                        </div>
                         <div style={{ margin: '0px 18px' }}>
                             <Input suffix={<IconSearch />}
                                 showClear