feat: 软件锁销售、借出、赠送、升级、收回 OK

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

@@ -6,6 +6,7 @@ import ChangeClient from '@/pages/Product/Lock/LockStore/components/ChangeClient
 import CopyAuthorizeStr from '../CopyAuthorizeStr'
 import DownUpdateFile from '../DownUpdateFile'
 import CompanyDetail from '@/pages/Customer/Company/components/CompanyDetail'
+import { dayjsFormat } from '@/utils/utils'
 
 export const ChangeCompMap = {
   LONGLE: {
@@ -43,8 +44,8 @@ const LockForm = props => {
   }
   // 销售状态
   const longleSellStatusNum = {
-    1: '接收',
-    2: '借出',
+    1: '借出',
+    2: '销售',
     3: '赠送'
   }
   // 维护状态
@@ -92,7 +93,7 @@ const LockForm = props => {
         <Col span={12}>
           <Row>
             <Col span={9}>出库时间</Col>
-            <Col span={13}>{longle.stockTime}</Col>
+            <Col span={13}>{dayjsFormat(longle.stockTime, 'YYYY-MM-DD')}</Col>
           </Row>
         </Col>
         <Divider style={{ margin: '12px 0' }} />
@@ -105,7 +106,7 @@ const LockForm = props => {
         <Col span={12}>
           <Row>
             <Col span={9}>销售时间</Col>
-            <Col span={13}>{longle.sellTime}</Col>
+            <Col span={13}>{dayjsFormat(longle.sellTime, 'YYYY-MM-DD')}</Col>
           </Row>
         </Col>
         <Divider style={{ margin: '12px 0' }} />
@@ -118,7 +119,7 @@ const LockForm = props => {
         <Col span={12}>
           <Row>
             <Col span={9}>维护时间</Col>
-            <Col span={13}>{longle.preserveTime}</Col>
+            <Col span={13}>{dayjsFormat(longle.preserveTime, 'YYYY-MM-DD')}</Col>
           </Row>
         </Col>
         {/* <Col span={6}>使用状态</Col> */}

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

@@ -13,30 +13,29 @@ import DragIniter from '@/components/Modal/src/components/DragIniter'
 import { ProFormTextArea } from '@ant-design/pro-form'
 
 export const lockTypeEnum = {
-  RECEIVE: 2,
-  SALE: 3,
-  UPDATE: 5,
-  CHANGE: 6,
+  RECEIVE: 5,
+  SALE: 6,
+  UPDATE: 1,
+  CHANGE: 2,
   REMARK: 8,
-  RECOVER: 7
+  RECOVER: 3
 }
 
 const LockModal = props => {
   const modalTitleEnum = {
-    5: '升级软件锁',
+    1: '升级软件锁',
     8: '备注信息',
-    7: '确认收回',
-    2: '确认接收'
+    3: '确认收回',
+    5: '确认接收'
   }
   const placeholderEnum = {
-    3: '搜索联系人（姓名、手机、QQ、公司名称）',
-    6: '输入新锁号'
+    6: '搜索联系人（姓名、手机、QQ、公司名称）',
+    2: '输入新锁号'
   }
   const [form] = Form.useForm()
   const dispatch = useDispatch()
   const scrollRef = useRef()
-  const { visible, onCancel, onConfirm, loading, type, longleId, keyNum, logStatus, prodList } =
-    props
+  const { visible, onCancel, onConfirm, loading, type, longleId, keyNum, prodList } = props
   const layout = {
     layout: 'vertical'
   }
@@ -45,7 +44,6 @@ const LockModal = props => {
     longle: [],
     client: [],
     search: '',
-    logStatus: 3,
     sellStatus: 1,
     noMore: false,
     current: 1,
@@ -114,7 +112,7 @@ const LockModal = props => {
     if (type === lockTypeEnum.CHANGE || type === lockTypeEnum.SALE) {
       const params = { search: value, current: 1, pageSize: state.pageSize }
       if (type === lockTypeEnum.SALE) {
-        params.logStatus = state.logStatus
+        params.sellStatus = state.sellStatus
       }
       initData(params)
     }
@@ -128,26 +126,31 @@ const LockModal = props => {
         return
       }
       if (type === lockTypeEnum.SALE) {
-        initData({ current: 1, pageSize: 10, logStatus: state.logStatus })
+        initData({ current: 1, pageSize: 10, sellStatus: state.sellStatus })
         return
       }
       form.resetFields()
       if (type === lockTypeEnum.RECOVER) {
-        form.setFieldsValue({ longleId, logStatus })
+        form.setFieldsValue({ longleId })
       }
     }
   }, [visible, type])
 
   const handleonOk = () => {
     form.validateFields().then(values => {
-      onConfirm({ ...values, logStatus: type })
+      onConfirm({ ...values, preserveStatus: type })
     })
   }
 
   const checkGroupOnChange = e => {
+    // const logStatusEnum = {
+    //   3: 1,
+    //   4: 2,
+    //   9: 3
+    // }
     const { value = '' } = e.target || {}
     initData({
-      logStatus: value,
+      // logStatus: logStatusEnum[state.logStatus],
       sellStatus: value,
       current: 1,
       pageSize: 10,
@@ -159,9 +162,7 @@ const LockModal = props => {
   const connectClient = async id => {
     const { code = -1 } = await apiSoftwareAddLonglelog({
       clientId: id,
-      logStatus: state.logStatus,
       sellStatus: state.sellStatus,
-      preserveStatus: state.preserveStatus,
       longleId
     })
     if (code === consts.RET_CODE.SUCCESS) {
@@ -177,7 +178,6 @@ const LockModal = props => {
   const connectLongle = async id => {
     const { code = -1 } = await apiSoftwareAddLonglelog({
       newLongleId: id,
-      logStatus: type,
       preserveStatus: type,
       longleId
     })
@@ -202,7 +202,7 @@ const LockModal = props => {
         return
       }
       const params = { current: state.current + 1, pageSize: state.pageSize }
-      if (type === lockTypeEnum.SALE) params.logStatus = state.logStatus
+      if (type === lockTypeEnum.SALE) params.sellStatus = state.sellStatus
       state.current * state.pageSize < state.total && initData(params)
     }
   }

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

@@ -25,7 +25,7 @@ const RenderLongleCon = ({ longleService }) => {
 }
 
 const LockTabList = props => {
-  const { longleLog, longleId, keyNum, clientId } = props
+  const { longleLog, longleId, keyNum, clientId, logStatus } = props
   const { toggleDrawer, setDrawerProps } = useModal()
   const dispatch = useDispatch()
   const [state, setState] = useState({
@@ -175,6 +175,7 @@ const LockTabList = props => {
           type={addLonglelog.type}
           keyNum={keyNum}
           longleId={longleId}
+          logStatus={logStatus}
         />
       </div>
     </div>

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

@@ -85,7 +85,7 @@ const Index = props => {
               longleId={state.longle.id}
               clientId={state.longle.clientId}
               keyNum={state.longle.keyNum}
-              logStatus={state.longle.logStatus}
+              logStatus={state.longle.status}
               // sellStatus={state.longle.sellStatus}
               // preserveStatus={state.longle.preserveStatus}
             />