Explorar el Código

fix: 云版详情点击限期按钮次数复数的时候datePicker被disabled

outaozhen hace 4 años
padre
commit
79e1028414

+ 9 - 14
src/pages/Product/Cloud/components/Detail/TabList.jsx

@@ -103,7 +103,8 @@ const RoadpricingTabList = props => {
                 type: titleType.GIVE,
                 compilationId: record._id,
                 compilationName: record.name,
-                lockEnum: lockTypeEnum.GIVE,
+                deadline: record.deadline,
+                lock: lockTypeEnum.GIVE,
                 upgradeType: upgradeTypeEnum.UPGRADE
               })
             }>
@@ -122,7 +123,8 @@ const RoadpricingTabList = props => {
                   type: titleType.SALE,
                   compilationId: record._id,
                   compilationName: record.name,
-                  lockTypeEnum: lockTypeEnum.SALE,
+                  deadline: record.deadline,
+                  lock: lockTypeEnum.SALE,
                   upgradeType: upgradeTypeEnum.UPGRADE
                 })
               }>
@@ -163,7 +165,7 @@ const RoadpricingTabList = props => {
                     compilationId: record._id,
                     compilationName: record.name,
                     compilationListName: record.name,
-                    lockTypeEnum: record.lock,
+                    lock: record.lock,
                     upgradeType: upgradeTypeEnum.DEADLINE
                   })
                 }>
@@ -184,7 +186,8 @@ const RoadpricingTabList = props => {
                     type: titleType.LEND,
                     compilationId: record._id,
                     compilationName: record.name,
-                    lockTypeEnum: lockTypeEnum.LEND,
+                    deadline: record.deadline,
+                    lock: lockTypeEnum.LEND,
                     upgradeType: upgradeTypeEnum.UPGRADE
                   })
                 }>
@@ -202,7 +205,8 @@ const RoadpricingTabList = props => {
                     type: titleType.SALE,
                     compilationId: record._id,
                     compilationName: record.name,
-                    lockTypeEnum: lockTypeEnum.SALE,
+                    deadline: record.deadline,
+                    lock: lockTypeEnum.SALE,
                     upgradeType: upgradeTypeEnum.UPGRADE
                   })
                 }>
@@ -266,15 +270,6 @@ const RoadpricingTabList = props => {
         ssoId={ssoId}
         cloudUser={{ mobile, username }}
         roadPricingUpgrade={roadPricingUpgrade}
-        // loading={roadPricingUpgrade.loading}
-        // visible={roadPricingUpgrade.visible}
-        // type={roadPricingUpgrade.type}
-        // compilationId={roadPricingUpgrade.compilationId}
-        // compilationName={roadPricingUpgrade.compilationName}
-        // lock={roadPricingUpgrade.lockTypeEnum}
-        // upgradeType={roadPricingUpgrade.upgradeTypeEnum}
-        // compilationListName={roadPricingUpgrade.compilationListName}
-        // deadline={roadPricingUpgrade.deadline}
       />
     </div>
   )

+ 6 - 19
src/pages/Product/Cloud/components/Detail/UpgradeModal.jsx

@@ -47,26 +47,11 @@ const UpgradeModal = props => {
       type,
       compilationId,
       compilationName,
-      lockEnum,
+      lock,
       upgradeType,
       compilationListName,
       deadline
     }
-    // visible,
-    // onCancel,
-    // loading,
-    // onConfirm,
-    // type,
-    // projectType,
-    // ssoId,
-    // compilationId,
-    // compilationName,
-    // compilationListName,
-    // lock,
-    // upgradeType,
-    // cloudUser,
-    // deadline,
-    // actionPayload
   } = props
   const [form] = Form.useForm()
   const dispatch = useDispatch()
@@ -76,7 +61,9 @@ const UpgradeModal = props => {
   }
   useEffect(() => {
     if (upgradeType === upgradeTypeEnum.DEADLINE) {
-      form?.setFieldsValue({ deadline: dayjs(deadline) })
+      if (deadline) {
+        form?.setFieldsValue({ deadline: dayjs(deadline) })
+      }
       setShowDeadline(true)
     }
   }, [upgradeType])
@@ -100,7 +87,7 @@ const UpgradeModal = props => {
         compilationId,
         compilationName,
         compilationListName,
-        lockEnum,
+        lock,
         upgradeType
       })
       form.resetFields()
@@ -118,7 +105,7 @@ const UpgradeModal = props => {
       visible={visible}
       confirmLoading={loading}
       onCancel={() => {
-        setShowDeadline(false)
+        // setShowDeadline(false)
         onCancel()
         form?.resetFields()
       }}