feat: 1

src/pages/Staff/Employee/components/EmployeeDetail/EmployeeForm.jsx

@@ -4,7 +4,6 @@ import EditableForm from '@/components/EditableForm'
 
 const EmployeeForm = props => {
   const { staff } = props
-  console.log(staff)
   const columns = [
     {
       dataIndex: 'jobNumber',
@@ -37,7 +36,7 @@ const EmployeeForm = props => {
       span: 12
     },
     {
-      dataIndex: 'avtelephoneatar',
+      dataIndex: 'telephone',
       label: '手机',
       span: 12
     },
@@ -47,7 +46,7 @@ const EmployeeForm = props => {
       span: 12
     },
     {
-      dataIndex: 'avtelephoneatarName',
+      dataIndex: 'wecat',
       label: '微信',
       span: 12
     },
@@ -72,7 +71,7 @@ const EmployeeForm = props => {
       span: 12
     },
     {
-      dataIndex: 'position',
+      dataIndex: 'nation',
       label: '民族',
       span: 12
     },
@@ -145,17 +144,17 @@ const EmployeeForm = props => {
       span: 12
     },
     {
-      dataIndex: 'graduateInstitutionsName',
+      dataIndex: 'certificate',
       label: '毕业证书',
       span: 12
     },
     {
-      dataIndex: 'certificate',
+      dataIndex: 'diploma',
       label: '学位证书',
       span: 12
     },
     {
-      dataIndex: 'diploma',
+      dataIndex: 'professionalTitle',
       label: '职称',
       span: 12
     },
@@ -213,10 +212,10 @@ const EmployeeForm = props => {
           <h2 className="text-gray-500">员工详情</h2>
         </Col>
         <Col span={16} className="zh-text-right zh-gray">
-          XXX创建于XXX
+          {staff.username}入职于{staff.hiredate}
         </Col>
         <Col span={22}>
-          <h2 className="text-2xl pb-4">张三</h2>
+          <h2 className="text-2xl pb-4">{staff.username}</h2>
         </Col>
         <Col span={2} />
       </Row>

src/pages/Staff/Employee/components/EmployeeDetail/EmployeeLowerList.jsx

@@ -1,7 +1,19 @@
 import React from 'react'
+import { Tabs } from 'antd'
 
 const EmployeeLowerList = () => {
-  return <div>lowerlist</div>
+  const { TabPane } = Tabs
+  return (
+    <div>
+      <div className="zh-pd-left-15">
+        <Tabs>
+          <TabPane tab="软件锁" key="软件锁">
+            <div className="sheet-right-panel">目前功能暂时不开放</div>
+          </TabPane>
+        </Tabs>
+      </div>
+    </div>
+  )
 }
 
 export default EmployeeLowerList

src/pages/Staff/Employee/components/EmployeeDetail/EmployeeTabList.jsx

@@ -1,7 +1,40 @@
 import React from 'react'
+import { Tabs, List } from 'antd'
+import { dayjsFormat } from '@/utils/utils'
 
-const EmployeeTabList = () => {
-  return <div>tablist</div>
+const EmployeeTabList = props => {
+  const {
+    log: { log: logs = [], total = 0 }
+  } = props
+  const { TabPane } = Tabs
+  return (
+    <div>
+      <div className="zh-pd-left-15">
+        <Tabs>
+          <TabPane tab="日志" key="日志">
+            <div className="sheet-panel-record">
+              该功能暂时不开放
+              {/* <List
+                dataSource={logs}
+                split={false}
+                renderItem={item => (
+                  <List.Item>
+                    <a>@{item.operatorName}</a> {item.content}
+                    <List.Item.Meta
+                      // avatar=
+                      // title=
+                      // description={ dayjsFormat(item.createTime, 'YYYY-MM-DD')}
+                      description={dayjsFormat(item.createTime)}
+                    />
+                  </List.Item>
+                )}
+              /> */}
+            </div>
+          </TabPane>
+        </Tabs>
+      </div>
+    </div>
+  )
 }
 
 export default EmployeeTabList

src/pages/Staff/Employee/components/EmployeeDetail/index.jsx

@@ -12,7 +12,8 @@ const EmployeeDetail = props => {
   // console.log(dataId)
   const [state, setState] = useState({
     loading: false,
-    staff: {}
+    staff: {},
+    log: []
   })
   const initData = async id => {
     setState({ ...state, loading: true })
@@ -47,7 +48,7 @@ const EmployeeDetail = props => {
         </Col>
         <Col span={12} className="sheet-box-right">
           <EmployeeLowerList />
-          <EmployeeTabList />
+          <EmployeeTabList log={state.log} />
         </Col>
       </Row>
     </div>

src/pages/Staff/Employee/index.jsx

@@ -42,9 +42,9 @@ const Employee = () => {
       width: 50,
       render: (username, record) => (
         <span
-          onClick={() => showDrawer(record.staffId)}
+          onClick={() => showDrawer(record.id)}
           // onClick={() => {
-          //   console.log(record.staffId)
+          //   console.log(record.id)
           // }}
           className="text-primary cursor-pointer hover:text-[#967bbd]">
           {username}
@@ -114,7 +114,7 @@ const Employee = () => {
             <ProTable
               bordered
               params={{ departmentId: state.params.id }}
-              rowKey={record => record.staffId}
+              rowKey={record => record.id}
               columns={columns}
               request={async params => {
                 const {