1

src/pages/Customer/Company/components/AddCompany/index.jsx

@@ -25,7 +25,7 @@ const AddCompany = props => {
       {...layout}
       trigger={
         <Button key="button" type="primary">
-          <IconPark type="plus" theme="filled" />
+          <IconPark type="plus" theme="filled" className="zh-mg-right-5" />
           <span>客户</span>
         </Button>
       }

src/pages/Product/Lock/Lockstore/components/LocksDetail/LockTabList.jsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { Row, Col, List, Tabs, message } from 'antd'
+import { Row, Col, List, Tabs, message, Button } from 'antd'
 import { dayjsFormat } from '@/utils/utils'
 import consts from '@/consts'
 import { apiSoftwareAddLonglelog } from '@/services/lock'
@@ -11,7 +11,7 @@ import LockRemarks from './LockRemarks'
 
 const LockTabList = props => {
   const { longleLog, clientId, longleId } = props
-  // console.log(clientId)
+  // console.log(longleId)
   const [state, setState] = useState({
     visible: false
   })
@@ -27,6 +27,10 @@ const LockTabList = props => {
     8: '备注',
     9: '赠送'
   }
+  const servicelogAAA = {
+    1: '生成',
+    8: '备注'
+  }
   const [addLonglelog, setAddLonglelog] = useState({
     visible: false,
     loading: false
@@ -75,7 +79,8 @@ const LockTabList = props => {
                         /> */}
                       </Col>
                       <Col span="16">
-                        <ProductLabel data={item.product} />
+                        {servicelogAAA[item.status]}
+                        {/* <ProductLabel data={[item.status]} /> */}
                       </Col>
                     </Row>
                   </List.Item>
@@ -91,15 +96,18 @@ const LockTabList = props => {
           ghost
           size="small"
           className="zh-mg-right-3"
-          onClick={() => setAddService({ ...setAddService, visible: true })}
+          // onClick={() => setAddService({ ...setAddService, visible: true })}
         >
           借出/销售/赠送
         </Button> */}
         <LockUpgrade onConfirm={handleAddLonglelog} />
-        <LockReplace onConfirm={handleAddLonglelog}></LockReplace>
+        {/* <LockReplace onConfirm={handleAddLonglelog}></LockReplace>
         <LockRecover onConfirm={handleAddLonglelog}></LockRecover>
-        <LockRemarks onConfirm={handleAddLonglelog}></LockRemarks>
+        <LockRemarks onConfirm={handleAddLonglelog}></LockRemarks> */}
         {/* <Button type="primary" ghost size="small" className="zh-mg-right-3">
+          升级
+        </Button>
+        <Button type="primary" ghost size="small" className="zh-mg-right-3">
           更换
         </Button>
         <Button type="primary" ghost size="small" className="zh-mg-right-3">

src/pages/Product/Lock/Lockstore/components/LocksDetail/LockUpgrade.jsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import { Button } from 'antd'
-import { ProFormSelect, ModalForm } from '@ant-design/pro-form'
+import { ProFormSelect, ModalForm, ProFormText, ProFormTextArea } from '@ant-design/pro-form'
 
 const LockUpgrade = props => {
   const { onConfirm } = props
@@ -33,6 +33,57 @@ const LockUpgrade = props => {
           rules={[{ required: true, message: '请选择新增产品' }]}
         />
       </ModalForm>
+      <ModalForm
+        width={500}
+        {...layout}
+        title="更换软件锁"
+        trigger={
+          <Button type="primary" ghost size="small" className="zh-mg-right-3">
+            更换
+          </Button>
+        }
+        onFinish={async values => {
+          await onConfirm(values)
+          return true
+        }}>
+        <ProFormText
+          name="newLongleId"
+          label="新锁号"
+          placeholder="请选择新锁号"
+          rules={[{ required: true, message: '请选择新增产品' }]}></ProFormText>
+      </ModalForm>
+      <ModalForm
+        width={500}
+        {...layout}
+        title="确认收回"
+        trigger={
+          <Button type="primary" ghost size="small" className="zh-mg-right-3">
+            收回
+          </Button>
+        }
+        onFinish={async values => {
+          await onConfirm(values)
+          return true
+        }}>
+        <div>
+          收回锁号<b>HNYH-0654</b>
+        </div>
+      </ModalForm>
+      <ModalForm
+        width={500}
+        {...layout}
+        title="备注信息"
+        trigger={
+          <Button type="primary" ghost size="small" className="zh-mg-right-3">
+            备注
+          </Button>
+        }
+        onFinish={async values => {
+          await onConfirm(values)
+          return true
+        }}>
+        <ProFormTextArea label="备注" name="mark"></ProFormTextArea>
+      </ModalForm>
     </div>
   )
 }