fix: 软件锁接收操作修复

src/pages/Product/Lock/LockStore/components/LockDetail/OpreateLock.tsx

@@ -174,23 +174,24 @@ const OpreateLock: React.FC<OpreateLockProps> = props => {
               }
             })
           }
-        }
-        if (type === lockTypeEnum.REMARK && defaultValues) {
-          const { code = -1 } = await apiUpdateLonglelog(values)
-          if (code === consts.RET_CODE.SUCCESS) {
-            message.success('修改成功')
-            onCancel()
-            dispatch({
-              type: 'refresh/commitAction',
-              payload: {
-                main: 'software',
-                target: longleId
-              }
-            })
-          }
         } else {
-          const isSuccess = await onConfirm({ ...values, preserveStatus: type })
-          isSuccess && onCancel()
+          if (type === lockTypeEnum.REMARK && defaultValues) {
+            const { code = -1 } = await apiUpdateLonglelog(values)
+            if (code === consts.RET_CODE.SUCCESS) {
+              message.success('修改成功')
+              onCancel()
+              dispatch({
+                type: 'refresh/commitAction',
+                payload: {
+                  main: 'software',
+                  target: longleId
+                }
+              })
+            }
+          } else {
+            const isSuccess = await onConfirm({ ...values, preserveStatus: type })
+            isSuccess && onCancel()
+          }
         }
       })
       .finally(() => {

src/pages/Product/Lock/LockStore/components/LockDetail/TabList.tsx

@@ -7,7 +7,7 @@ import { apiSoftwareAddLonglelog, apiDelLonglelog } from '@/services/product'
 import { ProductLabel } from '@/pages/Product/Lock/LockStore'
 import { lockTypeEnum } from './OpreateLock'
 import { servicelogEnum, showProductsStatus, showNewLongleStatus, showMarkStatus } from './consts'
-import { useDispatch, useAccess } from 'umi'
+import { useDispatch } from 'umi'
 import { useModal } from '@/components/ModalStore'
 import TimeLineList from '@/components/TimeLineList'
 
@@ -55,7 +55,6 @@ const LockTabList: React.FC<LockTabListProps> = ({
   upgradeProduct,
   actionPayload
 }) => {
-  const hasAddPerm = useAccess()?.validatePermByType('lockstore_delete_record')
   const dispatchModal = useModal()
   const dispatch = useDispatch()
   const { TabPane } = Tabs
@@ -159,11 +158,7 @@ const LockTabList: React.FC<LockTabListProps> = ({
             <div>
               <div className="flex flex-col mr-2">
                 <div>
-                  <span
-                    className="textPurple text-hex-967bbd cursor-pointer"
-                    onClick={() => dispatchModal('D_CLIENT_DETAIL', { dataId: item.clientId })}>
-                    {item.status !== 6 ? <>{item.client}</> : null}
-                  </span>
+                  <span className="ml-1">{item.operator}</span>
                 </div>
                 <div className="text-black text-opacity-40">{dayjsFormat(item.dateline, 'HH:mm:ss')}</div>
               </div>
@@ -174,7 +169,12 @@ const LockTabList: React.FC<LockTabListProps> = ({
           <div className="flex flex-col">
             <div>
               <span className="text-black text-opacity-60">操作：</span>
-              {servicelogEnum[item.status]} <span className="ml-1">{item.operator}</span>
+              {servicelogEnum[item.status]}{' '}
+              <span
+                className="textPurple text-hex-967bbd cursor-pointer"
+                onClick={() => dispatchModal('D_CLIENT_DETAIL', { dataId: item.clientId })}>
+                {item.status !== 6 ? <>{item.client}</> : null}
+              </span>
             </div>
             <div>
               <span className="text-black text-opacity-60">服务内容：</span>

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

@@ -299,27 +299,6 @@ const LockStore = ({ prodList = [], dispatch, shouldUpdate }) => {
           }
         }}
         columnsStateMap={columnsStateMap}
-        headerTitle={
-          // <Dropdown
-          //   trigger="click"
-          //   overlay={
-          //     <Menu onClick={dropDownMenClick}>
-          //       {state.totalOld ? <Menu.Item key="1">接收旧锁</Menu.Item> : null}
-
-          //       {state.totalNew ? <Menu.Item key="2">接收新锁</Menu.Item> : null}
-          //     </Menu>
-          //   }>
-          //   <Button>
-          //     接收锁
-          //     <DownOutlined />
-          //   </Button>
-          // </Dropdown>
-          state.totalOld ? (
-            <Button type="primary" onClick={() => dispatchModal('M_RECEIVE_LOCK', { refresh: refreshData })}>
-              接收旧锁({state.totalOld})
-            </Button>
-          ) : null
-        }
         toolbar={{
           search: (
             <Tooltip placement="bottom" title="输入软件锁号、客户、单位名称">