|
@@ -7,7 +7,7 @@ import { ProductLabel } from '@/pages/Product/Lock/LockStore'
|
|
|
import LockModal, { lockTypeEnum } from './LockModal'
|
|
import LockModal, { lockTypeEnum } from './LockModal'
|
|
|
import ClientDetail from '@/pages/Customer/Client/components/ClientDetail'
|
|
import ClientDetail from '@/pages/Customer/Client/components/ClientDetail'
|
|
|
import LocksDetail from '@/pages/Product/Lock/LockStore/components/LocksDetail'
|
|
import LocksDetail from '@/pages/Product/Lock/LockStore/components/LocksDetail'
|
|
|
-import { servicelogEnum, showProductsStatus, showNewLongleStatus } from './consts'
|
|
|
|
|
|
|
+import { servicelogEnum, showProductsStatus, showNewLongleStatus, showMarkStatus } from './consts'
|
|
|
import { useDispatch, useAccess } from 'umi'
|
|
import { useDispatch, useAccess } from 'umi'
|
|
|
import { useModal } from '@/components/Modal'
|
|
import { useModal } from '@/components/Modal'
|
|
|
|
|
|
|
@@ -107,7 +107,7 @@ const LockTabList = props => {
|
|
|
// console.log(longleService)
|
|
// console.log(longleService)
|
|
|
const renderNewLog = () => {
|
|
const renderNewLog = () => {
|
|
|
const { NewKeyNum } = longleService
|
|
const { NewKeyNum } = longleService
|
|
|
- if (!NewKeyNum) return <span>{longleService.mark}</span>
|
|
|
|
|
|
|
+ // if (!NewKeyNum) return <span>{longleService.mark}</span>
|
|
|
let newLongleService
|
|
let newLongleService
|
|
|
if (!Array.isArray(NewKeyNum)) {
|
|
if (!Array.isArray(NewKeyNum)) {
|
|
|
newLongleService = NewKeyNum.split('->')
|
|
newLongleService = NewKeyNum.split('->')
|
|
@@ -135,7 +135,7 @@ const LockTabList = props => {
|
|
|
<ProductLabel data={longleService.product} />
|
|
<ProductLabel data={longleService.product} />
|
|
|
)}
|
|
)}
|
|
|
{showNewLongleStatus.includes(longleService.status) && renderNewLog()}
|
|
{showNewLongleStatus.includes(longleService.status) && renderNewLog()}
|
|
|
- {/* {showMarkStatus.includes(longleService.status) ? <span>{longleService.mark}</span> : null} */}
|
|
|
|
|
|
|
+ {showMarkStatus.includes(longleService.status) ? <span>{longleService.mark}</span> : null}
|
|
|
</>
|
|
</>
|
|
|
)
|
|
)
|
|
|
}
|
|
}
|