From 266270fa269d596ba8df46002a64456e528cc37c Mon Sep 17 00:00:00 2001
From: xixi <123@qq.com>
Date: Tue, 4 Jun 2024 16:02:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LoginPage/LoginPage.tsx        |  7 +++-
 src/route/CopyrightGgoods/CopyrightGgoods.tsx | 22 ++++++++--
 src/route/ProductRelease/ProductRelease.tsx   | 40 +++++++++++++++----
 src/route/TradingGoods/TradingGoods.tsx       | 15 ++++++-
 .../TransactionOrder/TransactionOrder.tsx     | 15 ++++++-
 src/route/proj/edit/ProjConfigLoginpage.tsx   |  5 ++-
 src/route/proj/edit/ProjEditStep1.tsx         |  2 +-
 src/route/proj/edit/ProjEditStep2.tsx         | 17 ++++----
 src/route/proj/edit/ProjEditStep3.tsx         |  7 ++--
 9 files changed, 99 insertions(+), 31 deletions(-)

diff --git a/src/components/LoginPage/LoginPage.tsx b/src/components/LoginPage/LoginPage.tsx
index dd8104a..dee6403 100644
--- a/src/components/LoginPage/LoginPage.tsx
+++ b/src/components/LoginPage/LoginPage.tsx
@@ -560,8 +560,11 @@ export default function ProjConfigLoginpage(props: any) {
                                 content: '编辑成功'
                             })
                             // props.closeModal()
-                            props.closeModal()
-                        
+                            // props.closeModal()
+                            setTimeout(() => {
+                                props.closeModal()
+                                // window.location.reload(); // 刷新页面
+                            }, 500);
 
                         },
                         onFinally() {
diff --git a/src/route/CopyrightGgoods/CopyrightGgoods.tsx b/src/route/CopyrightGgoods/CopyrightGgoods.tsx
index 5126f91..5aa5cfd 100644
--- a/src/route/CopyrightGgoods/CopyrightGgoods.tsx
+++ b/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'>
         {/* 表格 */}
diff --git a/src/route/ProductRelease/ProductRelease.tsx b/src/route/ProductRelease/ProductRelease.tsx
index 8b35b36..f13d60e 100644
--- a/src/route/ProductRelease/ProductRelease.tsx
+++ b/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 dayjs, { Dayjs } from 'dayjs';
+import React, { useState } from 'react';
+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>
         {/* 表格 */}
@@ -205,7 +229,7 @@ export default function ProductRelease() {
                         <td style={{ fontSize: 24, color: '#FF5D15' }}>{item.price}</td>
                         <td>{item.time2}</td>
                         <td>
-                          <Switch checkedChildren="On" unCheckedChildren="Off" onChange={(e) => { opneChange(e, item) }} defaultChecked={item.open == 0 ? false : true}  />
+                          <Switch checkedChildren="On" unCheckedChildren="Off" onChange={(e) => { opneChange(e, item) }} defaultChecked={item.open == 0 ? false : true} />
                         </td>
                         <td>{item.status}</td>
                         <td>
diff --git a/src/route/TradingGoods/TradingGoods.tsx b/src/route/TradingGoods/TradingGoods.tsx
index 80ea095..d2f98f7 100644
--- a/src/route/TradingGoods/TradingGoods.tsx
+++ b/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'>
         {/* 表格 */}
diff --git a/src/route/TransactionOrder/TransactionOrder.tsx b/src/route/TransactionOrder/TransactionOrder.tsx
index beb1b4c..492199b 100644
--- a/src/route/TransactionOrder/TransactionOrder.tsx
+++ b/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'>
         {/* 表格 */}
diff --git a/src/route/proj/edit/ProjConfigLoginpage.tsx b/src/route/proj/edit/ProjConfigLoginpage.tsx
index ac1bb66..7aefa53 100644
--- a/src/route/proj/edit/ProjConfigLoginpage.tsx
+++ b/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)
 
                         },
diff --git a/src/route/proj/edit/ProjEditStep1.tsx b/src/route/proj/edit/ProjEditStep1.tsx
index 46fa31d..0382015 100644
--- a/src/route/proj/edit/ProjEditStep1.tsx
+++ b/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() {
diff --git a/src/route/proj/edit/ProjEditStep2.tsx b/src/route/proj/edit/ProjEditStep2.tsx
index 8651ff5..2e1de3a 100644
--- a/src/route/proj/edit/ProjEditStep2.tsx
+++ b/src/route/proj/edit/ProjEditStep2.tsx
@@ -94,7 +94,7 @@ export default function ProjEditStep2(props: any) {
     const [applyContactEmail, setapplyContactEmail] = useState('') //联系人邮箱
     const [applyContactName, setapplyContactName] = useState('')  //联系人姓名
     const [applyContactPhone, setapplyContactPhone] = useState('') //联系人手机
-    const [applyContactCompany,setapplyContactCompany] = useState('')
+    const [applyContactCompany, setapplyContactCompany] = useState('')
     // 设置所属者more你选中的行
     // const [selectedRowKeys, setSelectedRowKeys] = useState<BelongDataType[]>([]);
 
@@ -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);
@@ -862,7 +862,7 @@ export default function ProjEditStep2(props: any) {
                                         <div style={{ marginRight: '22px' }}>当前申请人:</div>
                                         <div style={{ display: applyContactName == '' ? 'block' : 'none' }}>请选择申请人</div>
                                         <div style={{ display: applyContactName == '' ? 'none' : 'block' }}>
-                                            {applyContactName}/{applyContactPhone}{applyContactEmail?'/'+applyContactEmail:''}
+                                            {applyContactName}/{applyContactPhone}{applyContactEmail ? '/' + applyContactEmail : ''}
                                         </div>
                                     </div>
                                     <div className='belongPeople-bot'>
@@ -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)
 
                                 },
@@ -1445,7 +1448,7 @@ export default function ProjEditStep2(props: any) {
                                         </Form.Item>
                                     </div>
                                     <div className='blongNameInt'>
-                                        <div className='blongTitle ' style={{ width: 65 , marginRight: '15px'}}>电话: </div>
+                                        <div className='blongTitle ' style={{ width: 65, marginRight: '15px' }}>电话: </div>
 
                                         <Form.Item<ContactType>
                                             name="phone"
@@ -1483,7 +1486,7 @@ export default function ProjEditStep2(props: any) {
                                             ]}
                                         >
                                             <Input placeholder="请输入邮箱"
-                                                style={{ height: '44px', width: '384px', fontSize: '15px', marginTop: '22px'}}
+                                                style={{ height: '44px', width: '384px', fontSize: '15px', marginTop: '22px' }}
 
                                                 disabled={contactTitle == '查看联系人' ? true : false}
                                             />
diff --git a/src/route/proj/edit/ProjEditStep3.tsx b/src/route/proj/edit/ProjEditStep3.tsx
index b567c5f..37dbcec 100644
--- a/src/route/proj/edit/ProjEditStep3.tsx
+++ b/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() {