outaozhen 5 лет назад
Родитель
Сommit
9471b53b0b

+ 7 - 10
src/pages/Product/Lock/Lockstore/components/LocksDetail/LockModal.jsx

@@ -13,18 +13,18 @@ import DragIniter from '@/components/Modal/src/components/DragIniter'
 import { ProFormTextArea } from '@ant-design/pro-form'
 
 export const lockTypeEnum = {
-  RECEIVE: 5,
-  SALE: 6,
+  REMARK: 0,
   UPDATE: 1,
   CHANGE: 2,
-  REMARK: 8,
-  RECOVER: 3
+  RECOVER: 3,
+  RECEIVE: 5,
+  SALE: 6
 }
 
 const LockModal = props => {
   const modalTitleEnum = {
     1: '升级软件锁',
-    8: '备注信息',
+    0: '备注信息',
     3: '确认收回',
     5: '确认接收'
   }
@@ -35,7 +35,8 @@ const LockModal = props => {
   const [form] = Form.useForm()
   const dispatch = useDispatch()
   const scrollRef = useRef()
-  const { visible, onCancel, onConfirm, loading, type, longleId, keyNum, prodList } = props
+  const { visible, onCancel, onConfirm, loading, type, longleId, keyNum, prodList, onSelect } =
+    props
   const layout = {
     layout: 'vertical'
   }
@@ -184,10 +185,6 @@ const LockModal = props => {
     if (code === consts.RET_CODE.SUCCESS) {
       onCancel()
     }
-    dispatch({
-      type: 'refresh/commitAction',
-      payload: 'longle'
-    })
   }
 
   const handleListScroll = () => {

+ 5 - 1
src/pages/Product/Lock/Lockstore/components/LocksDetail/TabList.jsx

@@ -143,7 +143,11 @@ const LockTabList = props => {
           size="small"
           className="mr-1"
           onClick={() =>
-            setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.CHANGE })
+            setAddLonglelog({
+              ...setAddLonglelog,
+              visible: true,
+              type: lockTypeEnum.CHANGE
+            })
           }>
           更换
         </Button>

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

@@ -10,7 +10,8 @@ import { Down, Up } from '@icon-park/react'
 import { FlipOverEnum, useFlipOver } from '@/hooks/web/useFlipOver'
 
 const Index = props => {
-  const { dispatch, visible, dataId = '', shouldUpdate, orderIds = [] } = props
+  const { dispatch, visible, dataId = '', refresh, orderIds = [], updateKey = 'longle' } = props
+  const shouldUpdate = refresh[updateKey] || false
   const [state, setState] = useState({
     longle: {},
     log: [],
@@ -26,7 +27,7 @@ const Index = props => {
       if (shouldUpdate) {
         dispatch({
           type: 'refresh/commitAction',
-          payload: 'longle'
+          payload: 'updateKey'
         })
       }
       setState({ ...state, longle, log, longleLog })
@@ -86,8 +87,7 @@ const Index = props => {
               clientId={state.longle.clientId}
               keyNum={state.longle.keyNum}
               logStatus={state.longle.status}
-              // sellStatus={state.longle.sellStatus}
-              // preserveStatus={state.longle.preserveStatus}
+              dataSource={changeCopInputData}
             />
             <LockLowerList log={state.log} />
           </Col>
@@ -99,6 +99,6 @@ const Index = props => {
 
 // export default Index
 export default connect(({ refresh, single }) => ({
-  shouldUpdate: refresh.longle,
+  refresh,
   visible: single.drawer.visible
 }))(Index)