浏览代码

字段名称修正

quyx@nextosd.com 3 月之前
父节点
当前提交
86c8bec212
共有 1 个文件被更改,包括 112 次插入106 次删除
  1. 112 106
      src/pages/Base/Order/index.tsx

+ 112 - 106
src/pages/Base/Order/index.tsx

@@ -69,14 +69,14 @@ const GridExample = () => {
      const [orderInfo, setOrderInfo] = useState({
         deliveryPartner: {
             id: "0311111111",
-            name: "AAA株式会社"
+            corpName: "AAA株式会社"
         },
         status: {
-            companyCode: "R000001",
-            status: "全承諾",
+            corpCode: "R000001",
+            orderStatus: "全承諾",
             version: 1,
-            instructionDate: "2025/6/25",
-            approvalDate: "2025/6/25"
+            instructionDeliveryDate: "2025/6/25",
+            commitDate: "2025/6/25"
         },
         monthlyInstruction: {
             versionOptions: ["ver-1", "ver-2", "ver-3", "ver-4", "ver-5"],
@@ -341,14 +341,14 @@ const GridExample = () => {
     function initializeRowData() {
         return [
             {
-                "AM": "",
-                "": "032990",
-                "": "025990",
-                "系統": "02",
-                "線便名": "大賀10t①",
-                "入庫場所": "羽田CGB",
-                "入庫時間": "21:00",
-                "使用車両(トン)": "13",
+                "amFlag": "",
+                "departureCode": "032990",
+                "arrivalCode": "025990",
+                "systemCode": "02",
+                "lineName": "大賀10t①",
+                "wareHouseLocation": "羽田CGB",
+                "wareHouseTime": "21:00",
+                "vehicleTon": "13",
                 "checkboxCol": "",
                 "tokyoBranchCol": "東京支店",
                 "approveStatus": "approved",
@@ -357,14 +357,14 @@ const GridExample = () => {
                 })).reduce((acc, curr) => ({...acc,...curr }), {})
             },
             {
-                "AM": "",
-                "": "032990",
-                "": "027990",
-                "系統": "23",
-                "線便名": "大賀10t②",
-                "入庫場所": "桜丘",
-                "入庫時間": "19:00",
-                "使用車両(トン)": "13",
+                "amFlag": "",
+                "departureCode": "032990",
+                "arrivalCode": "027990",
+                "systemCode": "23",
+                "lineName": "大賀10t②",
+                "wareHouseLocation": "桜丘",
+                "wareHouseTime": "19:00",
+                "vehicleTon": "13",
                 "checkboxCol": "",
                 "tokyoBranchCol": "神奈川支店",
                 "approveStatus": "unapproved",
@@ -373,14 +373,14 @@ const GridExample = () => {
                 })).reduce((acc, curr) => ({...acc,...curr }), {})
             },
             {
-                "AM": "*",
-                "": "032990",
-                "": "027990",
-                "系統": "G8",
-                "線便名": "大賀10t③",
-                "入庫場所": "目黒",
-                "入庫時間": "18:00",
-                "使用車両(トン)": "13",
+                "amFlag": "*",
+                "departureCode": "032990",
+                "arrivalCode": "027990",
+                "systemCode": "G8",
+                "lineName": "大賀10t③",
+                "wareHouseLocation": "目黒",
+                "wareHouseTime": "18:00",
+                "vehicleTon": "13",
                 "checkboxCol": "",
                 "tokyoBranchCol": "品川営業所",
                 "approveStatus": "approved",
@@ -389,14 +389,14 @@ const GridExample = () => {
                 })).reduce((acc, curr) => ({...acc,...curr }), {})
             },
             {
-                "AM": "",
-                "": "032990",
-                "": "027990",
-                "系統": "G9",
-                "線便名": "西大阪交表",
-                "入庫場所": "羽田CGB",
-                "入庫時間": "21:00",
-                "使用車両(トン)": "13",
+                "amFlag": "",
+                "departureCode": "032990",
+                "arrivalCode": "027990",
+                "systemCode": "G9",
+                "lineName": "西大阪交表",
+                "wareHouseLocation": "羽田CGB",
+                "wareHouseTime": "21:00",
+                "vehicleTon": "13",
                 "checkboxCol": "",
                 "tokyoBranchCol": "札幌支店",
                 "approveStatus": "unapproved",
@@ -405,14 +405,14 @@ const GridExample = () => {
                 })).reduce((acc, curr) => ({...acc,...curr }), {})
             },
             {
-                "AM": "",
-                "": "061990",
-                "": "032990",
-                "系統": "06",
-                "線便名": "羽田CG交裏",
-                "入庫場所": "西大阪B",
-                "入庫時間": "19:00",
-                "使用車両(トン)": "10",
+                "amFlag": "",
+                "departureCode": "061990",
+                "arrivalCode": "032990",
+                "systemCode": "06",
+                "lineName": "羽田CG交裏",
+                "wareHouseLocation": "西大阪B",
+                "wareHouseTime": "19:00",
+                "vehicleTon": "10",
                 "checkboxCol": "",
                 "tokyoBranchCol": "福岡支店",
                 "approveStatus": "approved",
@@ -421,14 +421,14 @@ const GridExample = () => {
                 })).reduce((acc, curr) => ({...acc,...curr }), {})
             },
             {
-                "AM": "",
-                "": "032990",
-                "": "032990",
-                "系統": "M8",
-                "線便名": "大賀10t⑥",
-                "入庫場所": "羽田CGB",
-                "入庫時間": "21:00",
-                "使用車両(トン)": "13",
+                "amFlag": "",
+                "departureCode": "032990",
+                "arrivalCode": "032990",
+                "systemCode": "M8",
+                "lineName": "大賀10t⑥",
+                "wareHouseLocation": "羽田CGB",
+                "wareHouseTime": "21:00",
+                "vehicleTon": "13",
                 "checkboxCol": "",
                 "tokyoBranchCol": "東京支店",
                 "approveStatus": "approved",
@@ -437,14 +437,14 @@ const GridExample = () => {
                 })).reduce((acc, curr) => ({...acc,...curr }), {})
             },
             {
-                "AM": "",
-                "": "032990",
-                "": "053990",
-                "系統": "06",
-                "線便名": "中部日祝",
-                "入庫場所": "成城",
-                "入庫時間": "19:00",
-                "使用車両(トン)": "13",
+                "amFlag": "",
+                "departureCode": "032990",
+                "arrivalCode": "053990",
+                "systemCode": "06",
+                "lineName": "中部日祝",
+                "wareHouseLocation": "成城",
+                "wareHouseTime": "19:00",
+                "vehicleTon": "13",
                 "checkboxCol": "",
                 "tokyoBranchCol": "神奈川支店",
                 "approveStatus": "unapproved",
@@ -453,14 +453,14 @@ const GridExample = () => {
                 })).reduce((acc, curr) => ({...acc,...curr }), {})
             },
             {
-                "AM": "*",
-                "": "032990",
-                "": "027990",
-                "系統": "G8",
-                "線便名": "大賀10t③",
-                "入庫場所": "目黒",
-                "入庫時間": "18:00",
-                "使用車両(トン)": "13",
+                "amFlag": "*",
+                "departureCode": "032990",
+                "arrivalCode": "027990",
+                "systemCode": "G8",
+                "lineName": "大賀10t③",
+                "wareHouseLocation": "目黒",
+                "wareHouseTime": "18:00",
+                "vehicleTon": "13",
                 "checkboxCol": "",
                 "tokyoBranchCol": "品川営業所",
                 "approveStatus": "approved",
@@ -469,14 +469,14 @@ const GridExample = () => {
                 })).reduce((acc, curr) => ({...acc,...curr }), {})
             },
             {
-                "AM": "",
-                "": "032990",
-                "": "132990",
-                "系統": "02",
-                "線便名": "大賀7t",
-                "入庫場所": "八幡山",
-                "入庫時間": "19:00",
-                "使用車両(トン)": "2",
+                "amFlag": "",
+                "departureCode": "032990",
+                "arrivalCode": "132990",
+                "systemCode": "02",
+                "lineName": "大賀7t",
+                "wareHouseLocation": "八幡山",
+                "wareHouseTime": "19:00",
+                "vehicleTon": "2",
                 "checkboxCol": "",
                 "tokyoBranchCol": "札幌支店",
                 "approveStatus": "unapproved",
@@ -485,14 +485,14 @@ const GridExample = () => {
                 })).reduce((acc, curr) => ({...acc,...curr }), {})
             },
             {
-                "AM": "",
-                "": "061990",
-                "": "032990",
-                "系統": "06",
-                "線便名": "羽田CG交裏",
-                "入庫場所": "西大阪B",
-                "入庫時間": "19:00",
-                "使用車両(トン)": "10",
+                "amFlag": "",
+                "departureCode": "061990",
+                "arrivalCode": "032990",
+                "systemCode": "06",
+                "lineName": "羽田CG交裏",
+                "wareHouseLocation": "西大阪B",
+                "wareHouseTime": "19:00",
+                "vehicleTon": "10",
                 "checkboxCol": "",
                 "tokyoBranchCol": "福岡支店",
                 "approveStatus": "approved",
@@ -580,8 +580,9 @@ const GridExample = () => {
             headerClass: "header-center"
         },
         {
-            field: "AM",
+            field: "amFlag",
             headerClass: "header-center",
+            headerName: "AM",
             width: 60,
         },
         {
@@ -589,32 +590,37 @@ const GridExample = () => {
             headerClass: "header-center line-group-header",
             children: [
                 {
-                    field: "",
+                    field: "departureCode",
                     headerClass: "header-center",
+                    headerName: "発",
                     width: 85,
                 },
                 {
-                    field: "",
+                    field: "arrivalCode",
                     headerClass: "header-center",
+                    headerName: "着",
                     width: 85,
                 },
                 {
-                    field: "系統",
+                    field: "systemCode",
                     headerClass: "header-center",
+                    headerName: "系統",
                     width: 65,
                 },
                 {
-                    field: "線便名",
+                    field: "lineName",
                     headerClass: "header-center",
+                    headerName: "線便名",
                     width: 120,
                 },
             ],
         },
-        { field: "入庫場所", headerClass: "header-center", width: 110 },
-        { field: "入庫時間", headerClass: "header-center", width: 90 },
+        { field: "wareHouseLocation", headerClass: "header-center",headerName: "入庫場所", width: 110 },
+        { field: "wareHouseTime", headerClass: "header-center",headerName: "入庫時間", width: 90 },
         {
-            field: "使用車両(トン)",
+            field: "vehicleTon",
             headerClass: "header-center",
+            headerName: "使用車両(トン)",
             width: 125,
             cellRenderer: (params: ICellRendererParams) => {
                 return (
@@ -676,14 +682,14 @@ const GridExample = () => {
 
     const handleAddRow = () => {
         const newRow: any = {
-            "AM": "",
-            "": "",
-            "": "",
-            "系統": "",
-            "線便名": "",
-            "入庫場所": "",
-            "入庫時間": "",
-            "使用車両(トン)": "",
+            "amFlag": "",
+            "departureCode": "",
+            "arrivalCode": "",
+            "systemCode": "",
+            "lineName": "",
+            "wareHouseLocation": "",
+            "wareHouseTime": "",
+            "vehicleTon": "",
             "checkboxCol": "",
             "tokyoBranchCol": "",
             "approveStatus": ""
@@ -716,7 +722,7 @@ const GridExample = () => {
                         輸送パートナーID:{orderInfo.deliveryPartner.id}
                     </div>
                     <div className="order-info-row">
-                        輸送パートナー名:{orderInfo.deliveryPartner.name}
+                        輸送パートナー名:{orderInfo.deliveryPartner.corpName}
                     </div>
                 </div>
 
@@ -734,11 +740,11 @@ const GridExample = () => {
                         </thead>
                         <tbody>
                         <tr>
-                            <td>{orderInfo.status.companyCode}</td>
-                            <td>{orderInfo.status.status}</td>
+                            <td>{orderInfo.status.corpCode}</td>
+                            <td>{orderInfo.status.orderStatus}</td>
                             <td>{orderInfo.status.version}</td>
-                            <td>{orderInfo.status.instructionDate}</td>
-                            <td>{orderInfo.status.approvalDate}</td>
+                            <td>{orderInfo.status.instructionDeliveryDate}</td>
+                            <td>{orderInfo.status.commitDate}</td>
                         </tr>
                         </tbody>
                     </table>