outaozhen 5 лет назад
Родитель
Сommit
02521b70ba

+ 13 - 12
src/pages/Product/Lock/Lockstore/components/LocksDetail/LockTabList.jsx

@@ -6,7 +6,7 @@ import { apiSoftwareAddLonglelog } from '@/services/lock'
 import { ProductLabel } from '@/pages/Product/Lock/Lockstore'
 import LockModal from './LockModal'
 import { lockTypeEnum } from './LockModal'
-import { servicelogEnum, showProductsStatus } from './consts'
+import { servicelogEnum, showProductsStatus, showNewLongleStatus, showMarkStatus } from './consts'
 
 const LockTabList = props => {
   const { longleLog, clientId, longleId } = props
@@ -59,7 +59,9 @@ const LockTabList = props => {
                           description={ dayjsFormat(item.updatetime, 'MM-DD HH:mm')}
                         /> */}
                       </Col>
-                      <Col span="16">{/* <RenderXXX data={item}></RenderXXX> */}</Col>
+                      <Col span="16">
+                        <RenderLongleCon longgleService={item}></RenderLongleCon>
+                      </Col>
                     </Row>
                   </List.Item>
                 )}
@@ -129,15 +131,14 @@ const LockTabList = props => {
   )
 }
 
-// const RenderXXX = ({data}) => {
-//   // const { } = item
-//   return (
-//     <>
-//       {showProductsStatus.includes(item.status) ? (
-//                           <ProductLabel data={item.product} />
-//                         ) : null}
-//     </>
-//   )
-// }
+const RenderLongleCon = ({ longgleService }) => {
+  return (
+    <>
+      {showProductsStatus.includes(item.status) ? (
+        <ProductLabel longgleService={item.product} />
+      ) : null}
+    </>
+  )
+}
 
 export default LockTabList

+ 3 - 3
src/pages/Product/Lock/Lockstore/components/LocksDetail/consts.js

@@ -1,6 +1,4 @@
 export const servicelogEnum = {
-  1: '生成',
-  2: '接收',
   3: '借出',
   4: '销售',
   5: '升级',
@@ -10,4 +8,6 @@ export const servicelogEnum = {
   9: '赠送'
 }
 
-export const showProductsStatus = [4, 5, 6]
+export const showProductsStatus = [3, 4, 9]
+export const showNewLongleStatus = [6]
+export const showMarkStatus = [8]

+ 1 - 0
src/pages/Product/Lock/Lockstore/components/LocksDetail/index.jsx

@@ -54,6 +54,7 @@ const Index = props => {
               longleLog={state.longleLog}
               longleId={state.longle.id}
               clientId={state.longle.clientId}
+              keyNum={state.longle.keyNum}
             />
             <LockLowerList log={state.log} />
           </Col>