From f0d09578b40beff715b9a32a78fa5a8a5efe0275 Mon Sep 17 00:00:00 2001
From: "sosuke.iwabuchi" <sosuke.iwabuchi@satellite-tech.co.jp>
Date: Wed, 23 Aug 2023 15:15:47 +0900
Subject: [PATCH] =?UTF-8?q?=E9=A0=98=E5=8F=8E=E8=A8=BC=E7=99=BA=E8=A1=8C?=
 =?UTF-8?q?=E4=BE=9D=E9=A0=BC=E4=B8=80=E8=A6=A7=E3=81=AB=E9=A0=98=E5=8F=8E?=
 =?UTF-8?q?=E8=A8=BC=E7=95=AA=E5=8F=B7=E6=A4=9C=E7=B4=A2=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=E3=80=80=E3=83=87=E3=83=95=E3=82=A9=E3=83=AB=E3=83=88=E3=81=A7?=
 =?UTF-8?q?=E5=AE=8C=E4=BA=86=E5=90=AB=E3=82=80=E3=82=88=E3=81=86=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SATE_RECEIPT-39 一覧画面
---
 .../custom/hello-techno/list.tsx              | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/pages/dashboard/receipt-issuing-order/custom/hello-techno/list.tsx b/src/pages/dashboard/receipt-issuing-order/custom/hello-techno/list.tsx
index 04395ad..64134fc 100644
--- a/src/pages/dashboard/receipt-issuing-order/custom/hello-techno/list.tsx
+++ b/src/pages/dashboard/receipt-issuing-order/custom/hello-techno/list.tsx
@@ -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>