feat: 软件锁新接收

src/pages/Product/Lock/Lockstore/components/ReceiveLock.jsx

@@ -8,10 +8,10 @@ import ProTable from '@ant-design/pro-table'
 import CustomModal from '@/components/Modal/src/components/CustomModal'
 
 const ReceiveLock = () => {
-  const tRef = useRef(null)
+  const tRef = useRef()
 
-  const receiveLongle = async (name, id, departmentIsNull) => {
-    const { code = -1 } = await apiReceiveOldLock(departmentIsNull, { id })
+  const receiveLongle = async (name, id) => {
+    const { code = -1 } = await apiReceiveOldLock({ id })
     if (code === consts.RET_CODE.SUCCESS) {
       message.success(`锁(${name})接收成功`)
       tRef.current?.reload()
@@ -28,10 +28,6 @@ const ReceiveLock = () => {
       title: '办事处'
     },
     {
-      dataIndex: 'departmentName',
-      title: '部门'
-    },
-    {
       dataIndex: 'product',
       title: '产品',
       width: '60%',
@@ -41,9 +37,7 @@ const ReceiveLock = () => {
       dataIndex: 'opreate',
       title: '操作',
       render: (_, record) => (
-        <Button
-          size="small"
-          onClick={() => receiveLongle(record.keyNum, record.id, !record.departmentName)}>
+        <Button size="small" onClick={() => receiveLongle(record.keyNum, record.id)}>
           接收
         </Button>
       )
@@ -54,6 +48,7 @@ const ReceiveLock = () => {
     <CustomModal title="以下锁为系统升级前未接收的锁，请及时接收；新系统生成的锁，将在列表中按“本部门”展示。">
       <div className={styles.modalContent}>
         <ProTable
+          rowKey={record => record.id}
           columns={columns}
           actionRef={tRef}
           toolBarRender={false}

src/pages/Product/Lock/Lockstore/components/ReceiveNewLock.jsx

@@ -0,0 +1,72 @@
+import { Button, message } from 'antd'
+import React, { useRef } from 'react'
+import styles from '@/pages/Customer/Company/components/ConnectCompany/index.less'
+import consts from '@/basic/consts'
+import { apiReceiveLock, queryReceiveList } from '@/services/lock'
+import { ProductLabel } from '../index'
+import ProTable from '@ant-design/pro-table'
+import CustomModal from '@/components/Modal/src/components/CustomModal'
+
+const ReceiveNewLock = () => {
+  const tRef = useRef()
+
+  const receiveLongle = async (name, id) => {
+    const { code = -1 } = await apiReceiveLock({ id })
+    if (code === consts.RET_CODE.SUCCESS) {
+      message.success(`锁(${name})接收成功`)
+      tRef.current?.reload()
+    }
+  }
+
+  const columns = [
+    {
+      dataIndex: 'keyNum',
+      title: '锁号'
+    },
+    {
+      dataIndex: 'departmentName',
+      title: '部门'
+    },
+    {
+      dataIndex: 'product',
+      title: '产品',
+      width: '60%',
+      render: text => <ProductLabel data={text} />
+    },
+    {
+      dataIndex: 'opreate',
+      title: '操作',
+      render: (_, record) => (
+        <Button size="small" onClick={() => receiveLongle(record.keyNum, record.id)}>
+          接收
+        </Button>
+      )
+    }
+  ]
+
+  return (
+    <CustomModal title="新系统生成的锁，将在列表中按“本部门”展示。">
+      <div className={styles.modalContent}>
+        <ProTable
+          rowKey={record => record.id}
+          columns={columns}
+          actionRef={tRef}
+          toolBarRender={false}
+          search={false}
+          bordered={true}
+          request={async params => {
+            const { data: { longle, total } = { longle: [], total: 0 }, code = -1 } =
+              await queryReceiveList(params)
+            return {
+              data: longle,
+              success: code === consts.RET_CODE.SUCCESS,
+              total
+            }
+          }}
+        />
+      </div>
+    </CustomModal>
+  )
+}
+
+export default ReceiveNewLock

src/pages/Product/Lock/Lockstore/index.jsx

@@ -12,6 +12,7 @@ import { useTableScroll } from '@/hooks/useAutoTable'
 import CompanyDetail from '@/pages/Customer/Company/components/CompanyDetail'
 import { refactorSortField } from '@/utils/utils'
 import ReceiveLock from './components/ReceiveLock'
+import ReceiveNewLock from './components/ReceiveNewLock'
 import PermSelect from '@/pages/Customer/Company/components/PermSelect'
 import { PermDataTypeEunm } from '@/pages/Customer/Company/components/PermSelect'
 
@@ -75,11 +76,20 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
     })
     toggleModal()
   }
+  const showReceiveNewLockModal = () => {
+    setModalProps({
+      width: '60vw',
+      modalRender: () => <ReceiveNewLock />,
+      onCancel: () => toggleModal()
+    })
+    toggleModal()
+  }
   const { initialState: { permData } = { permData: {} } } = useModel('@@initialState')
   const [state, setState] = useState({
     params: { dataPermission: 'oneself', staffIds: null },
     data: [],
     totalOld: 0, // 待接收锁总数
+    totalNew: 0,
     id: ''
   })
 
@@ -95,9 +105,9 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
   }
 
   // 刷新
-  const refreshData = () => {
-    tRef.current.reload()
-  }
+  // const refreshData = () => {
+  //   tRef.current.reload()
+  // }
 
   useEffect(() => {
     if (shouldUpdate) {
@@ -274,9 +284,14 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
         const srotOrder = refactorSortField(sort)
         const {
           code = -1,
-          data: { longle = [], total = 0, totalOld = 0 } = { longle: [], total: 0, totalOld: 0 }
+          data: { longle = [], total = 0, totalOld = 0, totalNew = 0 } = {
+            longle: [],
+            total: 0,
+            totalOld: 0,
+            totalNew: 0
+          }
         } = await queryLock({ ...params, ...srotOrder, ...filter })
-        setState({ ...state, totalOld })
+        setState({ ...state, totalOld, totalNew })
         return {
           data: longle,
           success: code === consts.RET_CODE.SUCCESS,
@@ -290,6 +305,9 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
           <Button type="primary" className="ml-4" onClick={() => showReceiveLockModal()}>
             待接收锁 ({state.totalOld})
           </Button>
+          <Button type="primary" className="ml-4" onClick={() => showReceiveNewLockModal()}>
+            待接收新锁 ({state.totalNew})
+          </Button>
         </>
       }
       toolbar={{

src/services/lock.js

@@ -37,12 +37,22 @@ export async function queryOldLockList(params) {
 }
 
 /** 接收旧锁 */
-export async function apiReceiveOldLock(departmentIsNull, params) {
-  let url = '/software/receiveOld'
-  if (!departmentIsNull) {
-    url = '/software/receive'
-  }
-  return request.post(url, {
+export async function apiReceiveOldLock(params) {
+  return request.post('/software/receiveOld', {
+    data: params
+  })
+}
+
+/** 获取新软件锁列表 */
+export async function queryReceiveList(params) {
+  return request.get('/software/receiveList', {
+    params
+  })
+}
+
+/** 接收新锁 */
+export async function apiReceiveLock(params) {
+  return request.post('/software/receive', {
     data: params
   })
 }