Browse Source

fix: 软件锁优化代码

outaozhen 4 years atrás
parent
commit
09ea3dbf21

+ 3 - 3
src/pages/Product/Lock/LockStore/components/LocksDetail/LockModal.jsx

@@ -163,7 +163,7 @@ const LockModal = props => {
       }
       dispatch({
         type: 'refresh/commitAction',
-        payload: 'longle'
+        payload: 'software'
       })
     })
   }
@@ -195,7 +195,7 @@ const LockModal = props => {
       message.success('新增成功')
       dispatch({
         type: 'refresh/commitAction',
-        payload: 'longle'
+        payload: 'software'
       })
       onCancel()
     }
@@ -212,7 +212,7 @@ const LockModal = props => {
       message.success('新增成功')
       dispatch({
         type: 'refresh/commitAction',
-        payload: 'longle'
+        payload: 'software'
       })
       onCancel()
     }

+ 18 - 13
src/pages/Product/Lock/LockStore/components/LocksDetail/TabList.jsx

@@ -26,15 +26,20 @@ const RenderLongleCon = ({ longleService }) => {
 
 const LockTabList = props => {
   const {
+    // longleLog,
+    // longleId,
+    // keyNum,
+    // clientId,
+    // logStatus,
+    // upgradeProduct,
+    // logStockStatus,
+    // logSellStatus,
     longleLog,
-    longleId,
-    keyNum,
-    clientId,
-    logStatus,
     upgradeProduct,
-    logStockStatus,
-    logSellStatus
+    updateKey
   } = props
+  // 双重解构
+  const { longleId, keyNum, clientId, status, stockStatus, sellStatus } = props.longle
   const { toggleDrawer, setDrawerProps } = useModal()
   const dispatch = useDispatch()
   const { TabPane } = Tabs
@@ -59,7 +64,7 @@ const LockTabList = props => {
       // 刷新数据
       dispatch({
         type: 'refresh/commitAction',
-        payload: 'longle'
+        payload: updateKey
       })
     }
   }
@@ -87,7 +92,7 @@ const LockTabList = props => {
       message.success('删除成功')
       dispatch({
         type: 'refresh/commitAction',
-        payload: 'longle'
+        payload: updateKey
       })
     }
   }
@@ -132,7 +137,7 @@ const LockTabList = props => {
                         item.status === 9 ? (
                           <Popconfirm
                             title="确认删除"
-                            onConfirm={() => delLonglelog(item.longleId)}
+                            onConfirm={() => delLonglelog(item.id)}
                             okText="确认"
                             cancelText="取消">
                             <Button className="mt-2" type="primary" ghost size="small" danger>
@@ -150,7 +155,7 @@ const LockTabList = props => {
         </Tabs>
       </div>
       <div className="sheet-btns pl-4 pt-4 flex">
-        {logStockStatus !== 2 ? (
+        {stockStatus !== 2 ? (
           <Button
             type="primary"
             ghost
@@ -162,7 +167,7 @@ const LockTabList = props => {
             接收
           </Button>
         ) : null}
-        {logStockStatus === 2 && logSellStatus === 0 ? (
+        {stockStatus === 2 && sellStatus === 0 ? (
           <Button
             type="primary"
             ghost
@@ -184,7 +189,7 @@ const LockTabList = props => {
           }>
           升级
         </Button>
-        {logSellStatus === 0 ? (
+        {sellStatus === 0 ? (
           <Button
             type="primary"
             ghost
@@ -229,7 +234,7 @@ const LockTabList = props => {
           keyNum={keyNum}
           upgradeProduct={upgradeProduct}
           longleId={longleId}
-          logStatus={logStatus}
+          logStatus={status}
         />
       </div>
     </div>

+ 9 - 6
src/pages/Product/Lock/LockStore/components/LocksDetail/index.jsx

@@ -93,13 +93,16 @@ const Index = props => {
             className="sheet-box-right">
             <LockTabList
               longleLog={state.longleLog}
-              longleId={state.longle.id}
-              clientId={state.longle.clientId}
-              keyNum={state.longle.keyNum}
+              longle={state.longle}
               upgradeProduct={state.longle.product?.split('+') || []}
-              logStatus={state.longle.status}
-              logStockStatus={state.longle.stockStatus}
-              logSellStatus={state.longle.sellStatus}
+              // longleId={state.longle.id}
+              // clientId={state.longle.clientId}
+              // keyNum={state.longle.keyNum}
+              // upgradeProduct={state.longle.product?.split('+') || []}
+              // logStatus={state.longle.status}
+              // logStockStatus={state.longle.stockStatus}
+              // logSellStatus={state.longle.sellStatus}
+              updateKey={updateKey}
             />
             <LockLowerList log={state.log} />
           </Col>