fix: 软件锁升级弹窗

src/components/PopContent/Locks/LockTabList.jsx

@@ -8,6 +8,7 @@ import LockUpgrade from './LockUpgrade'
 
 const LockTabList = props => {
   const { longleLog, clientId, longleId } = props
+  console.log(clientId)
   const [state, setState] = useState({
     visible: false
   })
@@ -71,7 +72,7 @@ const LockTabList = props => {
                         /> */}
                       </Col>
                       <Col span="16">
-                        <ProductLabel data={item.product}></ProductLabel>
+                        <ProductLabel data={item.product} />
                       </Col>
                     </Row>
                   </List.Item>
@@ -91,14 +92,7 @@ const LockTabList = props => {
         >
           借出/销售/赠送
         </Button>
-        <Button
-          type="primary"
-          ghost
-          size="small"
-          className="zh-mg-right-3"
-          onClick={() => setAddLonglelog({ ...setAddLonglelog, visible: true })}>
-          升级
-        </Button>
+        <LockUpgrade onConfirm={handleAddLonglelog} />
         <Button type="primary" ghost size="small" className="zh-mg-right-3">
           更换
         </Button>
@@ -108,12 +102,12 @@ const LockTabList = props => {
         <Button type="primary" ghost size="small">
           备注
         </Button>
-        <LockUpgrade
+        {/* <LockUpgrade
           onConfirm={handleAddLonglelog}
           loading={addLonglelog.loading}
           visible={addLonglelog.visible}
           onCancel={() => setAddLonglelog({ ...addLonglelog, visible: false })}
-        />
+        /> */}
       </div>
     </div>
   )

src/components/PopContent/Locks/LockUpgrade.jsx

@@ -1,22 +1,46 @@
 import React, { useEffect } from 'react'
-import { Modal } from 'antd'
-import ProForm, { ProFormSelect } from '@ant-design/pro-form'
+import { Button, Modal } from 'antd'
+import ProForm, { ProFormSelect, ModalForm } from '@ant-design/pro-form'
 import { useForm } from 'antd/lib/form/Form'
 
 const LockUpgrade = props => {
-  const [form] = useForm()
+  // const [form] = useForm()
   const { visible, onCancel, onConfirm, loading } = props
   const layout = {
     layout: 'horizontal'
   }
-  useEffect(() => {
-    if (visible) {
-      form.resetFields()
-    }
-  }, [])
+  // useEffect(() => {
+  //   if (visible) {
+  //     form.resetFields()
+  //   }
+  // }, [])
   return (
     <div>
-      <Modal
+      <ModalForm
+        size="small"
+        {...layout}
+        title="升级软件锁"
+        trigger={
+          <Button type="primary" ghost size="small" className="zh-mg-right-3">
+            升级
+          </Button>
+        }
+        onFinish={async values => {
+          await onConfirm(values)
+          return true
+        }}>
+        <ProFormSelect
+          name="product"
+          label="新增产品"
+          valueEnum={{
+            open: 'aaa',
+            closer: 'fwfwuf'
+          }}
+          placeholder="请选择新增产品"
+          rules={[{ required: true, message: '请选择新增产品' }]}
+        />
+      </ModalForm>
+      {/* <Modal
         {...layout}
         title="升级软件锁"
         visible={visible}
@@ -41,17 +65,9 @@ const LockUpgrade = props => {
               }
             }
           }}>
-          <ProFormSelect
-            name="select"
-            label="新增产品"
-            valueEnum={{
-              open: 'aaa',
-              closer: 'fwfwuf'
-            }}
-            placeholder="请选择新增产品"
-            rules={[{ required: true, message: '请选择新增产品' }]}></ProFormSelect>
+
         </ProForm>
-      </Modal>
+      </Modal> */}
     </div>
   )
 }

src/components/PopContent/Locks/index.jsx

@@ -51,7 +51,11 @@ const Index = props => {
             </div>
           </Col>
           <Col span={12}>
-            <LockTabList longleLog={state.longleLog} longleId={state.longle.id} />
+            <LockTabList
+              longleLog={state.longleLog}
+              longleId={state.longle.id}
+              clientId={state.longle.clientId}
+            />
             <LockLowerList log={state.log} />
           </Col>
         </Row>

src/services/lock.js

@@ -27,8 +27,7 @@ export async function apiSoftwareDetail(id) {
  * 记录软件锁日志
  * @param {string} id 软件锁记录id
  */
-export async function apiSoftwareAddLonglelog(id) {
-  const params = { id }
-  const data = await request('/api/software/add/longlelog', { params })
+export async function apiSoftwareAddLonglelog(payload) {
+  const data = await request.post('/api/software/add/longlelog', { data: payload })
   return data
 }