-
-
Договор №{number}
-
- {date !== undefined && date !== null && date !== null && (
- <> от {moment(date).format("DD.MM.YYYY")}
- )}
- {car !== undefined && car !== null
- ? ` - ${car.brand.name} ${car.model.name} | ${
- car.reg_number !== null
- ? car.reg_number
- : "без рег. номера"
- } | ${
- car.vin_number !== null
- ? car.vin_number
- : "без VIN номера"
- }`
- : ""}
-
+
-
-
-
-
-
- {loading ? (
-
-
-
- ) : (
-
-
-
-
-
Штрафы ГИБДД
-
- -
- Номер постановления: 3432434242334
-
- -
- Страховая: 3 400 000,00 ₽
-
- -
- Статус: Оплачен
-
- -
- Дата: 01/01/2020
-
- -
- Штраф:{" "}
- п. 1.15 - Несоблюдение правил парковки
-
- -
-
-
-
- № 01/20/2020 (.PDF)
-
- Постановление
-
-
+
+
+
+ { loading ? (
+
+
+
+ ) : (
+
+
+
+
+
Штрафы ГИБДД
+
+ - Номер постановления: 3432434242334
+ - Страховая: 3 400 000,00 ₽
+ - Статус: Оплачен
+ - Дата: 01/01/2020
+ - Штраф:{" "}п. 1.15 - Несоблюдение правил парковки
+ -
+
+
+
+ № 01/20/2020 (.PDF)
+ Постановление
+
+
+
+
+ Договор
+ 2021_3866 от 25.06.2021
+
+
+
+
+
+
-
-
- Договор
-
- 2021_3866 от 25.06.2021
-
-
-
-
-
-
- )}
-
-
+
+ ) }
+
+
diff --git a/pages/contract/index.js b/pages/contract/index.js
index e76da45..8bfd222 100644
--- a/pages/contract/index.js
+++ b/pages/contract/index.js
@@ -16,6 +16,7 @@ import InnerMenu from "./components/InnerMenu";
import { getContract, getContractDebtInvoiceFile, getContractInfo, getContractPenaltyInvoiceFile } from './../../actions';
import AccountLayout from "../components/Layout/Account";
+import ContractHeader from "./components/ContractHeader";
class ContractSchedulePage extends React.Component
{
@@ -24,6 +25,7 @@ class ContractSchedulePage extends React.Component
super(props);
this.state = {
loading: false,
+ contracts_info: {},
payments: null,
avans: null,
debt: null,
@@ -40,6 +42,7 @@ class ContractSchedulePage extends React.Component
static getDerivedStateFromProps(nextProps, prevState)
{
return {
+ contracts_info: nextProps.contracts_info,
date: nextProps.date,
car: nextProps.car,
payments: nextProps.payments,
@@ -51,13 +54,19 @@ class ContractSchedulePage extends React.Component
componentDidMount()
{
- if(!this.state.loading && this.props.number !== undefined)
+ console.log("ContractSchedulePage", "this.state", this.state);
+ const { number } = this.props;
+
+ if(!this.state.loading && number !== undefined)
{
this.setState({ loading: true }, () =>
{
- getContractInfo({ dispatch: this.props.dispatch, number: this.props.number });
+ if(this.state.contracts_info[ number ] === undefined)
+ {
+ getContractInfo({ dispatch: this.props.dispatch, number: number });
+ }
- getContract({ dispatch: this.props.dispatch, number: this.props.number }).then(() => {
+ getContract({ dispatch: this.props.dispatch, number: number }).then(() => {
this.setState({ loading: false });
}).catch(() => {});
});
@@ -147,8 +156,10 @@ class ContractSchedulePage extends React.Component
render()
{
- const { payments, avans, debt, penalty, date, car, full, opened, loading, debt_invoice_file_loading, penalty_invoice_file_loading } = this.state;
const { number } = this.props;
+ const { loading, contracts_info, payments, avans, debt, penalty, full, opened, debt_invoice_file_loading, penalty_invoice_file_loading } = this.state;
+
+ let { date, car } = contracts_info[ number ] !== undefined ? contracts_info[ number ] : {};
console.log(".".repeat(50));
console.log("this.state", this.state);
@@ -182,8 +193,7 @@ class ContractSchedulePage extends React.Component
-
Договор №{ number }
-
{ date !== undefined && date !== null && date !== null && (<> от { moment(date).format("DD.MM.YYYY") })}{ car !== undefined && car !== null ? ` - ${ car.brand.name } ${ car.model.name } | ${ car.reg_number !== null ? car.reg_number : 'без рег. номера' } | ${ car.vin_number !== null ? car.vin_number : 'без VIN номера' }` : '' }
+
@@ -335,6 +345,7 @@ function mapStateToProps(state, ownProps)
{
return {
company: state.company,
+ contracts_info: state.contracts_info,
payments: state.contract.payments,
avans: state.contract.avans,
debt: state.contract.debt,
diff --git a/pages/contract/materials.js b/pages/contract/materials.js
index 8146c27..bb6422e 100644
--- a/pages/contract/materials.js
+++ b/pages/contract/materials.js
@@ -16,6 +16,7 @@ import DownloadPdfButton from "../components/DownloadPdfButton";
import { getContractInfo, getContractMaterials } from "../../actions";
import AccountLayout from "../components/Layout/Account";
+import ContractHeader from "./components/ContractHeader";
class ContractPage extends React.Component
{
@@ -85,8 +86,7 @@ class ContractPage extends React.Component
-
Договор №{ number }
- { date !== undefined && date !== null && date !== null && (<> от { moment(date).format("DD.MM.YYYY") })}{ car !== undefined && car !== null ? ` - ${ car.brand.name } ${ car.model.name } | ${ car.reg_number !== null ? car.reg_number : 'без рег. номера' } | ${ car.vin_number !== null ? car.vin_number : 'без VIN номера' }` : '' }
+
diff --git a/pages/contract/penalties.js b/pages/contract/penalties.js
index 06a51b1..f67d9bc 100644
--- a/pages/contract/penalties.js
+++ b/pages/contract/penalties.js
@@ -134,20 +134,8 @@ class ContractPage extends React.Component
Расчет планируемых пени
Договор №{ number }
- { date !== undefined && date !== null && date !== null && (
- <> от {moment(date).format("DD.MM.YYYY")}
- ) }
- { car !== undefined && car !== null
- ? ` - ${car.brand.name} ${car.model.name} | ${
- car.reg_number !== null
- ? car.reg_number
- : "без рег. номера"
- } | ${
- car.vin_number !== null
- ? car.vin_number
- : "без VIN номера"
- }`
- : "" }
+ { date !== undefined && date !== null && date !== null && ( <> от {moment(date).format("DD.MM.YYYY")} ) }
+ { car !== undefined && car !== null ? ` - ${car.brand.name} ${car.model.name} | ${ car.reg_number !== null ? car.reg_number : "без рег. номера" } | ${ car.vin_number !== null ? car.vin_number : "без VIN номера" }` : "" }