From 0fce0641feebe7645f2d817d8b8a5b8cb3c69c2d Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Wed, 25 Jan 2023 11:07:00 +0300
Subject: [PATCH 1/2] =?UTF-8?q?WIP=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20background=20=D1=83=20=D0=B8=D0=BD=D0=BF?=
 =?UTF-8?q?=D1=83=D1=82=D0=BE=D0=B2=20=D0=B8=20=D1=81=D0=B5=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BA=D1=82=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TheHeader.vue       | 2 +-
 src/components/base/BaseInput.vue  | 1 +
 src/components/base/BaseSelect.vue | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue
index 18e00b3..49e41a2 100644
--- a/src/components/TheHeader.vue
+++ b/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,
diff --git a/src/components/base/BaseInput.vue b/src/components/base/BaseInput.vue
index 028fe35..5707185 100644
--- a/src/components/base/BaseInput.vue
+++ b/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",
diff --git a/src/components/base/BaseSelect.vue b/src/components/base/BaseSelect.vue
index 1131d5a..757a38e 100644
--- a/src/components/base/BaseSelect.vue
+++ b/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,

From 2cd2fbc7b4537a0279232614ed4a0a2321f935a4 Mon Sep 17 00:00:00 2001
From: Daria Golova <danalis969@gmail.com>
Date: Wed, 25 Jan 2023 18:46:39 +0300
Subject: [PATCH 2/2] =?UTF-8?q?WIP=20=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=BB=D0=B0=D0=BD=D0=B0=20=D1=87=D0=B0=D1=81=D1=82=D1=8C=20?=
 =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B0=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D0=BE?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=BD=20=D0=B8=20=D0=BC=D0=B5=D0=BD=D1=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ClientDetailInfoSection.vue    | 14 ++----
 .../clients/components/ClientsTableRow.vue    |  2 +-
 .../components/TableChoiceAddingDoc.vue       | 17 ++++---
 .../clients/components/TableCreateNote.vue    |  2 +-
 .../cells/TableCellBodyNetworks.vue           | 46 ++++++++++---------
 5 files changed, 42 insertions(+), 39 deletions(-)

diff --git a/src/pages/clients/components/ClientDetailInfoSection.vue b/src/pages/clients/components/ClientDetailInfoSection.vue
index 8928fd0..03aca33 100644
--- a/src/pages/clients/components/ClientDetailInfoSection.vue
+++ b/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",
-            :width="244"
+            anchor="bottom left", self="top right"
           )
             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")
-
-          base-popup.right-3.top-5(
+          q-menu(
             v-if="section === 'additional' && isOpenAddingWrap",
-            v-click-outside="closePopup",
-            :width="485"
+            anchor="bottom left", self="top right"
           )
             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,
diff --git a/src/pages/clients/components/ClientsTableRow.vue b/src/pages/clients/components/ClientsTableRow.vue
index aea744b..21d9572 100644
--- a/src/pages/clients/components/ClientsTableRow.vue
+++ b/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 {
diff --git a/src/pages/clients/components/TableChoiceAddingDoc.vue b/src/pages/clients/components/TableChoiceAddingDoc.vue
index 07058e3..6f071c8 100644
--- a/src/pages/clients/components/TableChoiceAddingDoc.vue
+++ b/src/pages/clients/components/TableChoiceAddingDoc.vue
@@ -1,13 +1,18 @@
 <template lang="pug">
-  .flex.flex-col.gap-y-3
-    .button.flex.items-center.gap-x-2(
-      :style="{color: 'var(--font-dark-blue-color)'}"
+  .flex.flex-col.gap-y-3.p-4
+    .button.flex.items-center.gap-x-2.cursor-pointer(
+      :style="{color: 'var(--font-dark-blue-color)'}",
+      @click="changeOpenAddDoc",
+      v-close-popup
     )
       img(:src="docIcon")
-      .text-smm(@click="changeOpenAddDoc") Создать пакет документов
-    .button.keep-redaction.flex.items-center.gap-x-3
+      .text-smm Создать пакет документов
+    .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>
diff --git a/src/pages/clients/components/TableCreateNote.vue b/src/pages/clients/components/TableCreateNote.vue
index 949e9d2..e36bec4 100644
--- a/src/pages/clients/components/TableCreateNote.vue
+++ b/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`}}
diff --git a/src/pages/clients/components/cells/TableCellBodyNetworks.vue b/src/pages/clients/components/cells/TableCellBodyNetworks.vue
index 9bcea45..4000b54 100644
--- a/src/pages/clients/components/cells/TableCellBodyNetworks.vue
+++ b/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(
-        v-if="isOpenPopupAdding",
-        @click.stop,
-        v-click-outside="closePopup",
-        :width="485"
-      )
-        base-adding-network(
-          :value="network",
-          :selected-option="getSelectedIcon",
-          :list-adding-networks="getAddingNetworks",
-          :choose-network="chooseNetwork"
-        )
-        .w-fit
-          q-btn(
-            color="primary",
-            label="Добавить",
-            no-caps,
-            @click="saveNetwork",
-            padding="8px 24px"
-          )
+        //base-popup.right-3.top-6.z-20(
+          v-if="isOpenPopupAdding",
+          @click.stop,
+          v-click-outside="closePopup",
+          :width="485"
+        //)
+        q-menu(v-model="isOpenPopupAdding", anchor="bottom left", self="top right")
+          .menu-wrapper.flex.flex-col.gap-y-3.p-4
+            base-adding-network(
+              :value="network",
+              :selected-option="getSelectedIcon",
+              :list-adding-networks="getAddingNetworks",
+              :choose-network="chooseNetwork"
+            )
+            .w-fit
+              q-btn(
+                color="primary",
+                label="Добавить",
+                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>