From 03854fe8595d7dcc31326fa851303d1c5ec714db Mon Sep 17 00:00:00 2001 From: chenqiang Date: Wed, 13 Dec 2023 15:58:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix():=20=E8=A7=A3=E5=86=B3=E5=BC=80?= =?UTF-8?q?=E7=A5=A8=E8=AE=B0=E5=BD=95=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx b/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx index a93608e..9f2a201 100644 --- a/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx +++ b/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx @@ -167,7 +167,7 @@ function CreateInvoiceRecord() { render: (_, record) => { var head = ""; if (_) { - head = Headtype.filter((ele) => ele.value == _)[0]?.label; + head = Headtype.filter((ele) => ele.value == _)[0]?.label || ""; } return head; }, @@ -229,7 +229,8 @@ function CreateInvoiceRecord() { render: (_, record) => { var ordertype = ""; if (_) { - ordertype = orderType.filter((ele) => ele.value == _)[0].label; + ordertype = + orderType.filter((ele) => ele.value == _)[0].label || ""; } return ordertype; }, @@ -243,7 +244,7 @@ function CreateInvoiceRecord() { render: (_, record) => { var buss = ""; if (_) { - buss = Bussinss.filter((ele) => ele.value == _)[0].label; + buss = Bussinss.filter((ele) => ele.value == _)[0].label || ""; } return buss; }, @@ -257,7 +258,7 @@ function CreateInvoiceRecord() { render: (_, record) => { var ztas = ""; if (_) { - ztas = Zta.filter((ele) => ele.value == _)[0].label; + ztas = Zta.filter((ele) => ele.value == _)[0].label || ""; } return ztas; }, From f4d830a10789f62e7eafc8cc06b3db10679a71db Mon Sep 17 00:00:00 2001 From: guoxin Date: Wed, 13 Dec 2023 16:07:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E8=B7=AF=E5=86=85b?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/TableModule/index.jsx | 15 +++++---------- .../InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx index ca4c8d0..d985ce3 100644 --- a/src/components/TableModule/index.jsx +++ b/src/components/TableModule/index.jsx @@ -211,21 +211,16 @@ const TableModule = forwardRef((props, ref) => { } if (limitCon && limitCon(form)) return //setLoading(true); - setGetForm(form); + console.log(form); search(form); } //重置 function reset() { + setAreaSelectedList([]) searchForm.resetFields(); - setFormData({ ...searchForm.getFieldsValue() }) - // search(getForm) - // fetch() - // setTimeout(()=>{ - // // setAreaSelectedList([]) - // console.log(getForm); - - // },800) - console.log(getForm); + setFormData({ ...searchForm.getFieldsValue() }) + search({ ...searchForm.getFieldsValue() }) + } function cascaderChange(value, options) { let res = []; diff --git a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx index e2e66d3..a44019d 100644 --- a/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx +++ b/src/pages/InRoadMgm/RecordInquiry/ParkRecordTotal/loadable.jsx @@ -378,7 +378,7 @@ function ParkRecordTotal() { }, ]; const initFormData = { - region: null, + region: [], operator: null, road: "", road_type: 0,