Merge branch 'dev' of http://192.168.1.41:3000/outaozhen/cldV2react into dev

src/pages/Customer/Company/components/CustomPerm.jsx

@@ -6,7 +6,7 @@ import styles from './ConnectCompany/index.less'
 import { DeleteOutlined } from '@ant-design/icons'
 import consts from '@/basic/consts'
 import { useDispatch } from 'umi'
-import { queryDepartmentStaffList } from '@/services/department'
+import { queryDepartmentStaffList } from '@/services/hr'
 import { useWindowSizeFn } from '@/hooks/event/useWindomSizeFn'
 import { isEmpty, isNull, isNullOrUnDef } from '@/utils/is'
 import CustomModal from '@/components/Modal/src/components/CustomModal'
@@ -214,7 +214,8 @@ const CustomPerm = ({ onConfirm, defaultValues = [] }) => {
           dataSource={state.transferDataSource}
           targetKeys={state.targetKeys}
           onChange={onChange}
-          showSelectAll={false}>
+          showSelectAll={false}
+        >
           {({ direction, onItemSelectAll, onItemSelect }) => {
             if (direction === 'left') {
               return state.dataSource?.length ? (
@@ -324,7 +325,8 @@ const CustomPerm = ({ onConfirm, defaultValues = [] }) => {
                           onClick={() => {
                             const currKeys = state.targetKeys.filter(i => i !== item.key)
                             handleUnCheckItem(state.treeKeys, item.key, { targetKeys: currKeys })
-                          }}>
+                          }}
+                        >
                           <DeleteOutlined />
                         </span>
                       </li>
@@ -351,7 +353,8 @@ const CustomPerm = ({ onConfirm, defaultValues = [] }) => {
               onConfirm({ staffIds: state.targetKeys, dataPermission: 'custom' })
             }
             closeModal()
-          }}>
+          }}
+        >
           确定
         </Button>
       </div>

src/pages/Hr/Employee/components/RoleMenu/index.jsx

@@ -2,7 +2,7 @@ import React, { useEffect } from 'react'
 import { Button, message, Tree, TreeSelect, Form } from 'antd'
 import { PlusOutlined } from '@ant-design/icons'
 import consts from '@/consts'
-import { apiaddDepartment } from '@/services/department'
+import { apiaddDepartment } from '@/services/hr'
 import { connect, useAccess } from 'umi'
 import { ProFormText } from '@ant-design/pro-form'
 import ModalDragForm from '@/components/Modal/src/components/ModalDragForm'

src/pages/Hr/Employee/index.jsx

@@ -5,7 +5,7 @@ import { useModal } from '@/components/Modal'
 import RoleMenu from '@/pages/Hr/Employee/components/RoleMenu'
 import { queryStaff } from '@/services/staff'
 import EmployeeDetail from '@/pages/Hr/Employee/components/EmployeeDetail'
-import { delDepartment } from '@/services/department'
+import { delDepartment } from '@/services/hr'
 import { connect, useAccess } from 'umi'
 import BasicTable from '@/components/Table'
 

src/pages/Hr/model.js

@@ -3,7 +3,7 @@
  */
 
 import consts from '@/consts'
-import { getDepartMentList } from '@/services/department'
+import { getDepartMentList } from '@/services/hr'
 
 const StaffModel = {
   namespace: 'staff',

src/pages/Statistic/Software/Usage/index.jsx

@@ -1,5 +1,86 @@
+import { useState, useEffect, useMemo } from 'react'
+import BasicTable from '@/components/Table'
+import { Select } from 'antd'
+import { queryDepartmentAndStaffWithOptionId } from '@/services/statistic'
+
 const Usage = () => {
-  return <div>usage</div>
+  const [state, setState] = useState({
+    op: 'staff',
+    opIds: []
+  })
+
+  const queryStaffAndDepartment = async params => {
+    queryDepartmentAndStaffWithOptionId(params)
+  }
+
+  useEffect(() => {
+    queryStaffAndDepartment()
+  }, [])
+  useEffect(() => {
+    // 重新发起请求
+  }, [state.op])
+  const columns = [
+    {
+      title: 'Name',
+      dataIndex: 'name',
+      key: 'name',
+      width: 100,
+      fixed: 'left'
+    },
+    {
+      title: '未使用',
+      children: [
+        {
+          title: '生成',
+          key: 'receive',
+          dataindex: 'receive'
+        },
+        {
+          title: '接受',
+          key: 'receive',
+          dataindex: 'receive'
+        }
+      ]
+    },
+    {
+      title: '已使用',
+      children: [
+        {
+          title: '借出',
+          key: 'receive',
+          dataindex: 'receive'
+        },
+        {
+          title: '销售',
+          key: 'receive',
+          dataindex: 'receive'
+        },
+        {
+          title: '赠送',
+          key: 'receive',
+          dataindex: 'receive'
+        }
+      ]
+    }
+  ]
+  const options = useMemo(() => {}, [state.op])
+  const handleOnOpIdsChange = () => {}
+
+  return (
+    <div>
+      <div>
+        <Select
+          options={[
+            { label: '部门', value: 'department' },
+            { label: '员工', value: 'staff' }
+          ]}
+          onChange={val => setState({ ...state, op: val })}
+        />
+        <Select className="ml-2" options={options} mode="multiple" onChange={handleOnOpIdsChange} />
+      </div>
+      <BasicTable columns={columns} search={false} />
+    </div>
+  )
 }
 
 export default Usage

src/services/statistic.js

@@ -0,0 +1,8 @@
+import request from '@/basic/utils/request'
+
+/** 获取部门/员工下的列表 */
+export async function queryDepartmentAndStaffWithOptionId(params = { option: 'staff' }) {
+  return request('', {
+    params
+  })
+}