| @@ -8,11 +8,15 @@ import { BASE_API_URL } from "../../../../config/api"; | |||||
| export interface M18ImportPoForm { | export interface M18ImportPoForm { | ||||
| modifiedDateFrom: string; | modifiedDateFrom: string; | ||||
| modifiedDateTo: string; | modifiedDateTo: string; | ||||
| dDateFrom: string; | |||||
| dDateTo: string; | |||||
| } | } | ||||
| export interface M18ImportDoForm { | export interface M18ImportDoForm { | ||||
| modifiedDateFrom: string; | modifiedDateFrom: string; | ||||
| modifiedDateTo: string; | modifiedDateTo: string; | ||||
| dDateFrom: string; | |||||
| dDateTo: string; | |||||
| } | } | ||||
| export interface M18ImportPqForm { | export interface M18ImportPqForm { | ||||
| @@ -70,7 +70,7 @@ const M18ImportDo: React.FC<Props> = ({}) => { | |||||
| <Box display="flex"> | <Box display="flex"> | ||||
| <Controller | <Controller | ||||
| control={control} | control={control} | ||||
| name="do.modifiedDateFrom" | |||||
| name="do.dDateFrom" | |||||
| // rules={{ | // rules={{ | ||||
| // required: "Please input the date From!", | // required: "Please input the date From!", | ||||
| // validate: { | // validate: { | ||||
| @@ -80,7 +80,7 @@ const M18ImportDo: React.FC<Props> = ({}) => { | |||||
| // }} | // }} | ||||
| render={({ field, fieldState: { error } }) => ( | render={({ field, fieldState: { error } }) => ( | ||||
| <DateTimePicker | <DateTimePicker | ||||
| label={t("Modified Date From *")} | |||||
| label={t("Delivery Date From *")} | |||||
| format={`${OUTPUT_DATE_FORMAT} ${OUTPUT_TIME_FORMAT}`} | format={`${OUTPUT_DATE_FORMAT} ${OUTPUT_TIME_FORMAT}`} | ||||
| onChange={(newValue: Dayjs | null) => | onChange={(newValue: Dayjs | null) => | ||||
| handleDateTimePickerOnChange(newValue, field.onChange) | handleDateTimePickerOnChange(newValue, field.onChange) | ||||
| @@ -104,7 +104,7 @@ const M18ImportDo: React.FC<Props> = ({}) => { | |||||
| </Box> | </Box> | ||||
| <Controller | <Controller | ||||
| control={control} | control={control} | ||||
| name="do.modifiedDateTo" | |||||
| name="do.dDateTo" | |||||
| // rules={{ | // rules={{ | ||||
| // required: "Please input the date to!", | // required: "Please input the date to!", | ||||
| // validate: { | // validate: { | ||||
| @@ -116,7 +116,7 @@ const M18ImportDo: React.FC<Props> = ({}) => { | |||||
| // }} | // }} | ||||
| render={({ field, fieldState: { error } }) => ( | render={({ field, fieldState: { error } }) => ( | ||||
| <DateTimePicker | <DateTimePicker | ||||
| label={t("Modified Date To *")} | |||||
| label={t("Delivery Date To *")} | |||||
| format={`${OUTPUT_DATE_FORMAT} ${OUTPUT_TIME_FORMAT}`} | format={`${OUTPUT_DATE_FORMAT} ${OUTPUT_TIME_FORMAT}`} | ||||
| onChange={(newValue: Dayjs | null) => | onChange={(newValue: Dayjs | null) => | ||||
| handleDateTimePickerOnChange(newValue, field.onChange) | handleDateTimePickerOnChange(newValue, field.onChange) | ||||
| @@ -70,7 +70,7 @@ const M18ImportPo: React.FC<Props> = ({}) => { | |||||
| <Box display="flex"> | <Box display="flex"> | ||||
| <Controller | <Controller | ||||
| control={control} | control={control} | ||||
| name="po.modifiedDateFrom" | |||||
| name="po.dDateFrom" | |||||
| // rules={{ | // rules={{ | ||||
| // required: "Please input the date From!", | // required: "Please input the date From!", | ||||
| // validate: { | // validate: { | ||||
| @@ -80,7 +80,7 @@ const M18ImportPo: React.FC<Props> = ({}) => { | |||||
| // }} | // }} | ||||
| render={({ field, fieldState: { error } }) => ( | render={({ field, fieldState: { error } }) => ( | ||||
| <DateTimePicker | <DateTimePicker | ||||
| label={t("Modified Date From *")} | |||||
| label={t("Delivery Date From *")} | |||||
| format={`${OUTPUT_DATE_FORMAT} ${OUTPUT_TIME_FORMAT}`} | format={`${OUTPUT_DATE_FORMAT} ${OUTPUT_TIME_FORMAT}`} | ||||
| onChange={(newValue: Dayjs | null) => | onChange={(newValue: Dayjs | null) => | ||||
| handleDateTimePickerOnChange(newValue, field.onChange) | handleDateTimePickerOnChange(newValue, field.onChange) | ||||
| @@ -104,7 +104,7 @@ const M18ImportPo: React.FC<Props> = ({}) => { | |||||
| </Box> | </Box> | ||||
| <Controller | <Controller | ||||
| control={control} | control={control} | ||||
| name="po.modifiedDateTo" | |||||
| name="po.dDateTo" | |||||
| // rules={{ | // rules={{ | ||||
| // required: "Please input the date to!", | // required: "Please input the date to!", | ||||
| // validate: { | // validate: { | ||||
| @@ -116,7 +116,7 @@ const M18ImportPo: React.FC<Props> = ({}) => { | |||||
| // }} | // }} | ||||
| render={({ field, fieldState: { error } }) => ( | render={({ field, fieldState: { error } }) => ( | ||||
| <DateTimePicker | <DateTimePicker | ||||
| label={t("Modified Date To *")} | |||||
| label={t("Delivery Date To *")} | |||||
| format={`${OUTPUT_DATE_FORMAT} ${OUTPUT_TIME_FORMAT}`} | format={`${OUTPUT_DATE_FORMAT} ${OUTPUT_TIME_FORMAT}`} | ||||
| onChange={(newValue: Dayjs | null) => | onChange={(newValue: Dayjs | null) => | ||||
| handleDateTimePickerOnChange(newValue, field.onChange) | handleDateTimePickerOnChange(newValue, field.onChange) | ||||