|
|
|
@@ -34,11 +34,6 @@ import { |
|
|
|
RHFSelect, |
|
|
|
RHFTextField, |
|
|
|
} from "components/hook-form"; |
|
|
|
import RHFAutoComplete, { |
|
|
|
AutoCompleteOption, |
|
|
|
AutoCompleteOptionType, |
|
|
|
getValue, |
|
|
|
} from "components/hook-form/RHFAutoComplete"; |
|
|
|
import RHFDatePicker from "components/hook-form/RHFDatePicker"; |
|
|
|
import { SelectOptionProps } from "components/hook-form/RHFSelect"; |
|
|
|
import { TableHeadCustom } from "components/table"; |
|
|
|
@@ -232,9 +227,11 @@ function SearchBox({ table }: CommonProps) { |
|
|
|
const fetch = async (data: Dictionary) => { |
|
|
|
const sendData = makeSendData({ |
|
|
|
...data, |
|
|
|
// 完了を含む場合は、条件設定しない。含まない場合は未完了のみとする |
|
|
|
done: data.include_done === "1" ? "" : "0", |
|
|
|
}); |
|
|
|
if (data.include_done === "0") { |
|
|
|
// 完了を含む場合は、条件設定しない。含まない場合は未完了のみとする |
|
|
|
sendData.done = "0"; |
|
|
|
} |
|
|
|
|
|
|
|
if (!isEqual(sendData, lastSendSearchCondition)) { |
|
|
|
setLastSendSearchCondition(sendData); |
|
|
|
@@ -247,7 +244,7 @@ function SearchBox({ table }: CommonProps) { |
|
|
|
if (initialized) { |
|
|
|
form.setValue("customer_name", get("customer_name")); |
|
|
|
form.setValue("parking_name", get("parking_name")); |
|
|
|
form.setValue("include_done", get("include_done") === "1"); |
|
|
|
form.setValue("include_done", get("include_done") !== "0"); |
|
|
|
form.setValue("status", get("status")); |
|
|
|
form.setValue("handler_name", get("handler_name")); |
|
|
|
form.setValue("sms_phone_number", get("sms_phone_number")); |
|
|
|
@@ -429,6 +426,7 @@ function SearchBox({ table }: CommonProps) { |
|
|
|
function TableBox({ table }: CommonProps) { |
|
|
|
const TABLE_HEAD: HeadLabelProps[] = [ |
|
|
|
{ id: "order_datetime", label: "受付時刻", align: "left" }, |
|
|
|
{ id: "receipt_no", label: "領収証番号", align: "left", needSort: false }, |
|
|
|
{ id: "customer_name", label: "運営会社名", align: "left" }, |
|
|
|
{ id: "parking_name", label: "駐車場名", align: "left" }, |
|
|
|
{ id: "status_name", label: "ステータス", align: "left" }, |
|
|
|
@@ -455,13 +453,8 @@ function TableBox({ table }: CommonProps) { |
|
|
|
|
|
|
|
return ( |
|
|
|
<> |
|
|
|
<TableContainer |
|
|
|
sx={{ |
|
|
|
// minWidth: 800, |
|
|
|
position: "relative", |
|
|
|
}} |
|
|
|
> |
|
|
|
<Table size="small"> |
|
|
|
<TableContainer> |
|
|
|
<Table sx={{ minWidth: 1200 }}> |
|
|
|
<TableHeadCustom |
|
|
|
order={order} |
|
|
|
orderBy={sort} |
|
|
|
@@ -516,6 +509,7 @@ function Row({ data }: RowProps) { |
|
|
|
return ( |
|
|
|
<TableRow hover sx={{ cursor: "pointer" }} onClick={handleClick}> |
|
|
|
<TableCell>{data.order_datetime}</TableCell> |
|
|
|
<TableCell>{data.receipt_no}</TableCell> |
|
|
|
<TableCell>{data.customer_name}</TableCell> |
|
|
|
<TableCell>{data.parking_name}</TableCell> |
|
|
|
<TableCell>{data.status_name}</TableCell> |
|
|
|
|