hl-core 0.0.10-beta.5 → 0.0.10-beta.51

package/components/Pages/Anketa.vue

@@ -1,181 +1,209 @@
 <template>
-  <base-fade-transition>
-    <section v-if="firstQuestionList && firstQuestionList.length && (isFirstPanelOnRight ? true : !firstPanel) && !secondPanel" class="flex flex-col shrink grow max-h-[90vh]">
-      <base-form-section v-if="$dataStore.isUnderwriter()" class="mx-[10px]">
-        <base-rounded-select v-model="filterType" class="w-[200px]" :items="filterItems" :label="$dataStore.t('labels.filter')" hide-details />
-      </base-form-section>
-      <section :class="[$styles.blueBgLight, $styles.rounded]" class="mx-[10px] my-[14px] p-4 flex flex-col gap-4">
-        <base-form-toggle
-          v-model="answerToAll"
-          :title="$dataStore.t('questionnaireType.answerAllNo')"
-          :disabled="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
-          :has-border="false"
-          @clicked="handleToggler"
+  <section v-if="firstQuestionList && firstQuestionList.length && (isFirstPanelOnRight ? true : !firstPanel) && !secondPanel" class="flex flex-col shrink grow max-h-[85svh]">
+    <base-form-section v-if="$dataStore.isUnderwriter()" class="mx-[10px]">
+      <base-rounded-select v-model="filterType" class="w-[200px]" :items="filterItems" :label="$dataStore.t('labels.filter')" hide-details />
+    </base-form-section>
+    <section :class="[$styles.blueBgLight, $styles.rounded]" class="mx-[10px] my-[14px] p-4 flex flex-col gap-4">
+      <base-form-toggle
+        v-model="answerToAll"
+        :title="$dataStore.t('questionnaireType.answerAllNo')"
+        :disabled="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+        :has-border="false"
+        @clicked="handleToggler"
+      />
+    </section>
+    <v-form ref="vForm" class="grow shrink overflow-y-scroll" @submit="submitForm">
+      <section
+        v-if="firstQuestionList.filter(i => i.first.definedAnswers === 'N').length"
+        :class="[$styles.blueBgLight, $styles.rounded]"
+        class="mx-[10px] p-4 flex flex-col gap-4"
+      >
+        <base-form-input
+          v-for="(question, index) in firstQuestionList.filter(i => i.first.definedAnswers === 'N')"
+          :key="index"
+          v-model="question.first.answerText"
+          :label="question.first.name"
+          :maska="$maska.threeDigit"
+          :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+          :rules="$rules.required"
         />
       </section>
-      <v-form ref="vForm" class="grow shrink overflow-y-scroll" @submit="submitForm">
-        <section
-          v-if="firstQuestionList.filter(i => i.first.definedAnswers === 'N').length"
-          :class="[$styles.blueBgLight, $styles.rounded]"
-          class="mx-[10px] p-4 flex flex-col gap-4"
-        >
-          <base-form-input
-            v-for="(question, index) in firstQuestionList.filter(i => i.first.definedAnswers === 'N')"
-            :key="index"
-            v-model="question.first.answerText"
-            :label="question.first.name"
-            :maska="$maska.threeDigit"
-            :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
-            :rules="$rules.required"
-          />
-        </section>
-        <section
-          v-if="firstQuestions.filter(i => i.first.definedAnswers === 'Y').length"
-          :class="[$styles.blueBgLight, $styles.rounded]"
-          class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4"
+      <section
+        v-if="surveyType === 'critical' && ($dataStore.isBaiterek || $dataStore.isBolashak || $dataStore.isLiferenta)"
+        :class="[$styles.blueBgLight, $styles.rounded]"
+        class="mx-[10px] p-4 flex flex-col gap-4"
+      >
+        <base-form-text-section>
+          <span :class="[$styles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between">
+            1. Келесі аурулармен бұрын ауырдыңыз ба немесе қазіргі кезде ауырып жүрсіз бе?/Болели ли Вы когда-нибудь или болеете в настоящий момент следующими заболеваниями?
+          </span>
+        </base-form-text-section>
+      </section>
+      <section
+        v-if="firstQuestions.filter(i => i.first.definedAnswers === 'Y').length"
+        :class="[$styles.blueBgLight, $styles.rounded]"
+        class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4"
+      >
+        <base-form-text-section
+          v-for="(question, index) in firstQuestions.filter(i => i.first.definedAnswers === 'Y')"
+          :key="index"
+          :class="[currentQuestion?.first.id === question.first.id && $dataStore.rightPanel.open ? $styles.greenBorder : '']"
         >
-          <base-form-text-section
-            v-for="(question, index) in firstQuestions.filter(i => i.first.definedAnswers === 'Y')"
-            :key="index"
-            :class="[currentQuestion?.first.id === question.first.id && $dataStore.rightPanel.open ? $styles.greenBorder : '']"
-          >
+          <base-animation>
+            <div
+              v-if="question.first.answerName?.includes('Да') && question.second"
+              :class="[$styles.greenBg, $styles.whiteText, $styles.textSimple]"
+              class="rounded-t-lg pl-6 py-1 cursor-pointer"
+              @click="openFirstPanel(question)"
+            >
+              {{ $dataStore.t('questionnaireType.pleaseAnswer', { text: question.second.length }) }}
+            </div>
+          </base-animation>
+          <span :class="[$styles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between">
+            {{ question.first.name }}
             <base-animation>
-              <div
-                v-if="question.first.answerName === 'Да' && question.second"
-                :class="[$styles.greenBg, $styles.whiteText, $styles.textSimple]"
-                class="rounded-t-lg pl-6 py-1 cursor-pointer"
+              <i
+                v-if="question.first.answerName?.includes('Да') && question.second && question.second.length"
+                class="mdi mdi-chevron-right text-2xl cursor-pointer"
                 @click="openFirstPanel(question)"
-              >
-                {{ $dataStore.t('questionnaireType.pleaseAnswer', { text: question.second.length }) }}
-              </div>
+              ></i>
             </base-animation>
-            <span :class="[$styles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between">
-              {{ question.first.name }}
-              <base-animation>
-                <i
-                  v-if="question.first.answerName === 'Да' && question.second && question.second.length"
-                  class="mdi mdi-chevron-right text-2xl cursor-pointer"
-                  @click="openFirstPanel(question)"
-                ></i>
-              </base-animation>
-            </span>
-            <div class="flex items-center justify-start gap-5 px-4 pt-4" :class="[$styles.textSimple]">
-              <v-radio-group
-                v-model="question.first.answerName"
-                class="anketa-radio"
-                :true-icon="`mdi-radiobox-marked ${$styles.greenText}`"
-                false-icon="mdi-radiobox-blank text-[#636363]"
-                :rules="$rules.required"
-                :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
-                inline
-              >
-                <v-radio label="Да" value="Да" />
-                <v-radio label="Нет" value="Нет" />
-              </v-radio-group>
-            </div>
-          </base-form-text-section>
-        </section>
-        <section
-          v-if="firstQuestions.filter(i => i.first.definedAnswers === 'D').length"
-          :class="[$styles.blueBgLight, $styles.rounded]"
-          class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4"
+          </span>
+          <div class="flex items-center justify-start gap-5 px-4 pt-4" :class="[$styles.textSimple]">
+            <v-radio-group
+              v-model="question.first.answerName"
+              class="anketa-radio"
+              :true-icon="`mdi-radiobox-marked ${$styles.greenText}`"
+              false-icon="mdi-radiobox-blank text-[#636363]"
+              :rules="$rules.required"
+              :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+              inline
+            >
+              <v-radio label="Иә/Да" value="Иә/Да" :value-comparator="(a: any, b: any) => String(a).includes('Да')" />
+              <v-radio label="Жоқ/Нет" value="Жоқ/Нет" :value-comparator="(a: any, b: any) => String(a).includes('Нет')" />
+            </v-radio-group>
+          </div>
+        </base-form-text-section>
+      </section>
+      <section
+        v-if="firstQuestions.filter(i => i.first.definedAnswers === 'D').length"
+        :class="[$styles.blueBgLight, $styles.rounded]"
+        class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4"
+      >
+        <base-form-text-section
+          v-for="(question, index) in firstQuestions.filter(i => i.first.definedAnswers === 'D')"
+          :key="index"
+          :class="[currentQuestion?.first.id === question.first.id && $dataStore.rightPanel.open ? $styles.greenBorder : '']"
         >
-          <base-form-text-section
-            v-for="(question, index) in firstQuestions.filter(i => i.first.definedAnswers === 'D')"
-            :key="index"
-            :class="[currentQuestion?.first.id === question.first.id && $dataStore.rightPanel.open ? $styles.greenBorder : '']"
-          >
-            <span :class="[$styles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between"> {{ question.first.name }} </span>
-            <div class="flex items-center justify-start gap-5 px-4 pt-4" :class="[$styles.textSimple]">
-              <v-radio-group
-                v-model="question.first.answerName"
-                class="anketa-radio"
-                :true-icon="`mdi-radiobox-marked ${$styles.greenText}`"
-                false-icon="mdi-radiobox-blank text-[#636363]"
-                :rules="$rules.required"
-                :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
-                inline
-              >
-                <v-radio label="Да" value="Да" />
-                <v-radio label="Нет" value="Нет" />
-              </v-radio-group>
+          <base-animation>
+            <div
+              v-if="question.first.answerName?.includes('Да') && question.second"
+              :class="[$styles.greenBg, $styles.whiteText, $styles.textSimple]"
+              class="rounded-t-lg pl-6 py-1 cursor-pointer"
+              @click="openFirstPanel(question)"
+            >
+              {{ $dataStore.t('questionnaireType.pleaseAnswer', { text: question.second.length }) }}
             </div>
+          </base-animation>
+          <span :class="[$styles.textTitle]" class="border-b-[1px] border-b-[#F3F6FC] p-6 flex items-center justify-between">
+            {{ question.first.name }}
             <base-animation>
-              <div v-if="question.first.answerName === 'Да'" :class="[$styles.whiteText, $styles.textSimple]">
-                <base-form-input
-                  v-model="question.first.answerText"
-                  :label="$dataStore.t('labels.inDetails')"
-                  :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
-                  :rules="$rules.required"
-                />
-              </div>
+              <i
+                v-if="question.first.answerName?.includes('Да') && question.second && question.second.length"
+                class="mdi mdi-chevron-right text-2xl cursor-pointer"
+                @click="openFirstPanel(question)"
+              ></i>
             </base-animation>
-          </base-form-text-section>
-        </section>
-      </v-form>
-      <div class="px-[14px]">
-        <base-btn
-          class="my-[14px] self-center"
-          :loading="isButtonLoading"
-          :disabled="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
-          @click="submitForm"
-          :text="$dataStore.t('buttons.save')"
-        />
-      </div>
-    </section>
-    <base-btn
-      v-if="currentQuestion && currentQuestion.second && currentQuestion.second.length && isFirstPanelOnRight ? false : firstPanel"
-      class="!absolute z-10 self-center w-[96%] bottom-0"
-      :text="$dataStore.t('buttons.save')"
-      @click="submitSecondaryForm"
-    />
-    <section
-      ref="firstPanelSection"
-      v-if="currentQuestion && currentQuestion.second && isFirstPanelOnRight ? false : firstPanel"
-      class="flex flex-col px-[10px] pb-[14px]"
-      :class="[$styles.scrollPage]"
-    >
-      <v-form
-        v-if="currentQuestion"
-        :class="[$styles.blueBgLight, $styles.rounded]"
-        class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4"
-        ref="vSecondaryForm"
-        @submit="submitSecondaryForm"
-      >
-        <base-form-text-section v-for="question in currentQuestion.second" :title="question.name" :key="question.name">
-          <div v-if="question.definedAnswers === 'N'">
-            <base-form-input
-              v-if="question.answerType === 'T' || question.answerType === 'N'"
-              v-model="question.answerText"
-              class="border-t-[1px] border-t-[#F3F6FC]"
-              :placeholder="$dataStore.t('labels.inputText')"
+          </span>
+          <div class="flex items-center justify-start gap-5 px-4 pt-4" :class="[$styles.textSimple]">
+            <v-radio-group
+              v-model="question.first.answerName"
+              class="anketa-radio"
+              :true-icon="`mdi-radiobox-marked ${$styles.greenText}`"
+              false-icon="mdi-radiobox-blank text-[#636363]"
+              :rules="$rules.required"
               :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
-              :rules="isSecondRequired ? $rules.required : []"
-            />
-            <base-form-input
-              v-if="question.answerType === 'D'"
-              v-model="question.answerText"
-              class="border-t-[1px] border-t-[#F3F6FC]"
-              :placeholder="$dataStore.t('form.date')"
-              :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
-              :rules="isSecondRequired ? $rules.date : []"
-              :maska="$maska.date"
-              append-inner-icon="mdi mdi-calendar-blank-outline"
-            />
+              inline
+            >
+              <v-radio label="Иә/Да" value="Иә/Да" :value-comparator="(a: any, b: any) => String(a).includes('Да')" />
+              <v-radio label="Жоқ/Нет" value="Жоқ/Нет" :value-comparator="(a: any, b: any) => String(a).includes('Нет')" />
+            </v-radio-group>
           </div>
-          <base-panel-input
-            v-else
-            :class="[$styles.textTitle, $styles.greenText]"
-            :value="question.answerName ? question.answerName : 'Выбрать вариант ответа'"
-            :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
-            :clearable="false"
-            :error-messages="isSecondRequired ? (question.answerName ? [] : ['Выбрать вариант ответа']) : []"
-            @click="openSecondPanel(question)"
-          ></base-panel-input>
+          <base-animation>
+            <div v-if="question.first.answerName?.includes('Да')" :class="[$styles.whiteText, $styles.textSimple]">
+              <base-form-input
+                v-model="question.first.answerText"
+                :label="$dataStore.t('labels.inDetails')"
+                :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+                :rules="$rules.required"
+              />
+            </div>
+          </base-animation>
         </base-form-text-section>
-      </v-form>
-    </section>
-  </base-fade-transition>
+      </section>
+    </v-form>
+    <div class="px-[14px]">
+      <base-btn
+        class="my-[14px] self-center"
+        :loading="isButtonLoading"
+        :disabled="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+        @click="submitForm"
+        :text="$dataStore.t('buttons.save')"
+      />
+    </div>
+  </section>
+  <base-btn
+    v-if="currentQuestion && currentQuestion.second && currentQuestion.second.length && isFirstPanelOnRight ? false : firstPanel"
+    class="!absolute z-10 self-center w-[96%] bottom-0"
+    :text="$dataStore.t('buttons.save')"
+    @click="submitSecondaryForm"
+  />
+  <section
+    ref="firstPanelSection"
+    v-if="currentQuestion && currentQuestion.second && isFirstPanelOnRight ? false : firstPanel"
+    class="flex flex-col px-[10px] pb-[14px]"
+    :class="[$styles.scrollPage]"
+  >
+    <v-form
+      v-if="currentQuestion"
+      :class="[$styles.blueBgLight, $styles.rounded]"
+      class="mx-[10px] mt-[14px] p-4 flex flex-col gap-4"
+      ref="vSecondaryForm"
+      @submit="submitSecondaryForm"
+    >
+      <base-form-text-section v-for="question in currentQuestion.second" :title="question.name" :key="question.name">
+        <div v-if="question.definedAnswers === 'N'">
+          <base-form-input
+            v-if="question.answerType === 'T' || question.answerType === 'N'"
+            v-model="question.answerText"
+            class="border-t-[1px] border-t-[#F3F6FC]"
+            :placeholder="$dataStore.t('labels.inputText')"
+            :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+            :rules="isSecondRequired ? $rules.required : []"
+          />
+          <base-form-input
+            v-if="question.answerType === 'D'"
+            v-model="question.answerText"
+            class="border-t-[1px] border-t-[#F3F6FC]"
+            :placeholder="$dataStore.t('form.date')"
+            :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+            :rules="isSecondRequired ? $rules.date : []"
+            :maska="$maska.date"
+            append-inner-icon="mdi mdi-calendar-blank-outline"
+          />
+        </div>
+        <base-panel-input
+          v-else
+          :class="[$styles.textTitle, $styles.greenText]"
+          :value="question.answerName ? question.answerName : 'Выбрать вариант ответа'"
+          :readonly="formStore.isDisabled[whichSurvey] || !$dataStore.isTask()"
+          :clearable="false"
+          :error-messages="isSecondRequired ? (question.answerName ? [] : ['Выбрать вариант ответа']) : []"
+          @click="openSecondPanel(question)"
+        ></base-panel-input>
+      </base-form-text-section>
+    </v-form>
+  </section>
   <Teleport v-if="secondPanel" to="#right-panel-actions">
     <div :class="[$styles.scrollPage]" class="flex flex-col items-center">
       <base-rounded-input v-model="searchQuery" :label="$dataStore.t('labels.search')" class="w-full p-2" :hide-details="true" />
@@ -234,7 +262,7 @@
       </v-form>
     </div>
   </Teleport>
-  <base-scroll-buttons v-if="firstQuestionList && firstQuestionList.length" @up="scrollForm('up')" @down="scrollForm('down')" />
+  <base-scroll-buttons v-if="firstQuestionList && firstQuestionList.length" class="bottom-[20%]" @up="scrollForm('up')" @down="scrollForm('down')" />
 </template>
 
 <script lang="ts">
@@ -254,11 +282,11 @@ export default defineComponent({
     const answerToAll = ref<boolean>(false);
     const firstPanel = ref<boolean>(false);
     const secondPanel = ref<boolean>(false);
-    const filterType = ref<'Да' | 'Нет' | null>(null);
+    const filterType = ref<'Иә/Да' | 'Жоқ/Нет' | null>(null);
     const filterItems = [
       { title: 'Все', value: null },
-      { title: 'Только «Да»', value: 'Да' },
-      { title: 'Только «Нет»', value: 'Нет' },
+      { title: 'Только «Да»', value: 'Иә/Да' },
+      { title: 'Только «Нет»', value: 'Жоқ/Нет' },
     ];
     const surveyType = ref<'health' | 'critical'>('tab' in route.query && route.query.tab === 'criticalBase' ? 'critical' : 'health');
     const whichSurvey = computed(() =>
@@ -275,11 +303,13 @@ export default defineComponent({
     const currentSecond = ref<AnketaSecond>();
     const isPanelLoading = ref<boolean>(false);
     const searchQuery = ref<string>('');
-    const isFirstPanelOnRight = dataStore.isUnderwriter() && !useEnv().isProduction;
+    const isFirstPanelOnRight = dataStore.isUnderwriter();
 
     const whichMember = computed(() => ('member' in route.query && !!route.query.member ? (route.query.member as 'insured' | 'policyholder') : 'insured'));
     const isSecondRequired = computed(() => dataStore.controls.isSecondAnketaRequired);
-    const firstQuestions = computed(() => (filterType.value !== null ? firstQuestionList.value.filter(i => i.first.answerName === filterType.value) : firstQuestionList.value));
+    const firstQuestions = computed(() =>
+      filterType.value !== null ? firstQuestionList.value.filter(i => i.first.answerName?.includes(filterType.value === 'Иә/Да' ? 'Да' : 'Нет')) : firstQuestionList.value,
+    );
     const scrollForm = (direction: 'up' | 'down') => {
       const scrollObject = { top: direction === 'up' ? 0 : screen.height * 10, behavior: 'smooth' };
       if (firstPanel.value) {
@@ -424,17 +454,17 @@ export default defineComponent({
       if (firstQuestionList.value) {
         if (answerToAll.value) {
           firstQuestionList.value.forEach((question: AnketaBody, index: number) => {
-            if (question.first.answerType === 'T') {
-              firstQuestionList.value![index].first.answerName = 'Нет' as AnswerName;
+            if (question.first.answerType === 'T' || question.first.answerType === 'D') {
+              firstQuestionList.value![index].first.answerName = 'Жоқ/Нет' as AnswerName;
             }
           });
           for (const question of firstQuestionList.value) {
             const index = firstQuestionList.value.indexOf(question);
-            await getDefinedAnswerId(question.first.id, 'Нет', index);
+            await getDefinedAnswerId(question.first.id, 'Жоқ/Нет', index);
           }
         } else {
           firstQuestionList.value.forEach((question: AnketaBody, index: number) => {
-            if (question.first.answerType === 'T') {
+            if (question.first.answerType === 'T' || question.first.answerType === 'D') {
               firstQuestionList.value![index].first.answerName = null;
             }
           });
@@ -456,7 +486,7 @@ export default defineComponent({
       );
       firstQuestionList.value = formStore[whichSurvey.value]!.body;
       formStore[whichSurvey.value]!.type = surveyType.value;
-      const negativeAnswer = firstQuestionList.value.every(i => i.first.answerName === 'Нет');
+      const negativeAnswer = firstQuestionList.value.every(i => i.first.answerName?.includes('Нет'));
       if (negativeAnswer) {
         answerToAll.value = true;
       }
@@ -490,7 +520,7 @@ export default defineComponent({
       () => firstQuestionList.value,
       value => {
         if (value) {
-          const hasPositiveAnswer = value.some(i => (i.first.definedAnswers === 'Y' || i.first.definedAnswers === 'D') && i.first.answerName !== 'Нет');
+          const hasPositiveAnswer = value.some(i => (i.first.definedAnswers === 'Y' || i.first.definedAnswers === 'D') && !i.first.answerName?.includes('Нет'));
           answerToAll.value = !hasPositiveAnswer;
         }
       },
@@ -512,6 +542,7 @@ export default defineComponent({
       firstPanel,
       filterType,
       filterItems,
+      surveyType,
       secondPanel,
       currentQuestion,
       currentSecond,

package/components/Pages/ContragentForm.vue

@@ -124,7 +124,7 @@
             <base-form-input v-model.trim="member.registrationStreet" :rules="$rules.required" :label="$dataStore.t('form.Street')" :readonly="disabled" :clearable="!disabled" />
             <base-form-input
               v-model.trim="member.registrationNumberHouse"
-              :rules="$rules.required"
+              :rules="[...$rules.required, $rules.lengthLimit(member.registrationNumberHouse, 10)]"
               :label="$dataStore.t('form.NumberHouse')"
               :readonly="disabled"
               :clearable="!disabled"