Merge pull request #53 from dderbentsov/UC-19

WIP добавил возможность редактирования детальной информации клиента

server.js

@@ -3,38 +3,10 @@ import { createServer } from "miragejs";
 const dataClients = [
   {
     id: "1",
-    fullName: "Вильгейльм Арнольд Витальевич",
+    last_name: "Вильгейльм",
-    age: "34",
+    first_name: "Арнольд",
-    jobTitle: "Менеджер",
+    patronymic: "Витальевич",
-    priority: "Высокий",
+    identity_document_to_person: {
-    phone: "+7 (915) 657–21–14",
-    email: "Superboyband@yandex.ru",
-    networks: [],
-    meeting: {
-      date: "02.06.22",
-      time: "18:30–19:30",
-    },
-  },
-  {
-    id: "2",
-    fullName: "Астафоркина Екатерина Геннадьевна",
-    age: "54",
-    jobTitle: "Менеджер",
-    priority: "-",
-    phone: "+7 (574) 364–53–36",
-    email: "antimag@gmail.com",
-    networks: [],
-    meeting: {
-      date: "14.07.22",
-      time: "17:30–21:30",
-    },
-  },
-];
-
-const clientsDetail = [
-  {
-    id: "5",
-    idClient: "1",
       pass: {
         number: {
           value: "5261 918732",
@@ -50,6 +22,21 @@ const clientsDetail = [
           value: "02.04.2022",
         },
       },
+    },
+    note_to_person: {
+      basic_info: {
+        age: "34",
+        jobTitle: "Менеджер",
+        priority: "Высокий",
+        phone: "+7 (915) 657–21–14",
+        email: "Superboyband@yandex.ru",
+        networks: [],
+        meeting: {
+          date: "02.06.22",
+          time: "18:30–19:30",
+        },
+      },
+      additional_info: {
         snils: {
           number: {
             value: "812–183–139 21",
@@ -77,60 +64,190 @@ const clientsDetail = [
               "371311, Московская обл., г. Москва, ул. Комсомольская, д.6, кв. 13",
           },
         },
-    docs: {
+        docs: [
-      info: [
           {
-          value: "Договор оферты.pdf",
+            name: "Договор оферты.pdf",
+            type: "application/pdf",
           },
           {
-          value: "Договор о долевом строительстве.pdf",
+            name: "Договор о долевом строительстве.pdf",
+            type: "application/pdf",
           },
           {
-          value: "Какое-то очень очень очень очень длинное название.doc",
+            name: "Какое-то очень очень очень очень длинное название.doc",
+            type: "application/msword",
           },
           {
-          value: "Договор об оплате.doc",
+            name: "Договор об оплате.doc",
+            type: "application/msword",
           },
           {
-          value: "Коммерческое предложение.xls",
+            name: "Коммерческое предложение.xls",
+            type: "application/vnd.ms-excel",
           },
           {
-          value: "Таблица заказов.xls",
+            name: "Таблица заказов.xls",
+            type: "application/vnd.ms-excel",
           },
         ],
-    },
+        additional: [
-    additional: {
-      info: [
           {
-          name: "Предпочтения",
+            header: "Предпочтения",
             value: "Разговор на “Вы”\nТолько по делу\nТолько официальный стиль",
-          file: "",
+            name: "",
+            type: "",
           },
           {
-          name: "Доп.документы",
+            header: "Доп.документы",
             value: "",
-          file: "Памятка с вопросами на созвоне.pdf",
+            name: "Памятка с вопросами на созвоне.pdf",
+            type: "application/pdf",
           },
           {
-          name: "Его должность",
+            header: "Его должность",
             value: "Вроде бы важная шишка, пусть будет – Гуру в дизайне",
-          file: "",
+            name: "",
+            type: "",
           },
           {
-          name: "Чтобы не забыть",
+            header: "Чтобы не забыть",
             value: "Не забудь!",
-          file: "",
+            name: "",
+            type: "",
           },
         ],
       },
     },
+  },
+  {
+    id: "2",
+    last_name: "Астафоркина",
+    first_name: "Екатерина",
+    patronymic: "Геннадьевна",
+    identity_document_to_person: {
+      pass: {
+        number: {
+          value: "1324 103496",
+          copy: true,
+        },
+        issuedBy: {
+          value: "Отделом УФМС России по владимирской области",
+        },
+        divisionCode: {
+          value: "675–901",
+        },
+        dateIssue: {
+          value: "01.01.2011",
+        },
+      },
+    },
+    note_to_person: {
+      basic_info: {
+        age: "54",
+        jobTitle: "Менеджер",
+        priority: "-",
+        phone: "+7 (574) 364–53–36",
+        email: "antimag@gmail.com",
+        networks: [],
+        meeting: {
+          date: "14.07.22",
+          time: "17:30–21:30",
+        },
+      },
+      additional_info: {
+        snils: {
+          number: {
+            value: "834–001–555 35",
+            copy: true,
+          },
+        },
+        inn: {
+          number: {
+            value: "371942327342",
+            copy: true,
+          },
+        },
+        birthday: {
+          date: {
+            value: "07.12.1993",
+          },
+        },
+        addresses: {
+          registrationPlace: {
+            value:
+              "371311, Московская обл., г. Владимир, ул. Гагарина, д.12, кв. 24",
+          },
+          actualPlace: {
+            value:
+              "371311, Московская обл., г. Владимир, ул. Гагарина, д.12, кв. 24",
+          },
+        },
+        docs: [
+          {
+            name: "Договор покупки.pdf",
+            type: "application/pdf",
+          },
+          {
+            name: "Договор о оптовых поставках.pdf",
+            type: "application/pdf",
+          },
+          {
+            name: "Договор о предоставлении услуг.pdf",
+            type: "application/pdf",
+          },
+          {
+            name: "Какое-то очень очень очень очень короткое название.doc",
+            type: "application/msword",
+          },
+          {
+            name: "Документация.doc",
+            type: "application/msword",
+          },
+          {
+            name: "Отчет.xls",
+            type: "application/vnd.ms-excel",
+          },
+          {
+            name: "Заказы.xls",
+            type: "application/vnd.ms-excel",
+          },
+        ],
+        additional: [
+          {
+            header: "По каким вопросам обращатся",
+            value: "Обращатся только по вопросам закупок",
+            name: "",
+            type: "",
+          },
+          {
+            header: "Доп.документы",
+            value: "Ответственные за работу",
+            name: "Список ответсвенных.xls",
+            type: "application/vnd.ms-excel",
+          },
+          {
+            header: "Портфолио",
+            value: "Информация о клиенте",
+            name: "Портфолио.doc",
+            type: "application/msword",
+          },
+        ],
+      },
+    },
+  },
 ];
 export function clientsServer() {
   createServer({
     routes() {
-      this.get("/api/clients", () => ({
+      this.get("/api/clients", () => {
-        dataClients,
+        return dataClients.map((el) => ({
+          ...el.note_to_person.basic_info,
+          id: el.id,
+          last_name: el.last_name,
+          first_name: el.first_name,
+          patronymic: el.patronymic,
         }));
+      });
       this.get("/registry/event/", () => ({
         count: 4,
         next: null,
@@ -313,7 +430,12 @@ export function clientsServer() {
       this.passthrough("http://45.84.227.122:8080/**");
       this.get("/api/detail/:id", (schema, request) => {
         let id = request.params.id;
-        return clientsDetail.find((el) => el.idClient === id);
+        let client = dataClients.find((el) => el.id === id);
+        return {
+          ...client.note_to_person.additional_info,
+          id: client.id,
+          pass: client.identity_document_to_person.pass,
+        };
       });
     },
   });

src/assets/sass/variables.sass

@@ -20,3 +20,6 @@
   --btn-red-color: #ff6f6f
   --time-indicator-color: #e93131
   --font-obligatory-color: #ff0000
+  --light-grey-bg-color: #f8f9fa
+  --btn-green-color: rgba(60, 217, 75, 1)
+  --btn-light-green-color: rgba(60, 217, 75, 0.2)

src/components/base/buttons/BaseButtonOk.vue

@@ -0,0 +1,45 @@
+<template lang="pug">
+  button.button-ok.flex.items-center.justify-center.cursor-pointer.text-xs.box-border(:style="{width:size + 'px', height:size + 'px'}" :class="{change:darkStyle}")
+    .flex.w-fit.h-fit
+      span.icon-ok.leading-none(:style="{fontSize:iconSize + 'px'}")
+</template>
+
+<script>
+export default {
+  name: "BaseButtonOk",
+  props: {
+    size: {
+      default: 24,
+    },
+    iconSize: {
+      default: 14,
+    },
+    darkStyle: {
+      default: false,
+    },
+  },
+};
+</script>
+
+<style lang="sass" scoped>
+.button-ok
+  color: var(--btn-blue-color)
+  border: 1.5px solid var(--btn-blue-color-3)
+  border-radius: 50%
+  &:hover
+    border: none
+    background-color: var(--btn-blue-color-3)
+  &:active
+    border: none
+    background-color: var(--btn-light-green-color)
+    color: var(--btn-green-color)
+.change
+  border-color: var(--btn-blue-color)
+  &:hover
+    border: none
+    background-color: var(--btn-blue-color)
+    color: var(--default-white)
+  &:active
+    background-color: var(--btn-light-green-color)
+    color: var(--btn-green-color)
+</style>

src/components/base/buttons/BaseButtonPlus.vue

@@ -1,10 +1,23 @@
 <template lang="pug">
-  button.cursor-pointer.icon-plus.button-plus.text-xs.pt-1
+  button.flex.items-center.justify-center.cursor-pointer.button-plus.text-xs.box-border(:style="{width:size + 'px', height:size + 'px'}" :class="{change:withBorder}")
+    .flex.w-fit.h-fit
+      span.icon-plus.leading-none(:style="{fontSize:iconSize + 'px'}")
 </template>
 
 <script>
 export default {
-  name: "ButtonPlus",
+  name: "BaseButtonPlus",
+  props: {
+    size: {
+      default: 24,
+    },
+    iconSize: {
+      default: 14,
+    },
+    withBorder: {
+      default: false,
+    },
+  },
 };
 </script>
 
@@ -12,10 +25,14 @@ export default {
 .button-plus
   outline: none
   border: none
-  width: 24px
-  height: 24px
-  max-height: 24px
   color: var(--btn-blue-color)
-  background-color: var(--bg-ligth-blue-color)
   border-radius: 50%
+.change
+  background-color: var(--btn-blue-color-0)
+  color: var(--btn-blue-color)
+  border: 1.5px solid var(--btn-blue-color)
+  &:hover
+    border: none
+    background-color: var(--btn-blue-color)
+    color: var(--default-white)
 </style>

src/pages/clients/components/ClientDetailInfoSection.vue

@@ -1,30 +1,56 @@
 <template lang="pug">
-  .section-wrapper.flex.flex-col.h-fit(:style="{ minWidth : settings.width + 'px' }" :class="{flexRow:settings.rollFlex}")
+  .section-wrapper.flex.flex-col.h-fit.cursor-pointer(@dblclick="openInterfaceChange" :class="{click:isOpenChange}" :style="{ flexDirection:settings[section].rowFlex&&'row', width : settings[section].width + 'px', height : settings[section].height+'px'}")
-    .section-header.flex.items-center.justify-start.pt-4.pb-3.pl-4(:class="{styleBorder:settings.rollFlex}")
+    .section-header.flex.items-center.justify-between.pl-4.pr-3(:class="{small:settings[section].rowFlex}")
-      span.text-sm.font-semibold {{settings.title}}
+      span.text-sm.font-semibold.whitespace-nowrap {{settings[section].title}}
+      .flex.items-center.gap-x-8(v-if="isOpenChange")
+        base-button-ok(@click="saveChange" v-if="isChange" :size="20" :icon-size="10" :dark-style="true")
+        .edit.icon-edit.cursor-pointer.text-sm(v-if="!isChange" @click="changeClientData")
+        base-button-plus(v-if="settings[section].addFile" :size="20" :icon-size="10" :with-border="true")
     .section-body.w-full.flex.flex-col.px-4.pt-3.pb-4.gap-y-4
       .flex.flex-col(v-for="(item, key) in sectionInfo" class="gap-y-1.5")
-        span.title-section.font-semibold.text-xs(v-if="settings.options") {{settings.options[key]}}
+        span.title-section.font-semibold.text-xs(v-if="settings[section].options") {{settings[section].options[key]}}
-        .flex.gap-x-4
+        span.title-section.font-semibold.text-xs(v-if="item.header") {{item.header}}
-          .icon-files.cursor-pointer(v-if="!!item.file" style="color:red")
+        client-detail-input.text-sm.text-sm.w-max-fit(v-if="isChange && item.value" :style="{fontWeight:item.copy&&600}" v-model:value="item.value" :width="settings[section].width")
-          span.text-sm.text-sm.text-center.w-fit(v-if="!!item.value" :style="{fontWeight:item.copy&&600}") {{item.value}}
+          .copy.icon-copy.cursor-pointer(v-if="item.copy")
-          span.text-sm.text-center(v-if="!!item.file") {{item.file}}
+        .flex.gap-x-4(v-if="item.value && !isChange")
-          .icon-copy.cursor-pointer(v-if="item.copy")
+          span.text-sm.w-fit(:style="{fontWeight:item.copy&&600}") {{item.value}}
+          .copy.icon-copy.cursor-pointer(v-if="item.copy")
+        .flex.gap-x-4(v-if="item.name")
+          .icon-files.cursor-pointer(:style="{color:settings.docsColor[item.type]}")
+          span.text-sm {{item.name}}
 </template>
 
 <script>
+import ClientDetailInput from "@/pages/clients/components/ClientDetailInput";
+import BaseButtonOk from "@/components/base/buttons/BaseButtonOk";
+import BaseButtonPlus from "@/components/base/buttons/BaseButtonPlus";
 import { detail } from "@/pages/clients/utils/tableConfig";
 export default {
   name: "ClientDetailInfoSection",
+  components: { BaseButtonPlus, BaseButtonOk, ClientDetailInput },
   props: {
     sectionInfo: Object,
     section: String,
   },
   data() {
     return {
-      settings: detail.find((el) => el.name === this.section),
+      isOpenChange: false,
+      isChange: false,
+      settings: detail,
     };
   },
+  methods: {
+    openInterfaceChange() {
+      this.isOpenChange = !this.isOpenChange;
+    },
+    changeClientData() {
+      this.isChange = true;
+    },
+    saveChange() {
+      this.isOpenChange = false;
+      this.isChange = false;
+    },
+  },
 };
 </script>
 
@@ -33,13 +59,32 @@ export default {
   border: 1px solid var(--border-light-grey-color)
   border-radius: 4px
   color: var(--font-dark-blue-color)
-  &.flex-row
+  &.click
-    flex-direction: row
+    background-color: var(--light-grey-bg-color)
 .section-header
+  min-height: 44px
   border-bottom: 1px solid var(--border-light-grey-color)
-  &.style-border
+.small
   border-bottom: none
   border-right: 1px solid var(--border-light-grey-color)
+  min-width: 180px
 .title-section
   color: var(--font-grey-color)
+.copy
+  color: var(--btn-blue-color)
+  opacity: 0.6
+.section-body
+  overflow-y: auto
+  &::-webkit-scrollbar
+    width: 4px
+  &::-webkit-scrollbar-track
+    background-color: rgba(211, 212, 220, 0.5)
+    border-radius: 8px
+  &::-webkit-scrollbar-thumb
+    border-radius: 8px
+    background-color: var(--btn-blue-color)
+.edit
+  color: var(--btn-blue-color)
+  &:hover
+    opacity: 0.6
 </style>

src/pages/clients/components/ClientDetailInfoWrapper.vue

@@ -1,12 +1,14 @@
 <template lang="pug">
   .w-full.h-fit.pt-4.flex.gap-x-4(class="px-[52px] pb-[30px]")
-    client-detail-info-section(:section-info="dataDetail.pass" section="pass")
+    client-detail-info-section(v-model:section-info="dataDetail.pass" section="pass")
     .flex.flex-col.gap-y-2
       client-detail-info-section(:section-info="dataDetail.snils" section="snils" )
       client-detail-info-section(:section-info="dataDetail.inn" section="inn" )
     .flex.flex-col.gap-y-2
       client-detail-info-section(:section-info="dataDetail.birthday" section="birthday")
       client-detail-info-section(:section-info="dataDetail.addresses" section="addresses")
+    client-detail-info-section(:section-info="dataDetail.docs" section="docs")
+    client-detail-info-section(:section-info="dataDetail.additional" section="additional")
 </template>
 
 <script>

src/pages/clients/components/ClientDetailInput.vue

@@ -0,0 +1,27 @@
+<template lang="pug">
+  .input-wrapper.flex.gap-x-2.px-3.box-border.w-max-fit(class="py-2.5")
+    textarea.place-input.w-full.outline-0.text-sm.not-italic.resize-none(:rows="Math.ceil(value.length/heightInput)" :value="value" @input="$emit('update:value', $event.target.value)")
+    slot
+</template>
+
+<script>
+export default {
+  name: "ClientDetailInput",
+  props: {
+    value: String,
+    width: Number,
+  },
+  computed: {
+    heightInput() {
+      return ((this.width / 100) * 70) / 8;
+    },
+  },
+};
+</script>
+
+<style lang="sass" scoped>
+.input-wrapper
+  border: 2px solid var(--border-light-grey-color)
+  border-radius: 4px
+  background-color: var(--default-white)
+</style>

src/pages/clients/components/ClientsTable.vue

@@ -10,7 +10,7 @@
           :id="client.id"
           :is-check="marked.includes(client.id)"
           :check="selectedCheck"
-          :full-name="client.fullName"
+          :full-name="`${client.last_name} ${client.first_name} ${client.patronymic}`"
           :age="client.age"
           :job-title="client.jobTitle"
           :priority="client.priority"
@@ -46,7 +46,7 @@ export default {
   },
   methods: {
     saveDataClients(data) {
-      this.dataClients = data.dataClients;
+      this.dataClients = data;
     },
     fetchDataClients() {
       // eslint-disable-next-line

src/pages/clients/components/ClientsTableHat.vue

@@ -18,7 +18,7 @@ import BaseCreateButton from "@/components/base/buttons/BaseCreateButton";
 import BassExportButton from "@/components/base/buttons/BassExportButton";
 import BaseInput from "@/components/base/BaseInput";
 export default {
-  name: "ClientsTAbleHeader",
+  name: "ClientsTableHat",
   components: {
     BaseInput,
     BassExportButton,

src/pages/clients/components/ClientsTableRow.vue

@@ -1,6 +1,6 @@
 <template lang="pug">
   .row-wrapper.flex.flex-col.w-full
-    .row-body.flex.w-full.cursor-pointer(@click="openDetailInfo")
+    .row-body.flex.w-full.cursor-pointer(:id="id" @dblclick="(e) => openDetailInfo(e)")
       .check-box.flex.justify-center.items-center
         clients-table-checkbox(:id="id" :check="check" :is-check="isCheck")
       table-cell-body-name(:value="fullName" :width="columnBody.find(el => el.name === 'fullName').width")
@@ -67,9 +67,9 @@ export default {
     meetingTime: Object,
   },
   methods: {
-    fetchClientDetail() {
+    fetchClientDetail(id) {
       // eslint-disable-next-line
-      fetch("/api/detail/1").then((res) => res.json()).then((data) => this.saveClientDetail(data))
+      fetch(`/api/detail/${id}`).then((res) => res.json()).then((data) => this.saveClientDetail(data))
     },
     saveClientDetail(data) {
       this.dataDetail = data;
@@ -78,9 +78,9 @@ export default {
       e.target.focus();
       this.isOpenPopup = !this.isOpenPopup;
     },
-    openDetailInfo() {
+    openDetailInfo(e) {
       this.isOpenDetailInfo = !this.isOpenDetailInfo;
-      this.isOpenDetailInfo && this.fetchClientDetail();
+      this.isOpenDetailInfo && this.fetchClientDetail(e.currentTarget.id);
     },
     handleUnFocusPopup() {
       this.isOpenPopup = false;

src/pages/clients/utils/tableConfig.js

@@ -60,9 +60,8 @@ export const column = [
   },
 ];
 
-export const detail = [
+export const detail = {
-  {
+  pass: {
-    name: "pass",
     title: "Паспортные данные",
     options: {
       number: "Серия и номер",
@@ -72,30 +71,26 @@ export const detail = [
     },
     width: 280,
   },
-  {
+  snils: {
-    name: "snils",
     title: "СНИЛС",
     options: {
       number: "Номер",
     },
     width: 180,
   },
-  {
+  inn: {
-    name: "inn",
     title: "ИНН",
     options: {
       number: "Номер",
     },
     width: 180,
   },
-  {
+  birthday: {
-    name: "birthday",
     title: "Дата рождения",
     width: 292,
-    rollFlex: true,
+    rowFlex: true,
   },
-  {
+  addresses: {
-    name: "addresses",
     title: "Адреса",
     options: {
       registrationPlace: "Адрес постоянной регистрации",
@@ -103,16 +98,21 @@ export const detail = [
     },
     width: 292,
   },
-  {
+  docs: {
-    name: "docs",
     title: "Документы",
     height: 280,
     width: 360,
+    addFile: true,
   },
-  {
+  additional: {
-    name: "additional",
     title: "Дополнительные данные",
     height: 280,
     width: 360,
+    addFile: true,
   },
-];
+  docsColor: {
+    "application/pdf": "#ff6969",
+    "application/msword": "#6993ff",
+    "application/vnd.ms-excel": "#61c57d",
+  },
+};