Forráskód Böngészése

fix: 云版企业版限期修改

outaozhen 4 éve
szülő
commit
9d8dee9268

+ 19 - 11
src/pages/Product/Lock/LockStore/components/LockDetail/TabList.jsx

@@ -154,6 +154,14 @@ const LockTabList = props => {
         </Tabs>
       </div>
       <div className="sheet-btns pl-4 pt-4 flex">
+        {/* <Button
+          type="primary"
+          ghost
+          size="small"
+          className="mr-3px"
+          onClick={() => openLockModal(lockTypeEnum.RECEIVE)}>
+          {'aaa'}
+        </Button> */}
         {stockStatus !== 2 ? (
           <Button
             type="primary"
@@ -174,17 +182,6 @@ const LockTabList = props => {
             借销赠
           </Button>
         ) : null}
-        {/* <Button
-          type="primary"
-          ghost
-          size="small"
-          className="mr-1"
-          onClick={() =>
-            setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.UPDATE })
-          }
-        >
-          升级
-        </Button> */}
         {sellStatus !== 0 && preserveStatus !== 2 ? (
           <Button
             type="primary"
@@ -205,6 +202,17 @@ const LockTabList = props => {
             收回
           </Button>
         ) : null}
+        {/* <Button
+          type="primary"
+          ghost
+          size="small"
+          className="mr-1"
+          onClick={() =>
+            setAddLonglelog({ ...setAddLonglelog, visible: true, type: lockTypeEnum.UPDATE })
+          }
+        >
+          升级
+        </Button> */}
         <Button type="primary" ghost size="small" onClick={() => openLockModal(lockTypeEnum.REMARK)}>
           备注
         </Button>

+ 3 - 3
src/pages/Product/Road/Enterprise/components/Detail/DeadlineModal.jsx

@@ -21,7 +21,9 @@ const DeadlineModal = props => {
   }
   useEffect(() => {
     if (upgradeType === upgradeTypeEnum.DEADLINE) {
-      form?.setFieldsValue({ deadline: dayjs(deadline) })
+      if (deadline !== 0) {
+        form?.setFieldsValue({ deadline: dayjs(deadline) })
+      }
       setShowDeadline(true)
     }
   }, [upgradeType])
@@ -52,12 +54,10 @@ const DeadlineModal = props => {
   return (
     <Modal
       getContainer={() => document.getElementById('root')}
-      width={800}
       title="确认限期"
       visible={visible}
       confirmLoading={loading}
       onCancel={() => {
-        setShowDeadline(false)
         onCancel()
         form?.resetFields()
       }}