outaozhen пре 5 година
родитељ
комит
ae4a9aad08

+ 30 - 2
src/pages/Product/Lock/Lockstore/components/LocksDetail/LockModal.jsx

@@ -6,10 +6,11 @@ import { queryClient } from '@/services/customer'
 import { queryLock } from '@/services/lock'
 import consts from '@/basic/consts'
 import { useDebounceFn } from 'ahooks'
-import { apiSoftwareAddLonglelog } from '@/services/lock'
+import { apiSoftwareAddLonglelog, apiReceiveLock } from '@/services/lock'
 import { useDispatch } from 'dva'
 
 export const lockTypeEnum = {
+  RECEIVE: 2,
   SALE: 3,
   UPDATE: 5,
   CHANGE: 6,
@@ -21,7 +22,8 @@ const LockModal = props => {
   const modalTitleEnum = {
     5: '升级软件锁',
     8: '备注信息',
-    7: '确认收回'
+    7: '确认收回',
+    2: '确认接收'
   }
   const placeholderEnum = {
     3: '搜索联系人(姓名、手机、QQ、公司名称)',
@@ -152,6 +154,20 @@ const LockModal = props => {
     })
   }
 
+  // 接收新软件锁
+  const receiveLongle = async id => {
+    const { code = -1 } = await apiReceiveLock({
+      longleId: id
+    })
+    if (code === consts.RET_CODE.SUCCESS) {
+      onCancel()
+    }
+    dispatch({
+      type: 'refresh/commitAction',
+      payload: 'longle'
+    })
+  }
+
   const handleListScroll = () => {
     // 未滚动到底部
     if (
@@ -183,6 +199,7 @@ const LockModal = props => {
       footer={
         type !== lockTypeEnum.UPDATE &&
         type !== lockTypeEnum.RECOVER &&
+        type !== lockTypeEnum.RECEIVE &&
         type !== lockTypeEnum.REMARK ? null : (
           <div>
             <Button className="mr-3" onClick={onCancel}>
@@ -274,6 +291,17 @@ const LockModal = props => {
             </Form.Item>
           </>
         ) : null}
+
+        {type === lockTypeEnum.RECEIVE ? (
+          <>
+            <p>
+              确认接收锁 <b>{keyNum}</b>
+            </p>
+            <Form.Item name="longleId" hidden>
+              <Input />
+            </Form.Item>
+          </>
+        ) : null}
       </Form>
     </Modal>
   )

+ 10 - 0
src/pages/Product/Lock/Lockstore/components/LocksDetail/TabList.jsx

@@ -88,6 +88,16 @@ const LockTabList = props => {
           size="small"
           className="mr-3px"
           onClick={() =>
+            setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.RECEIVE })
+          }>
+          接收
+        </Button>
+        <Button
+          type="primary"
+          ghost
+          size="small"
+          className="mr-3px"
+          onClick={() =>
             setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.SALE })
           }>
           借出/销售/赠送

+ 7 - 0
src/services/lock.js

@@ -42,3 +42,10 @@ export async function apiReceiveOldLock(params) {
     data: params
   })
 }
+
+/** 接收新锁 */
+export async function apiReceiveLock(params) {
+  return request.post('/software/receive', {
+    data: params
+  })
+}