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

2 years ago · 754f4f83b6
9 changed files with 70 additions and 55 deletions
--- a/api/app/lib/controllers/member/index.js
+++ b/api/app/lib/controllers/member/index.js
@ -116,12 +116,12 @@ async function searchPepMember (ctx) {
            ON user_role.user = user.id
         LEFT JOIN role
            ON role.id = user_role.role
+         LEFT JOIN basicdata_post
+            ON basicdata_post.id = user.post
         LEFT JOIN department_user
            ON department_user.user = user.id
         LEFT JOIN department
            ON department.id = department_user.department
-        LEFT JOIN basicdata_post
-            ON basicdata_post.id = user.post
         WHERE 
            user.delete = '0'
         ${whereOption.length ? `AND ${whereOption.join(' OR ')}` : ''}
@ -149,6 +149,7 @@ async function searchPepMember (ctx) {
               pepUserId: u.pepUserId,
               name: u.userName,
               userCode: u.userCode,
+               userPost: u.userPost,
               departmrnt: u.depId ? [{
                  id: u.depId,
                  name: u.depName
@ -156,8 +157,7 @@ async function searchPepMember (ctx) {
               role: u.roleId ? [{
                  id: u.roleId,
                  name: u.roleName
-               }] : [],
-               userPost:u.userPost
+               }] : []
            })
         }
      })
@ -185,7 +185,13 @@ async function del (ctx) {
            pepUserId,
         }
      })
-
+      await models.SalesDistribution.update({//顺便把销售人员删了
+         del: true,
+      }, {
+         where: {
+            pepUserId,
+         }
+      })
      ctx.status = 204;
   } catch (error) {
      ctx.fs.logger.error(`path: ${ctx.path}, error: ${error}`);
--- a/api/app/lib/controllers/salesDistribution/index.js
+++ b/api/app/lib/controllers/salesDistribution/index.js
@ -27,6 +27,7 @@ async function salesList(ctx) {
         where: { del: false },
         offset: Number(page) * Number(limit),
         limit: Number(limit),
+         order: [['id', 'DESC']]
      })

      let rslt = []
--- a/web/client/index.ejs
+++ b/web/client/index.ejs
@ -9,7 +9,7 @@
   
   <!-- <link rel="shortcut icon" href="/assets/images/favicon.ico"> -->

-   <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_20231_12.7f8fd1546294d369f0a85f7d68afb538.es5.js"></script> 
+   <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_20231_13.3484caadabc6f822796451f94a83fc64.es5.js"></script> 

 </head>

--- a/web/client/index.html
+++ b/web/client/index.html
@ -7,7 +7,7 @@

    <!-- <link rel="shortcut icon" href="/assets/images/favicon.ico"> -->

-    <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_20231_12.7f8fd1546294d369f0a85f7d68afb538.es5.js"></script> 
+    <script src="https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/icons_20231_13.3484caadabc6f822796451f94a83fc64.es5.js"></script> 
 </head>

 <body>
--- a/web/client/src/sections/humanAffairs/containers/import-members-modal.js
+++ b/web/client/src/sections/humanAffairs/containers/import-members-modal.js
@ -343,7 +343,7 @@ const ImportMembersModal = props => {
                                    error(`第${i + 2}行工作经验（年）错误，请填写非负数`)
                                    return
                                }
-                                postData.push({//人员编号 待办todotodo
+                                postData.push({
                                    pepUserId: xqExist.pepUserId, name, idNumber, gender, birthday, nativePlace, marital,
                                    politicsStatus, phoneNumber, workPlace, graduatedFrom, educationBackground, specialty, graduationDate,
                                    hiredate, turnProbationPeriod, regularDate, dimissionDate, experienceYear, occupationalHistory,
--- a/web/client/src/sections/humanAffairs/containers/salersDistribution/importSalersModal.js
+++ b/web/client/src/sections/humanAffairs/containers/salersDistribution/importSalersModal.js
@ -5,7 +5,6 @@ import { Modal, Form, Button, Notification } from '@douyinfe/semi-ui';
 import { IconUpload } from '@douyinfe/semi-icons';
 import cityData from '../../components/city.json';
 import XLSX from 'xlsx'
-import { membersBulkAdd } from '../../actions/personnelFiles'
 //下载模板和上传文件读取
 const ImportSalersModal = props => {
    const { dispatch, actions, onCancel, rzMembers } = props
@ -147,7 +146,7 @@ const ImportSalersModal = props => {
    return (
        <Modal
            title="导入" visible={true}
-            onOk={confirm}
+            onOk={confirm} width={620}
            confirmLoading={loading}
            onCancel={() => {
                setMsg('')
@ -224,7 +223,7 @@ const ImportSalersModal = props => {
                                    error(`第${i + 2}行销售区域（市）错误`)
                                    return
                                }
-                                postData.push({//人员编号 待办todotodo
+                                postData.push({
                                    pepUserId: rzExist.pepUserId, name,
                                    provinces: provinces.split('、'), cities: cities.split('、'),
                                    del: false
@ -244,6 +243,13 @@ const ImportSalersModal = props => {
                <div style={{ color: '#ccc' }}>最大不超过200M，导入文件需与
                    <span onClick={() => download()} style={{ cursor: 'pointer', color: '#0066FF' }}>导入模板</span>
                    一致</div>
+                <div style={{ marginTop: 20, border: '1px solid #C7E1FF', background: '#F4F8FF', borderRadius: 2, padding: '8px 0px 7px 12px', alignItems: 'center', color: '#0F7EFB', fontSize: 12 }}>
+                    <div>填写要求：</div>
+                    <div>员工编号：必填，唯一，数字和字母的组合；</div>
+                    <div>姓名：必填，若与员工编号对应的项企用户姓名不同，将以项企数据为准；</div>
+                    <div>销售区域（省/直辖市）：必填，省或直辖市顿号隔开，如“北京市、江西省、江苏省”；</div>
+                    <div>销售区域（市）：非必填，归属所填省的地级市顿号隔开，如“南昌市、镇江市”。</div>
+                </div>
            </Form>
        </Modal >
    )
--- a/web/client/src/sections/humanAffairs/containers/salersDistribution/personnelDistribution.jsx
+++ b/web/client/src/sections/humanAffairs/containers/salersDistribution/personnelDistribution.jsx
@ -71,6 +71,7 @@ const PersonnelDistribution = (props) => {
    const getMultis = (arrStr) => {//默认展示2个
        return <div style={{ display: 'flex' }}>
            {
+                arrStr.length ?
                    arrStr.map((ite, idx) => {
                        return (
                            <div key={idx} style={{ display: 'flex' }}>
@ -90,7 +91,7 @@ const PersonnelDistribution = (props) => {
                                }
                            </div>
                        )
-                })
+                    }) : '-'
            }
        </div>
    }
@ -111,7 +112,7 @@ const PersonnelDistribution = (props) => {
        title: starHeader('部门名称'),
        dataIndex: 'department',
        key: 'department',
-        width: '15%',
+        width: '18%',
        render: (text, r, index) => {
            let arrStr = text.map(t => t.name);
            return getMultis(arrStr);
@ -136,18 +137,19 @@ const PersonnelDistribution = (props) => {
        title: starHeader('岗位'),
        dataIndex: 'post',
        key: 'post',
-        width: '10%',
+        width: '11%',
+        render: (text, record) => <span>{text || '-'}</span>
    }, {
        title: starHeader('入职时间'),
        dataIndex: 'hireDate',
        key: 'hireDate',
-        width: '10%',
+        width: '8%',
        render: (text, record) => <span>{text || '-'}</span>
    }, {
        title: starHeader('转正时间'),
        dataIndex: 'regularDate',
        key: 'regularDate',
-        width: '10%',
+        width: '8%',
        render: (text, record) => <span>{text || '-'}</span>
    }, {
        title: starHeader('工龄'),
@ -236,9 +238,9 @@ const PersonnelDistribution = (props) => {
                            onClick={() => { setImportModalV(true); }}>
                            导入
                        </div>
-                        <div style={{ padding: '6px 20px', background: '#00BA85', color: '#FFFFFF', fontSize: 14, marginLeft: 18 }}>
+                        {/* <div style={{ padding: '6px 20px', background: '#00BA85', color: '#FFFFFF', fontSize: 14, marginLeft: 18 }}>
                            导出
-                        </div>
+                        </div> */}
                    </div>
                </div>

--- a/web/client/src/sections/humanAffairs/containers/salersDistribution/salesMemberModal.js
+++ b/web/client/src/sections/humanAffairs/containers/salersDistribution/salesMemberModal.js
@ -94,7 +94,7 @@ const SalesMemberModal = (props) => {
                            hireDate: exist.hiredate,
                            regularDate: exist.regularDate,
                            userCode: user.userCode,
-                            post: '岗位todo'
+                            post: user.userPost//岗位
                        }
                        setPeoplePro(item)
                    }
@ -143,7 +143,7 @@ const SalesMemberModal = (props) => {
                {label}
            </div>
            <div style={{ color: '#4A4A4A', fontSize: 12 }}>
-                {value}
+                {value || '-'}
            </div>
        </div>
    }
--- a/web/client/src/sections/humanAffairs/nav-item.jsx
+++ b/web/client/src/sections/humanAffairs/nav-item.jsx
@ -49,7 +49,7 @@ export function getNavItem(user, dispatch) {
                }, {
                    itemKey: 'salesStatistics',
                    text: '销售统计',
-                    icon: <iconpark-icon style={{ width: 20, height: 20 }} name="iconcbzhaopin"></iconpark-icon>,//wwwtodo
+                    icon: <iconpark-icon style={{ width: 20, height: 20 }} name="iconxiaoshou"></iconpark-icon>,//wwwtodo
                    to: '/humanAffairs/recruit/salesStatistics/personnelDistribution',
                    items: [{
                        itemKey: 'personnelDistribution', to: '/humanAffairs/recruit/salesStatistics/personnelDistribution', text: '销售人员分布'