From 5c0dbf01ccefe2bb44c51c67d68cc8baf57a270b Mon Sep 17 00:00:00 2001
From: xixi <123@qq.com>
Date: Fri, 30 Aug 2024 10:07:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CapitalModal/CapitalModal.tsx |  8 ++---
 src/components/RecordModal/RecordModal.tsx   |  6 ++--
 src/components/myOrder/MyOrder.tsx           |  3 ++
 src/route/proj/ProjNew.tsx                   | 31 ++++++++++++++++++++
 4 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/components/CapitalModal/CapitalModal.tsx b/src/components/CapitalModal/CapitalModal.tsx
index caa512a..8f643fd 100644
--- a/src/components/CapitalModal/CapitalModal.tsx
+++ b/src/components/CapitalModal/CapitalModal.tsx
@@ -41,7 +41,7 @@ export default function CapitalModal() {
     };
     // 点击搜索
     const onSearch = () => {
-        console.log(newstartTime);
+        // console.log(newstartTime);
 
 
         setPage(1)
@@ -66,7 +66,7 @@ export default function CapitalModal() {
                 setIsLoading(true);
             },
             onSuccess(data: any) {
-                console.log(page);
+                // console.log(page);
 
                 setTableData(data.data.rows)
                 // console.log(data.data);
@@ -136,7 +136,7 @@ export default function CapitalModal() {
             },
             onSuccess(data: any) {
                 setTableData(data.data.rows)
-                console.log(data.data);
+                // console.log(data.data);
                 setTotal(data.data.total)
 
             },
@@ -325,7 +325,7 @@ export default function CapitalModal() {
                     }
                     scroll={{ y: 500 }}
                     bordered
-                    key="dataTable" rowKey="orderId"
+                    key="orderId" rowKey="accountItemId"
                 />
                 {/* <div className='product-release-pagination'>
                     <Pagination defaultCurrent={page} total={total} defaultPageSize={10} onChange={(page) => {
diff --git a/src/components/RecordModal/RecordModal.tsx b/src/components/RecordModal/RecordModal.tsx
index 06f3302..297fc80 100644
--- a/src/components/RecordModal/RecordModal.tsx
+++ b/src/components/RecordModal/RecordModal.tsx
@@ -39,7 +39,7 @@ export default function RecordModal() {
     };
     // 点击搜索
     const onSearch = () => {
-        console.log(newstartTime);
+        // console.log(newstartTime);
         setPage(1)
         setstartTime(newstartTime)
         setnewendTime(newendTime)
@@ -59,7 +59,7 @@ export default function RecordModal() {
                 setIsLoading(true);
             },
             onSuccess(data: any) {
-                console.log(page);
+                // console.log(page);
 
                 setTableData(data.data.rows)
                 // console.log(data.data);
@@ -125,7 +125,7 @@ export default function RecordModal() {
             },
             onSuccess(data: any) {
                 setTableData(data.data.rows)
-                console.log(data.data);
+                // console.log(data.data);
                 setTotal(data.data.total)
 
             },
diff --git a/src/components/myOrder/MyOrder.tsx b/src/components/myOrder/MyOrder.tsx
index 65bc062..ba800ba 100644
--- a/src/components/myOrder/MyOrder.tsx
+++ b/src/components/myOrder/MyOrder.tsx
@@ -236,6 +236,9 @@ export default function MyOrder() {
             dataIndex: 'detail.notes',
             align: 'center',
             // width: 120,
+            ellipsis: {
+                showTitle: false,
+            },
             render: (_value, record) => {
                 return <Tooltip placement="top" title={record.notes}>{record.notes}</Tooltip>
             }
diff --git a/src/route/proj/ProjNew.tsx b/src/route/proj/ProjNew.tsx
index 4545d05..7e94701 100644
--- a/src/route/proj/ProjNew.tsx
+++ b/src/route/proj/ProjNew.tsx
@@ -20,6 +20,7 @@ type ProjInfo = {
     belongPeople: string;
     contacts: string;
     projDevCompleteDate: string;
+    // coupon?:string
 };
 
 export default function ProjNew() {
@@ -66,6 +67,8 @@ export default function ProjNew() {
         applyContactPhone: '',
         applyContactCompany: ''
     })
+    // 优惠券弹窗
+    // const [couponModal,setCouponModal] = useState(false)
     const setValue = (value: string) => {
         form.setFieldsValue({
             belongPeople: value
@@ -232,6 +235,21 @@ export default function ProjNew() {
                                     />
                                 </Form.Item>
                             </div>
+                            {/* <div className='formItemOne' style={{ marginTop: 20, position: 'relative' }}>
+                                <div className='formItem-title '>
+                                    优惠券*
+                                </div>
+                                <Form.Item<ProjInfo>
+                                    name="coupon"
+                                    rules={[{ required: true, message: '请选择优惠券' }]}
+                                >
+                                    <Input style={{ background: '#eeeeee', width: '800px', height: '50px', fontSize: '16px', color: '#3B3B3B' }} placeholder="请选择优惠券" disabled />
+
+                                </Form.Item>
+                                <div style={{ position: 'absolute', right: 23, fontSize: 16, color: " #1F79FF", cursor: 'pointer' }} onClick={() => {
+                                    setCouponModal(true)
+                                }}>选择</div>
+                            </div> */}
                             <div className='software-protocol'>
                                 <Form.Item
                                     name="agreement"
@@ -396,6 +414,19 @@ export default function ProjNew() {
 
                 <BelongPeople closeModal={() => { setBelongModal(false) }} setBelongPeopleInfo={setBelongPeopleInfo} belongPeopleInfo={belongPeopleInfo} setValue={setValue} isShow={true}></BelongPeople>
             </Modal>
+            {/* <Modal title="选择优惠券"
+                destroyOnClose
+
+                open={couponModal}
+                width={809}
+
+                footer={null}
+                onCancel={() => {
+                    setCouponModal(false)
+
+                }}>
+                    <div>优惠券</div>
+            </Modal> */}
             <Spin tip="正在提交..." spinning={loading} fullscreen />
         </>
     )