1

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

@@ -17,8 +17,8 @@ const LockModal = props => {
   }
   const [form] = Form.useForm()
   const { Option } = Select
-  const { visible, onCancel, onConfirm, loading, type, longleId, keyNum } = props
-  console.log(type)
+  const { visible, onCancel, onConfirm, loading, type, longleId, keyNum, Longlestatus } = props
+
   const layout = {
     layout: 'vertical'
   }
@@ -26,7 +26,7 @@ const LockModal = props => {
     if (visible) {
       form.resetFields()
       if (type === lockTypeEnum.RECOVER) {
-        form.setFieldsValue({ longleId })
+        form.setFieldsValue({ longleId, Longlestatus })
       }
     }
   }, [visible, type])

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

@@ -9,7 +9,8 @@ import { lockTypeEnum } from './LockModal'
 import { servicelogEnum, showProductsStatus, showNewLongleStatus, showMarkStatus } from './consts'
 
 const LockTabList = props => {
-  const { longleLog, clientId, longleId } = props
+  const { longleLog, clientId, longleId, Longlestatus } = props
+  console.log(Longlestatus)
   const [state, setState] = useState({
     visible: false
   })
@@ -23,7 +24,12 @@ const LockTabList = props => {
 
   const handleAddLonglelog = async values => {
     setAddLonglelog({ ...addLonglelog, loading: true })
-    const { code = -1 } = await apiSoftwareAddLonglelog({ ...values, clientId, longleId })
+    const { code = -1 } = await apiSoftwareAddLonglelog({
+      ...values,
+      clientId,
+      longleId,
+      Longlestatus
+    })
     if (code === consts.RET_CODE.SUCCESS) {
       message.success('新增成功')
       setState({ ...state, data: values })
@@ -60,7 +66,7 @@ const LockTabList = props => {
                         /> */}
                       </Col>
                       <Col span="16">
-                        <RenderLongleCon longgleService={item} />
+                        <RenderLongleCon longleService={item} />
                       </Col>
                     </Row>
                   </List.Item>
@@ -131,16 +137,16 @@ const LockTabList = props => {
   )
 }
 
-const RenderLongleCon = ({ longgleService }) => {
+const RenderLongleCon = ({ longleService }) => {
   return (
     <>
-      {showProductsStatus.includes(longgleService.status) ? (
-        <ProductLabel longgleService={longgleService.product} />
+      {showProductsStatus.includes(longleService.status) ? (
+        <ProductLabel longgleService={longleService.product} />
       ) : null}
-      {showNewLongleStatus.includes(longgleService.status) ? (
-        <span>{longgleService.NewKeyNum}</span>
+      {showNewLongleStatus.includes(longleService.status) ? (
+        <span>{longleService.NewKeyNum}</span>
       ) : null}
-      {showMarkStatus.includes(longgleService.status) ? <span>{longgleService.mark}</span> : null}
+      {showMarkStatus.includes(longleService.status) ? <span>{longleService.mark}</span> : null}
     </>
   )
 }

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

@@ -1,3 +1,4 @@
+// 软件锁服务记录状态
 export const servicelogEnum = {
   3: '借出',
   4: '销售',

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

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