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" /> {/*
{ 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 {record.notes} } 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() { />
+ {/*
+
+ 优惠券* +
+ + name="coupon" + rules={[{ required: true, message: '请选择优惠券' }]} + > + + + +
{ + setCouponModal(true) + }}>选择
+
*/}
{ setBelongModal(false) }} setBelongPeopleInfo={setBelongPeopleInfo} belongPeopleInfo={belongPeopleInfo} setValue={setValue} isShow={true}> + {/* { + setCouponModal(false) + + }}> +
优惠券
+
*/} )