(*)重新提交

api/app/lib/controllers/salesDistribution/index.js

@@ -8,7 +8,7 @@ async function salesList(ctx) {
       const {
          keywordTarget, keyword, limit, page, state,
          hiredateStart, hiredateEnd, marital, native, workPlace,
-         orderBy, orderDirection, placeSearch
+         orderBy, orderDirection, placeSearch,userActiveStatus
       } = ctx.query
 
       const userRes = await memberList({
@@ -55,10 +55,12 @@ async function salesList(ctx) {
             department: info.departmrnt,
             hireDate: info.hiredate,//入职时间
             regularDate: info.regularDate,//转正时间
+            userActiveStatus:info.userActiveStatus,
             ...d.dataValues
          }
          rslt.push(item);
       })
+      rslt= rslt.filter(e=>e.userActiveStatus == userActiveStatus)
       ctx.status = 200;
       ctx.body = {
          count: res.count,

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

@@ -12,7 +12,7 @@ const PersonnelDistribution = (props) => {
     const { dispatch, actions } = props
     const { humanAffairs } = actions;
     const [keywordTarget, setKeywordTarget] = useState('dep');
-    const [job, setJob] = useState('in');
+    const [userActiveStatus, setuserActiveStatus] = useState(1);
     const [keyword, setKeyword] = useState('');//搜索内容
     const [limits, setLimits] = useState()//每页实际条数
     const [query, setQuery] = useState({ limit: 10, page: 0 }); //页码信息
@@ -38,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, job, placeSearch, ...query })).then(r => {
+        dispatch(humanAffairs.getSalesList({ keywordTarget: kt, keyword: k,userActiveStatus, placeSearch, ...query })).then(r => {
             if (r.success) {
                 setTableData(r.payload?.data?.rows);
                 setLimits(r.payload?.data?.count)
@@ -118,6 +118,12 @@ const PersonnelDistribution = (props) => {
             let arrStr = text.map(t => t.name);
             return getMultis(arrStr);
         }
+    },{
+        title: '在职状态',
+        dataIndex: 'userActiveStatus',
+        key: 'userActiveStatus',
+        width: 200,
+        render: (text, r, index) => text == '1'?'在职':text == '2'?'离职':'特殊账号-特殊状态'
     }, {
         title: '销售区域(省/直辖市)',
         dataIndex: 'provinces',
@@ -229,10 +235,10 @@ const PersonnelDistribution = (props) => {
                             </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 value={userActiveStatus} style={{ width: 170, marginLeft: 15 }} onChange={setuserActiveStatus} >
+                                <Select.Option value={1}>在职</Select.Option>
+                                <Select.Option value={2}>离职</Select.Option>
+                                <Select.Option value={3}>特殊账号-特殊状态</Select.Option>
                             </Select>
                         </div>
                         <div style={{ margin: '0px 18px' }}>