-
-
Процедура
-
+ {/* Результат поиска */}
+ { searched && filtered !== undefined && filtered !== null ? (
+ <>
+ { filtered_count > 0 ? (
+ <>
+ { filtered.map((theme, theme_index) => (
+
+ { theme.questions.map((question, index) =>
+ (
+
+
+
+
+ {/*}
+
К каждой теме свободное html поле для миниинструкции (со ссылками на формы документов и документы). Привязка к теме обращения в CRM
+ {*/}
+
- { question.documents !== null && (
+
+ )) }
+
+ ) : (
+
К сожалению по Вашему запросу нет результатов.
+ ) }
+
+ ) : (
+
+ { themes !== undefined && themes !== null && themes.map((theme) =>
+ (
+
+
{ theme.name }
+
+ { theme.questions.map((question) =>
+ (
+
+
this._handle_onQuestion(question.id) }>
+
{ question.title }
+
+
+
+
-
Документы
-
+
Процедура
+
- ) }
- { question.templates !== null && (
-
-
Шаблоны документов
-
- { question.templates.map((template, index) => (
)) }
+ { question.documents !== null && (
+
-
- ) }
- { question.request && (
-
- ) }
+ ) }
+ { question.templates !== null && (
+
+
Шаблоны документов
+
+ { question.templates.map((template, index) => ()) }
+
+
+ ) }
+ { question.request && (
+
+ ) }
+
-
- )) }
+ )) }
+
-
- )) }
-
- {/* Результат поиска */}
- { searched !== undefined && searched !== null && searched.map((question) => (
-
-
-
{ question.theme } / { question.name }
-
К каждой теме свободное html поле для миниинструкции (со ссылками на формы документов и документы). Привязка к теме обращения в CRM
-
+ )) }
- )) }
+ ) }
) }
@@ -222,7 +327,7 @@ function mapStateToProps(state, ownProps)
{
return {
themes: state.support.themes,
- searched: state.support.searched,
+ filtered: state.support.filtered,
appeals: state.support.appeals,
appeal: state.support.appeal,
};
diff --git a/pages/support/request.js b/pages/support/request.js
index 74ec3d5..ffcd883 100644
--- a/pages/support/request.js
+++ b/pages/support/request.js
@@ -81,6 +81,7 @@ class SupportRequestPage extends React.Component
phone: "",
email: "",
question: "",
+ all_contracts: false,
selected_contracts: [],
file: null,
files: [],
@@ -200,11 +201,17 @@ class SupportRequestPage extends React.Component
this.setState({ loading: true }, () =>
{
+ const contract_numbers = [];
+ for(let i in selected_contracts)
+ {
+ contract_numbers.push(selected_contracts.value);
+ }
+
sendNewAppeal({
phone: phone,
email: email,
description: question,
- contract_numbers: selected_contracts
+ contract_numbers: contract_numbers
})
.then((result) =>
{
@@ -245,11 +252,61 @@ class SupportRequestPage extends React.Component
_handle_onContract = (options) =>
{
+ const { contracts, all_contracts } = this.state;
const selected_contracts = [];
- for(let i in options)
+ console.log("options", options);
+
+ if(all_contracts === true)
{
- selected_contracts.push(options[i].value);
- this.setState({ selected_contracts });
+ this.setState({ all_contracts: false, selected_contracts: [] });
+ }
+ else
+ {
+ let all = false;
+ for(let i in options)
+ {
+ if(options[i].value === null)
+ {
+ all = true;
+ break;
+ }
+ }
+
+ if(all)
+ {
+ const contracts_list = [];
+ for(let i in contracts)
+ {
+ contracts_list.push({ value: contracts[i].number, label: contracts[i].number });
+ }
+
+ this.setState({ all_contracts: true, selected_contracts: contracts_list });
+ }
+ else
+ {
+ if(options.length === contracts.length)
+ {
+ const contracts_list = [];
+ for(let i in contracts)
+ {
+ contracts_list.push({ value: contracts[i].number, label: contracts[i].number });
+ }
+
+ this.setState({ all_contracts: true, selected_contracts: contracts_list });
+ }
+ else
+ {
+ this.setState({ selected_contracts: options });
+ }
+
+ /*
+ for(let i in options)
+ {
+ selected_contracts.push(options[i].value);
+ this.setState({ selected_contracts });
+ }
+ */
+ }
}
}
@@ -302,14 +359,23 @@ class SupportRequestPage extends React.Component
_renderForm = () =>
{
- const { loading, contracts, themes, themes_filtered, name, phone, email, question, file, files, opened_theme, opened_question } = this.state;
+ const { loading, contracts, selected_contracts, all_contracts, themes, themes_filtered, name, phone, email, question, file, files, opened_theme, opened_question } = this.state;
const contracts_list = [];
- for(let i in contracts)
+ if(!all_contracts)
{
- contracts_list.push({
- value: contracts[i].number, label: contracts[i].number
- });
+ for(let i in contracts)
+ {
+ contracts_list.push({
+ value: contracts[i].number, label: contracts[i].number
+ });
+ }
+
+ contracts_list.unshift({ value: null, label: "Все договоры" });
+ }
+ else
+ {
+ contracts_list.unshift({ value: null, label: "Все договоры" });
}
return (
@@ -322,6 +388,7 @@ class SupportRequestPage extends React.Component
classNamePrefix="custom-select"
placeholder="Выберите договоры"
onChange={ this._handle_onContract }
+ value={ all_contracts ? contracts_list : selected_contracts }
/>
diff --git a/reducers/initialState.js b/reducers/initialState.js
index 6d5b38e..fd16fbd 100644
--- a/reducers/initialState.js
+++ b/reducers/initialState.js
@@ -94,7 +94,7 @@ export const defaultState = {
support:
{
themes: null,
- searched: null,
+ filtered: null,
appeals: { list: null, new: 0 },
appeal: null,
request: null,
diff --git a/reducers/supportReducer.js b/reducers/supportReducer.js
index 0018c4a..73b3681 100644
--- a/reducers/supportReducer.js
+++ b/reducers/supportReducer.js
@@ -23,11 +23,11 @@ const supportReducer = (state = initialState.support, action) =>
};
}
- case actionTypes.SUPPORT_THEMES_SEARCHED:
+ case actionTypes.SUPPORT_THEMES_FILTERED:
{
return {
...state,
- searched: action.data.searched,
+ filtered: action.data.filtered,
};
}