diff --git a/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx index 3fa1f63..589323d 100644 --- a/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx @@ -42,7 +42,7 @@ function OperationReport() { operator_id: "0", //商户 name: "", //停车场名称 park_type: "", //车场类型 1=路内 2=路外 - operator_status: "", //商用状态(1为待上线,2为商用,3为试运营,4为下线) + operator_status: [0], //商用状态(1为待上线,2为商用,3为试运营,4为下线) area: [5910983100858368], date_type: "1", is_excel: 0, @@ -531,7 +531,10 @@ function OperationReport() { //获取页面显示数据 const getData = (data) => { setLoading(false); - ajax.ElectInvoice.getOperationReport({ ...data }).then( + ajax.ElectInvoice.getOperationReport({ + ...data, + area: data?.area?.length ? data?.area[data.area.length - 1] : "", + }).then( (res) => { if (parseInt(res?.status) === 20000) { setRoadata(res?.data?.total); @@ -774,6 +777,8 @@ function OperationReport() { style={{ width: "100%", }} + mode="multiple" + maxTagCount={2} placeholder="请选择" options={sysConfig.operatorStatus} onChange={(e) => @@ -823,7 +828,7 @@ function OperationReport() {
- {Roadata[ele.value]} + {Roadata[ele.value] || 0} 元
@@ -866,7 +871,7 @@ function OperationReport() { )}- {Roadata[ele.value]} + {Roadata[ele.value] || 0} 元
@@ -897,7 +902,7 @@ function OperationReport() { )}- {Roadata[ele.value]} + {Roadata[ele.valuet] || 0} 元
diff --git a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx index 514794e..573c28b 100644 --- a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx +++ b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx @@ -39,7 +39,7 @@ function ParkingIncomeReport() { const formdata = { operator_id: "0", //商户 park_type: "", //车场类型 - operator_status: 0, //状态 + operator_status: [0], //状态 name: "", //停车场名称 area: [5910983100858368], date_type: "1", @@ -458,7 +458,7 @@ function ParkingIncomeReport() { setLoading(false); ajax.ElectInvoice.getParkingIncomeReport({ ...data, - area: data.area.length ? data.area[data.area.length - 1] : 0, + area: data?.area?.length ? data?.area[data.area.length - 1] : "", }).then( (res) => { if (parseInt(res?.status) === 20000) { @@ -635,7 +635,7 @@ function ParkingIncomeReport() { style={{ width: "100%", }} - displayRender={(labels) => labels[labels.length - 1]} + // displayRender={(labels) => labels[labels.length - 1]} changeOnSelect fieldNames={{ label: "name", @@ -731,6 +731,8 @@ function ParkingIncomeReport() { style={{ width: "100%", }} + mode="multiple" + maxTagCount={2} placeholder="请选择" options={sysConfig.operatorStatus} onChange={(e) => @@ -780,7 +782,7 @@ function ParkingIncomeReport() {- {Roadata[ele.value]} + {Roadata[ele.value] || 0} 元
@@ -823,7 +825,7 @@ function ParkingIncomeReport() { )}- {Roadata[ele.value]} + {Roadata[ele.value] || 0} 元
@@ -854,7 +856,7 @@ function ParkingIncomeReport() { )}- {Roadata[ele.value]} + {Roadata[ele.valuet] || 0} 元