update

src/components/MainCard.js

@@ -62,7 +62,7 @@ const MainCard = forwardRef(
               fontFamily: theme.typography.fontFamily,
               fontSize: '0.75rem'
             },
-            maxWidth: { xs: 700, sm: 900, md: 1000, lg: 1300, xl: 1850 },
+            // maxWidth: { xs: 700, sm: 900, md: 1000, lg: 1300, xl: 1850 },
             // minWidth: { xs: 600, sm: 800, md: 900, lg: 1000, xl: 1000 },
             margin: { xs: 2.5, md: 3 },
             // '& > *': {

src/pages/PublicNotice/ListPanel/BaseGrid.js

@@ -33,32 +33,32 @@ export default function BaseGrid({rows}) {
                 return DateUtils.datetimeStr(params?.value);
             }
         },
-        {
-            id: 'contactPerson',
-            field: 'contactPerson',
-            headerName: '聯絡人',
-            flex: 2,
-            renderCell: (params) => {
-                let phone = JSON.parse(params.row.contactTelNo);
-                let faxNo = JSON.parse(params.row.contactFaxNo);
+        // {
+        //     id: 'contactPerson',
+        //     field: 'contactPerson',
+        //     headerName: '聯絡人',
+        //     flex: 2,
+        //     renderCell: (params) => {
+        //         let phone = JSON.parse(params.row.contactTelNo);
+        //         let faxNo = JSON.parse(params.row.contactFaxNo);
 
-                let contact = "";
-                if (phone) {
-                    contact = "電話: " + phone?.countryCode + " " + phone?.phoneNumber
-                }
+        //         let contact = "";
+        //         if (phone) {
+        //             contact = "電話: " + phone?.countryCode + " " + phone?.phoneNumber
+        //         }
 
-                if (faxNo && faxNo?.faxNumber) {
-                    if (contact != "")
-                        contact = contact + ", "
-                    contact = contact + "傳真:" + faxNo?.countryCode + " " + faxNo?.faxNumber
-                }
+        //         if (faxNo && faxNo?.faxNumber) {
+        //             if (contact != "")
+        //                 contact = contact + ", "
+        //             contact = contact + "傳真:" + faxNo?.countryCode + " " + faxNo?.faxNumber
+        //         }
 
-                return (<>
-                    {params?.value}<br />
-                    {contact}
-                </>);
-            }
-        },
+        //         return (<>
+        //             {params?.value}<br />
+        //             {contact}
+        //         </>);
+        //     }
+        // },
         {
             id: 'remarks',
             field: 'remarks',
@@ -90,7 +90,7 @@ export default function BaseGrid({rows}) {
     }
 
     return (
-        <div style={{height: '100%', width: '100%', padding: 4}}>
+        <div style={{minHeight: 400, width: '100%', padding: 4}}>
             <FiDataGrid
                 rows={rows}
                 columns={columns}

src/pages/PublicNotice/ListPanel/PendingPaymentTab.js

@@ -39,32 +39,32 @@ export default function SubmittedTab({ rows }) {
                 return DateUtils.datetimeStr(params.value);
             }
         },
-        {
-            id: 'contactPerson',
-            field: 'contactPerson',
-            headerName: '聯絡人',
-            flex: 2,
-            renderCell: (params) => {
-                let phone = JSON.parse(params.row.contactTelNo);
-                let faxNo = JSON.parse(params.row.contactFaxNo);
-
-                let contact = "";
-                if (phone) {
-                    contact = "電話: " + phone?.countryCode + " " + phone?.phoneNumber
-                }
-
-                if (faxNo && faxNo?.faxNumber) {
-                    if (contact != "")
-                        contact = contact + ", "
-                    contact = contact + "傳真:" + faxNo?.countryCode + " " + faxNo?.faxNumber
-                }
-
-                return (<>
-                    {params?.value}<br />
-                    {contact}
-                </>);
-            }
-        },
+        // {
+        //     id: 'contactPerson',
+        //     field: 'contactPerson',
+        //     headerName: '聯絡人',
+        //     flex: 2,
+        //     renderCell: (params) => {
+        //         let phone = JSON.parse(params.row.contactTelNo);
+        //         let faxNo = JSON.parse(params.row.contactFaxNo);
+
+        //         let contact = "";
+        //         if (phone) {
+        //             contact = "電話: " + phone?.countryCode + " " + phone?.phoneNumber
+        //         }
+
+        //         if (faxNo && faxNo?.faxNumber) {
+        //             if (contact != "")
+        //                 contact = contact + ", "
+        //             contact = contact + "傳真:" + faxNo?.countryCode + " " + faxNo?.faxNumber
+        //         }
+
+        //         return (<>
+        //             {params?.value}<br />
+        //             {contact}
+        //         </>);
+        //     }
+        // },
         {
             id: 'remarks',
             field: 'remarks',

src/pages/PublicNotice/ListPanel/SearchPublicNoticeTable.js

@@ -37,32 +37,32 @@ export default function SearchPublicNoticeTable({ recordList }) {
                 return DateUtils.datetimeStr(params?.value);
             }
         },
-        {
-            id: 'contactPerson',
-            field: 'contactPerson',
-            headerName: '聯絡人',
-            flex: 2,
-            renderCell: (params) => {
-                let phone = JSON.parse(params.row.contactTelNo);
-                let faxNo = JSON.parse(params.row.contactFaxNo);
+        // {
+        //     id: 'contactPerson',
+        //     field: 'contactPerson',
+        //     headerName: '聯絡人',
+        //     flex: 2,
+        //     renderCell: (params) => {
+        //         let phone = JSON.parse(params.row.contactTelNo);
+        //         let faxNo = JSON.parse(params.row.contactFaxNo);
 
-                let contact = "";
-                if (phone) {
-                    contact = "電話: " + phone?.countryCode + " " + phone?.phoneNumber
-                }
+        //         let contact = "";
+        //         if (phone) {
+        //             contact = "電話: " + phone?.countryCode + " " + phone?.phoneNumber
+        //         }
 
-                if (faxNo && faxNo?.faxNumber) {
-                    if (contact != "")
-                        contact = contact + ", "
-                    contact = contact + "傳真:" + faxNo?.countryCode + " " + faxNo?.faxNumber
-                }
+        //         if (faxNo && faxNo?.faxNumber) {
+        //             if (contact != "")
+        //                 contact = contact + ", "
+        //             contact = contact + "傳真:" + faxNo?.countryCode + " " + faxNo?.faxNumber
+        //         }
 
-                return (<>
-                    {params?.value}<br />
-                    {contact}
-                </>);
-            }
-        },
+        //         return (<>
+        //             {params?.value}<br />
+        //             {contact}
+        //         </>);
+        //     }
+        // },
         {
             id: 'remarks',
             field: 'remarks',