Merge branch 'UC-209' into 'master'

WIP Переделана часть модальных окон и меню

See merge request andrusyakka/urban-couscous!267

src/components/TheHeader.vue

@@ -31,7 +31,7 @@
         flat,
         dense,
         style="color: var(--font-dark-blue-color)",
-        padding="4px 8px"
+        padding="4px 8px",
         icon="app:icon-bell",
         size="18px",
         round,

src/components/base/BaseInput.vue

@@ -10,6 +10,7 @@
       :dense="dense",
       :type="type",
       :filled="filled",
+      :bg-color="!filled && 'white'",
       :disable="disabled",
       :rules="rule",
       :mask="mask",

src/components/base/BaseSelect.vue

@@ -6,7 +6,7 @@
         :options="items",
         :disable="disable",
         :behavior="behavior",
-        bg-color="var(--bg-disable-grey-color)",
+        bg-color="white",
         outlined,
         dense,
         emit-value,

src/pages/clients/components/ClientDetailInfoSection.vue

@@ -39,10 +39,9 @@
             no-caps,
             padding="0px"
           )
-          base-popup.right-3.top-5(
+          q-menu(
             v-if="section === 'docs' && isOpenAddingWrap",
-            v-click-outside="closePopup",
+            anchor="bottom left", self="top right"
-            :width="244"
           )
             table-choice-adding-doc(
               :add-new-doc="addNewDoc",
@@ -53,7 +52,6 @@
             )
           base-modal(
             v-model="showModal",
-            :style-content="{padding: isOpenAddDoc ? '16px' : '28px 32px'}",
             :showIcon="isOpenAddDoc"
           )
             table-adding-new-doc(
@@ -65,11 +63,9 @@
             )
             //table-create-package-doc(v-if="isOpenPackage")
             stepper-create-agreement(v-if="isOpenPackage")
-
+          q-menu(
-          base-popup.right-3.top-5(
             v-if="section === 'additional' && isOpenAddingWrap",
-            v-click-outside="closePopup",
+            anchor="bottom left", self="top right"
-            :width="485"
           )
             table-create-note(:create-note="createNote", :close-popup="closePopup")
     transition(name="section", mode="out-in")
@@ -189,7 +185,6 @@ import TableCreatePackageDoc from "@/pages/clients/components/TableCreatePackage
 import TableCreateNote from "@/pages/clients/components/TableCreateNote";
 import ClientDetailSectionAddress from "@/pages/clients/components/ClientDetailSectionAddress";
 import TableChoiceAddingDoc from "@/pages/clients/components/TableChoiceAddingDoc";
-import BasePopup from "@/components/base/BasePopup";
 import BaseModal from "@/components/base/BaseModal";
 import BaseInput from "@/components/base/BaseInput";
 import { detail } from "@/pages/clients/utils/tableConfig";
@@ -204,7 +199,6 @@ export default {
   name: "ClientDetailInfoSection",
   components: {
     BaseInput,
-    BasePopup,
     BaseModal,
     BaseLoader,
     ClientDetailInput,

src/pages/clients/components/ClientsTableRow.vue

@@ -450,7 +450,7 @@ export default {
       this.lackAttachments = this.dataAttachments[0]?.id ? true : false;
     },
     saveNote(data) {
-      this.dataNotes = data?.note.filter((e) => !e.deleted_flg);
+      this.dataNotes = data?.note.filter((e) => e?.deleted_flg === false);
       if (this.dataNotes[0]) {
         this.lackNotes = true;
       } else {

src/pages/clients/components/TableChoiceAddingDoc.vue

@@ -1,13 +1,18 @@
 <template lang="pug">
-  .flex.flex-col.gap-y-3
+  .flex.flex-col.gap-y-3.p-4
-    .button.flex.items-center.gap-x-2(
+    .button.flex.items-center.gap-x-2.cursor-pointer(
-      :style="{color: 'var(--font-dark-blue-color)'}"
+      :style="{color: 'var(--font-dark-blue-color)'}",
+      @click="changeOpenAddDoc",
+      v-close-popup
     )
       img(:src="docIcon")
-      .text-smm(@click="changeOpenAddDoc") Создать пакет документов
+      .text-smm Создать пакет документов
-    .button.keep-redaction.flex.items-center.gap-x-3
+    .button.keep-redaction.flex.items-center.gap-x-3.cursor-pointer(
+      @click="changeOpenCreateDoc",
+      v-close-popup
+    )
       img(:src="manyDocIcon")
-      .text-smm(@click="changeOpenCreateDoc") Добавить документы
+      .text-smm Добавить документы
 </template>
 
 <script>

src/pages/clients/components/TableCreateNote.vue

@@ -1,5 +1,5 @@
 <template lang="pug">
-  .flex.flex-col.gap-y-3
+  .flex.flex-col.gap-y-3.p-4(:style="{'width': '485px'}")
     .flex.flex-col.gap-y-3.relative
       base-input.text-smm(placeholder="Заголовок", v-model="title", :maxLength="40", outlined)
       .text.flex.absolute.text-xsx.right-7.top-3 {{`${changeValue}/40`}}

src/pages/clients/components/cells/TableCellBodyNetworks.vue

@@ -16,32 +16,34 @@
         size="14px",
         class="add-button"
         v-if="isOpenChange && settings.settings.length !== getNetworks.length",
-        @click.stop="openPopupAdding",
+        @click.stop
         round,
         dense,
         no-caps,
         padding="1px"
       )
-      base-popup.right-3.top-6.z-20(
+        //base-popup.right-3.top-6.z-20(
-        v-if="isOpenPopupAdding",
+          v-if="isOpenPopupAdding",
-        @click.stop,
+          @click.stop,
-        v-click-outside="closePopup",
+          v-click-outside="closePopup",
-        :width="485"
+          :width="485"
-      )
+        //)
-        base-adding-network(
+        q-menu(v-model="isOpenPopupAdding", anchor="bottom left", self="top right")
-          :value="network",
+          .menu-wrapper.flex.flex-col.gap-y-3.p-4
-          :selected-option="getSelectedIcon",
+            base-adding-network(
-          :list-adding-networks="getAddingNetworks",
+              :value="network",
-          :choose-network="chooseNetwork"
+              :selected-option="getSelectedIcon",
-        )
+              :list-adding-networks="getAddingNetworks",
-        .w-fit
+              :choose-network="chooseNetwork"
-          q-btn(
+            )
-            color="primary",
+            .w-fit
-            label="Добавить",
+              q-btn(
-            no-caps,
+                color="primary",
-            @click="saveNetwork",
+                label="Добавить",
-            padding="8px 24px"
+                no-caps,
-          )
+                @click="saveNetwork",
+                padding="8px 24px"
+              )
 </template>
 
 <script>
@@ -132,4 +134,6 @@ export default {
   &:hover
     background-color: var(--btn-blue-color)
     color: var(--default-white)
+.menu-wrapper
+  width: 484px
 </style>