软件锁升级+备注功能

src/basic/css/common.scss

@@ -184,6 +184,10 @@
   }
 }
 
+.zh-block {
+  display:inline-block !important;
+}
+
 /** flex布局 */
 .zh-flex {
   display: flex;

src/basic/css/variable.scss

@@ -7,11 +7,10 @@ $zh-blue: #007bff !default;
 $zh-red: #dc3545 !default;
 $zh-yellow: #ffc170 !default;
 $zh-white: #ffffff !default;
-$zh-line-color: rgba(0,0,0,.125) !default;
-$zh-danger:#fd3995 !default;
-$zh-warning:#ffc241 !default;
-$zh-success:#1dc9b7 !default;
-
+$zh-line-color: rgba(0, 0, 0, 0.125) !default;
+$zh-danger: #fd3995 !default;
+$zh-warning: #ffc241 !default;
+$zh-success: #1dc9b7 !default;
 
 // 实现0.5px的效果
 @mixin zh-border {
@@ -38,13 +37,14 @@ $zh-success:#1dc9b7 !default;
   .ant-table-scroll,
   .ant-table-body-inner,
   .ant-table-fixed-left,
-  .ant-table-content        {
+  .ant-table-content {
     height: 100%;
   }
   .ant-table-content {
     position: relative;
   }
-  .ant-table-body, .ant-table-body-inner {
+  .ant-table-body,
+  .ant-table-body-inner {
     overflow-y: auto !important;
   }
   .ant-table-header {

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

@@ -50,7 +50,7 @@ const LockModal = props => {
           </Form.Item>
         ) : null}
         {type === lockTypeEnum.UPDATE ? (
-          <Form.Item name="name" label="新增产品">
+          <Form.Item name="product" label="新增产品">
             <Select>
               <Option key="重庆养护（营改增）">重庆养护（营改增）</Option>
               <Option key="广东算量新定额">广东算量新定额</Option>

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

@@ -26,7 +26,7 @@ const LockTabList = props => {
     setAddLonglelog({ ...addLonglelog, loading: true })
     const { code = -1 } = await apiSoftwareAddLonglelog({
       ...values,
-      clientId,
+      // clientId,
       longleId
     })
     if (code === consts.RET_CODE.SUCCESS) {
@@ -65,6 +65,7 @@ const LockTabList = props => {
                         /> */}
                       </Col>
                       <Col span="16">
+                        {/* <ProductLabel data={item.product} /> */}
                         <RenderLongleCon longleService={item} />
                       </Col>
                     </Row>
@@ -137,10 +138,11 @@ const LockTabList = props => {
 }
 
 const RenderLongleCon = ({ longleService }) => {
+  // console.log(longleService)
   return (
     <>
       {showProductsStatus.includes(longleService.status) ? (
-        <ProductLabel longgleService={longleService.product} />
+        <ProductLabel data={longleService.product} />
       ) : null}
       {showNewLongleStatus.includes(longleService.status) ? (
         <span>{longleService.NewKeyNum}</span>

src/pages/Product/Lock/Lockstore/components/LocksDetail/consts.js

@@ -9,6 +9,6 @@ export const servicelogEnum = {
   9: '赠送'
 }
 
-export const showProductsStatus = [3, 4, 9]
+export const showProductsStatus = [3, 4, 5, 9]
 export const showNewLongleStatus = [6]
 export const showMarkStatus = [8]

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

@@ -53,7 +53,7 @@ const Index = props => {
             <LockTabList
               longleLog={state.longleLog}
               longleId={state.longle.id}
-              clientId={state.longle.clientId}
+              // clientId={state.longle.clientId}
               keyNum={state.longle.keyNum}
               status={state.longle.status}
             />

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

@@ -18,7 +18,7 @@ export const ProductLabel = ({ data }) => {
   return (
     <div>
       {newData.map((item, index) => (
-        <Tag key={index} color="#886ab5">
+        <Tag key={index} color="#886ab5" className="zh-mg-bottom-5 zh-block">
           {item}
         </Tag>
       ))}