暂存

src/components/LoginPage/LoginPage.tsx

@@ -560,8 +560,11 @@ export default function ProjConfigLoginpage(props: any) {
                                 content: '编辑成功'
                             })
                             // props.closeModal()
+                            // props.closeModal()
+                            setTimeout(() => {
                                 props.closeModal()
-                        
+                                // window.location.reload(); // 刷新页面
+                            }, 500);
 
                         },
                         onFinally() {

src/route/CopyrightGgoods/CopyrightGgoods.tsx

@@ -1,9 +1,11 @@
 import './copyrightG-goods.css'
-import { Select, DatePicker, Button, Table, 
+import {
+  Select, DatePicker, Button, Table,
   // message,
-   Space, Input, Empty } from 'antd';
+  Space, Input, Empty
+} from 'antd';
 // import type { TableColumnsType } from 'antd';
-import { SearchOutlined } from '@ant-design/icons';
+import { SearchOutlined,ClearOutlined } from '@ant-design/icons';
 import type { DatePickerProps } from 'antd';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 const { Column } = Table;
@@ -105,11 +107,23 @@ export default function CopyrightGgoods() {
           ]}
         />
         <Button type="primary"
-          style={{ height: 36, backgroundColor: '#FF9F08' }}
+          style={{
+            height: 36,
+            // backgroundColor: '#FF9F08'
+          }}
 
           icon={<SearchOutlined />}>
           搜索
         </Button>
+        <Button
+          style={{
+            height: 36,
+            marginLeft: 10,
+            // backgroundColor: '#FF9F08'
+          }}
+          icon={<ClearOutlined />}>
+          清除
+        </Button>
       </div>
       <div className='copyrightG-goods-table'>
         {/* 表格 */}

src/route/ProductRelease/ProductRelease.tsx

@@ -1,22 +1,33 @@
 // import React from 'react'
 import './product-release.css'
-import { Select, DatePicker, Button, 
+import {
+  Select, DatePicker, Button,
   // message,
-   Checkbox, Empty, Switch } from 'antd';
+  Checkbox, Empty, Switch
+} from 'antd';
 // import type { CheckboxProps } from 'antd';
-import { SearchOutlined } from '@ant-design/icons';
+import { SearchOutlined,ClearOutlined } from '@ant-design/icons';
 import type { DatePickerProps } from 'antd';
 import locale from 'antd/es/date-picker/locale/zh_CN';
-import React from 'react';
+import React, { useState } from 'react';
-// import dayjs, { Dayjs } from 'dayjs';
+import dayjs, { } from 'dayjs';
 export default function ProductRelease() {
   // const [messageApi, contextHolder] = message.useMessage();
   const dateFormat = 'YYYY年MM月DD日';
+  // 所属人类型
+  const [belongType, setBelongType] = useState<any>(undefined)
   const belongTypeChange = (value: string) => {
     console.log(`selected ${value}`);
+    setBelongType(value)
   }
+  // 选择日期
+  const [date, setDate] = useState<any>(undefined)
   const onChange: DatePickerProps['onChange'] = (date, dateString) => {
     console.log(date, dateString);
+    setDate(date)
+    // dayjs(formInfo.getFieldValue('projDevCompleteDate')).format(dateFormat),
+    console.log('日期', dayjs(date).format(dateFormat));
+
   };
   const height = window.innerHeight - 180;
 
@@ -106,12 +117,13 @@ export default function ProductRelease() {
             { value: 'person', label: '个人' },
             { value: 'lucy', label: '企业' },
           ]}
+          value={belongType}
         />
         <DatePicker placeholder="软件取得时间"
           style={{ width: 198, height: 36, marginRight: 12 }}
-          format={dateFormat}
           locale={locale}
           onChange={onChange}
+          value={date}
         />
         <Select
           // defaultValue="lucy"
@@ -134,11 +146,23 @@ export default function ProductRelease() {
           ]}
         />
         <Button type="primary"
-          style={{ height: 36, backgroundColor: '#FF9F08' }}
+          style={{
+            height: 36,
+            // backgroundColor: '#FF9F08'
+          }}
 
           icon={<SearchOutlined />}>
           搜索
         </Button>
+        <Button 
+          style={{
+            height: 36,
+            marginLeft:10,
+            // backgroundColor: '#FF9F08'
+          }}
+          icon={<ClearOutlined />}>
+          清除
+        </Button>
       </div>
       <div>
         {/* 表格 */}

src/route/TradingGoods/TradingGoods.tsx

@@ -3,7 +3,7 @@ import { Select, DatePicker, Button, Table,
   // message,
    Space, Empty } from 'antd';
 // import type { TableColumnsType } from 'antd';
-import { SearchOutlined } from '@ant-design/icons';
+import { SearchOutlined,ClearOutlined } from '@ant-design/icons';
 import type { DatePickerProps } from 'antd';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 const { Column } = Table;
@@ -86,11 +86,22 @@ export default function TradingGoods() {
           ]}
         />
         <Button type="primary"
-          style={{ height: 36, backgroundColor: '#FF9F08' }}
+          style={{ height: 36, 
+            // backgroundColor: '#FF9F08' 
+          }}
 
           icon={<SearchOutlined />}>
           搜索
         </Button>
+        <Button 
+          style={{
+            height: 36,
+            marginLeft:10,
+            // backgroundColor: '#FF9F08'
+          }}
+          icon={<ClearOutlined />}>
+          清除
+        </Button>
       </div>
       <div className='trading-goods-table'>
         {/* 表格 */}

src/route/TransactionOrder/TransactionOrder.tsx

@@ -4,7 +4,7 @@ import { Select, DatePicker, Button, Table,
   //  message, 
    Space, Empty } from 'antd';
 // import type { TableColumnsType } from 'antd';
-import { SearchOutlined } from '@ant-design/icons';
+import { SearchOutlined,ClearOutlined } from '@ant-design/icons';
 import type { DatePickerProps } from 'antd';
 import locale from 'antd/es/date-picker/locale/zh_CN';
 const { Column } = Table;
@@ -87,11 +87,22 @@ export default function TransactionOrder() {
           ]}
         />
         <Button type="primary"
-          style={{ height: 36, backgroundColor: '#FF9F08' }}
+          style={{ height: 36, 
+            // backgroundColor: '#FF9F08'
+           }}
 
           icon={<SearchOutlined />}>
           搜索
         </Button>
+        <Button 
+          style={{
+            height: 36,
+            marginLeft:10,
+            // backgroundColor: '#FF9F08'
+          }}
+          icon={<ClearOutlined />}>
+          清除
+        </Button>
       </div>
       <div className='transaction-order-table'>
         {/* 表格 */}

src/route/proj/edit/ProjConfigLoginpage.tsx

@@ -561,9 +561,10 @@ export default function ProjConfigLoginpage(props: any) {
                                 content: '编辑成功'
                             })
                             // props.closeModal()
-                            props.closeModal()
+                            // props.closeModal()
                             setTimeout(()=>{
-                                window.location.reload()
+                                // window.location.reload()
+                                props.closeModal()
                             },500)
 
                         },

src/route/proj/edit/ProjEditStep1.tsx

@@ -226,7 +226,7 @@ export default function ProjEditStep1(props: any) {
                             setTimeout(() => {
                                 props.closeModal()
                                 // window.location.reload(); // 刷新页面
-                            }, 1000);
+                            }, 500);
 
                         },
                         onFinally() {

src/route/proj/edit/ProjEditStep2.tsx

@@ -259,7 +259,7 @@ export default function ProjEditStep2(props: any) {
                 setApplyConcatId(data.applyContactId)
                 setapplyContactName(data.applyContactName)
                 setapplyContactPhone(data.applyContactPhone)
-                // setapplyContactCompany(data.applyContactCompany)
+                setapplyContactCompany(data.applyContactCompany)
                 setapplyContactCsaNo(data.applyContactCsaNo)
                 setapplyContactEmail(data.applyContactEmail)
                 console.log('基本信息', data);
@@ -1057,14 +1057,17 @@ export default function ProjEditStep2(props: any) {
                                     setLoading(true);
                                 },
                                 onSuccess() {
+                                    // props.closeModal()
+
                                     messageApi.open({
                                         type: 'success',
                                         content: '编辑成功'
                                     })
                                     // props.closeModal()
-                                    props.closeModal()
                                     setTimeout(() => {
-                                        window.location.reload()
+                                        // window.location.reload()
+                                        props.closeModal()
+
                                     }, 500)
 
                                 },

src/route/proj/edit/ProjEditStep3.tsx

@@ -319,12 +319,13 @@ export default function ProjEditStep3(props:any) {
                         onSuccess() {
                             messageApi.open({
                                 type: 'success',
-                                content: '编辑成功'
+                                content: '编辑成功',
                             })
                             // props.closeModal()
-                            props.closeModal()
+                            // props.closeModal()
                             setTimeout(()=>{
-                                window.location.reload()
+                                // window.location.reload()
+                                props.closeModal()
                             },500)
                         },
                         onFinally() {