update ui

src/pages/DemandNote/Details/DnDetailCard.js

@@ -127,24 +127,24 @@ const DnDetailCard = ({ data }) => {
                         {getDisplayField("Sent on", "")}
                     </Grid>
                     <Grid container direction="row" justifyContent="space-between" alignItems="center">
-                        {getDisplayField("Reminder 1", DateUtils.dateStr(dnData.expectReminder1))}
+                        {getDisplayField("Reminder 1", dnData?.expectReminder1 ? DateUtils.dateStr(dnData.expectReminder1):"--")}
                         {getDisplayField("Reminder 1", dnData?.reminder1 ? DateUtils.datetimeStr(dnData.reminder1) : "--")}
                     </Grid>
 
                     <Grid container direction="row" justifyContent="space-between" alignItems="center">
-                        {getDisplayField("Reminder 2",  DateUtils.dateStr(dnData.expectReminder2))}
+                        {getDisplayField("Reminder 2", dnData?.expectReminder2 ? DateUtils.dateStr(dnData.expectReminder2):"--")}
                         {getDisplayField("Reminder 2", dnData?.reminder2 ? DateUtils.datetimeStr(dnData.reminder2) : "--")}
                     </Grid>
                     <Grid container direction="row" justifyContent="space-between" alignItems="center">
-                        {getDisplayField("Reminder 3",  DateUtils.dateStr(dnData.expectReminder3))}
+                        {getDisplayField("Reminder 3", dnData?.expectReminder3 ? DateUtils.dateStr(dnData.expectReminder3):"--")}
                         {getDisplayField("Reminder 3", dnData?.reminder3 ? DateUtils.datetimeStr(dnData.reminder3) : "--")}
                     </Grid>
                     <Grid container direction="row" justifyContent="space-between" alignItems="center">
-                        {getDisplayField("Reminder 4",  DateUtils.dateStr(dnData.expectReminder4))}
+                        {getDisplayField("Reminder 4", dnData?.expectReminder4 ? DateUtils.dateStr(dnData.expectReminder4):"--")}
                         {getDisplayField("Reminder 4", dnData?.reminder4 ? DateUtils.datetimeStr(dnData.reminder4) : "--")}
                     </Grid>
                     <Grid container direction="row" justifyContent="space-between" alignItems="center">
-                        {getDisplayField("Reminder Final",  DateUtils.dateStr(dnData.expectReminderFinal))}
+                        {getDisplayField("Reminder Final", dnData?.expectReminderFinal ? DateUtils.dateStr(dnData.expectReminderFinal):"--")}
                         {getDisplayField("Reminder Final", dnData?.reminderFinal ? DateUtils.datetimeStr(dnData.reminderFinal) : "--")}
                     </Grid>
 

src/pages/PublicNotice/ListPanel/SearchPublicNoticeForm.js

@@ -1,4 +1,4 @@
-// material-ui
+// material-uistatus
 import {
     Button,
     Grid, TextField,
@@ -22,17 +22,17 @@ import {FormattedMessage, useIntl} from "react-intl";
 const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
     const intl = useIntl();
     const [type, setType] = React.useState([]);
-    const [status, setStatus] = React.useState([{ key: 0, label: 'all', type: 'all' }]);
+    const [status, setStatus] = React.useState({ key: 0, label: 'all', type: 'all' });
 
     const [minDate, setMinDate] = React.useState(searchCriteria.dateFrom);
     const [maxDate, setMaxDate] = React.useState(searchCriteria.dateTo);
-    const [selectedLabelsString, setSelectedLabelsString] = React.useState('');
+    // const [selectedLabelsString, setSelectedLabelsString] = React.useState('');
 
     const { reset, register, handleSubmit } = useForm()
     const marginBottom = 2.5;
 
     const onSubmit = (data) => {
-        data.status = selectedLabelsString
+        data.status = status.type;
         let typeArray = [];
 
         for (let i = 0; i < type.length; i++) {
@@ -52,7 +52,7 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
 
     function resetForm() {
         setType([]);
-        setStatus([{ key: 0, label: 'All', labelCht: "全部", type: 'all' }]);
+        setStatus({ key: 0, label: 'All', labelCht: "全部", type: 'all' });
         reset();
     }
 
@@ -150,8 +150,39 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                             }}
                         />
                     </Grid>
-
                     <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
+                        <Autocomplete
+                            {...register("status")}
+                            id="status"
+                            size="small"
+                            // filterOptions={(options)=>options}
+                            options={
+                                localStorage.getItem('userData').creditor ?
+                                    ComboData.publicNoticeStatic_Creditor :
+                                    ComboData.publicNoticeStatic
+                            }
+                            value={status}
+                            // inputValue={status?.labelCht}
+                            getOptionLabel={(option) => intl.formatMessage({id: option.label})}
+                            onChange={(event, newValue) => {
+                                    setStatus(newValue);
+                            }}
+                            renderInput={(params) => (
+                                <TextField {...params}
+                                    label={intl.formatMessage({id: 'status'})}
+                                    aria-label={intl.formatMessage({id: 'status'})}
+                                    InputLabelProps={{
+                                        shrink: true
+                                    }}
+                                />
+                            )}
+                        // InputLabelProps={{
+                        //     shrink: true
+                        // }}
+                        />
+                    </Grid>
+
+                    {/* <Grid item xs={9} s={6} md={5} lg={3} sx={{ ml: 3, mr: 3, mb: 3 }}>
                         <Autocomplete
                             multiple
                             {...register("status")}
@@ -198,15 +229,8 @@ const SearchPublicNoticeForm = ({ applySearch, searchCriteria }) => {
                         //     shrink: true
                         // }}
                         />
-                    </Grid>
-                    {/*<Grid item xs={9} s={6} md={5} lg={3} sx={{ml:3, mr:3, mb:3}}>*/}
-                    {/*    <TextField*/}
-                    {/*        fullWidth*/}
-                    {/*        {...register("subDivisionId")}*/}
-                    {/*        id="subDivision"*/}
-                    {/*        label="Sub-Division"*/}
-                    {/*    />*/}
-                    {/*</Grid>*/}
+                    </Grid> */}
+                
 
                 </Grid>