调整软件锁标签显示和相关高度调整

src/components/PopContent/Companys/index.jsx

@@ -62,7 +62,7 @@ const Index = props => {
           // mask={false}
         >
           <Row>
-            <Col span={12} className="sheet-box-left" style={{ height: y - 25, overflowY: 'auto' }}>
+            <Col span={12} className="sheet-box-left">
               <div className="sheet-left-panel zh-pd-right-15">
                 <CompanyForm customer={state.customer} />
               </div>

src/components/PopContent/Locks/LockForm.jsx

@@ -1,5 +1,6 @@
 import React, { useEffect } from 'react'
 import { Row, Col, Divider } from 'antd'
+import { ProductLabel } from '@/pages/Product/Lock/Lockstore'
 
 // import EditableForm from '@/components/EditableForm'
 
@@ -21,7 +22,9 @@ const LockForm = props => {
         <Col span={18}>{longle.keyNum}</Col>
         <Divider />
         <Col span={6}>产品</Col>
-        <Col span={18} />
+        <Col span={18}>
+          <ProductLabel data={longle.product}></ProductLabel>
+        </Col>
         <Divider />
         <Col span={6}>期限</Col>
         <Col span={18}>{longle.allotedTime}</Col>

src/components/PopContent/Locks/LockTabList.jsx

@@ -1,6 +1,7 @@
 import React from 'react'
 import { Row, Col, List, Tabs, Button } from 'antd'
 import { dayjsFormat } from '@/utils/utils'
+import { ProductLabel } from '@/pages/Product/Lock/Lockstore'
 
 const LockTabList = props => {
   const { longleLog } = props
@@ -22,13 +23,19 @@ const LockTabList = props => {
                   <List.Item>
                     <Row className="zh-width-100P">
                       <Col span="8">
-                        {item.status} <a>{item.responsible}</a><br />
-                        <a>@{item.operator}</a> <span className="zh-gray">{ dayjsFormat(item.updatetime, 'MM-DD HH:mm')}</span>
+                        {item.status} <a>{item.responsible}</a>
+                        <br />
+                        <a>@{item.operator}</a>{' '}
+                        <span className="zh-gray">
+                          {dayjsFormat(item.updatetime, 'MM-DD HH:mm')}
+                        </span>
                         {/* <List.Item.Meta
                           description={ dayjsFormat(item.updatetime, 'MM-DD HH:mm')}
                         /> */}
                       </Col>
-                      <Col span="16">{item.product}</Col>
+                      <Col span="16">
+                        <ProductLabel data={item.product}></ProductLabel>
+                      </Col>
                     </Row>
                   </List.Item>
                 )}
@@ -47,35 +54,16 @@ const LockTabList = props => {
         >
           借出/销售/赠送
         </Button>
-        <Button
-          type="primary"
-          ghost
-          size="small"
-          className="zh-mg-right-3"
-        >
+        <Button type="primary" ghost size="small" className="zh-mg-right-3">
           升级
         </Button>
-        <Button
-          type="primary"
-          ghost
-          size="small"
-          className="zh-mg-right-3"
-        >
+        <Button type="primary" ghost size="small" className="zh-mg-right-3">
           更换
         </Button>
-        <Button
-          type="primary"
-          ghost
-          size="small"
-          className="zh-mg-right-3"
-        >
+        <Button type="primary" ghost size="small" className="zh-mg-right-3">
           收回
         </Button>
-        <Button
-          type="primary"
-          ghost
-          size="small"
-        >
+        <Button type="primary" ghost size="small">
           备注
         </Button>
       </div>

src/components/PopContent/Locks/index.jsx

@@ -57,7 +57,7 @@ const Index = props => {
           // mask={false}
         >
           <Row>
-            <Col span={12} className="sheet-box-left" style={{ height: y - 25, overflowY: 'auto' }}>
+            <Col span={12} className="sheet-box-left">
               <div className="sheet-left-panel zh-pd-right-15">
                 <LockForm longle={state.longle} />
               </div>