From 7b3ff319d475e3700007b3120775ccf411a1dedd Mon Sep 17 00:00:00 2001 From: carlosfonseca Date: Wed, 31 Jan 2024 07:32:34 -0500 Subject: [PATCH 1/3] Desarrollo de tarjetas varias en el modulo de clientes en el summary --- src/i18n/en/index.js | 7 + src/i18n/es/index.js | 7 + src/pages/Customer/Card/CustomerBalance.vue | 23 +- .../Customer/Card/CustomerBillingData.vue | 4 +- .../Customer/Card/CustomerConsignees.vue | 1 + .../Customer/Card/CustomerConsumption.vue | 22 ++ src/pages/Customer/Card/CustomerContacts.vue | 147 +++++++++++ .../Customer/Card/CustomerCreditContracts.vue | 213 ++++++++++++++- .../Card/CustomerCreditManagement.vue | 3 - .../Customer/Card/CustomerCreditOpinion.vue | 74 +++++- .../Customer/Card/CustomerFileManagement.vue | 3 + src/pages/Customer/Card/CustomerMandates.vue | 17 ++ src/pages/Customer/Card/CustomerOthers.vue | 3 - src/pages/Customer/Card/CustomerSamples.vue | 165 ++++++++++++ src/pages/Customer/Card/CustomerUnpaid.vue | 3 + src/pages/Customer/Card/CustomerWebAccess.vue | 68 ++--- .../Customer/Card/CustomerWebPayment.vue | 3 + .../components/CustomerConsigneeEdit.vue | 2 +- .../CustomerCreditContractsCreate.vue | 61 +++++ .../CustomerCreditContractsInsurance.vue | 108 ++++++++ .../components/CustomerNewCustomsAgent.vue | 2 +- .../components/CustomerNewPayment.vue | 3 + .../components/CustomerSamplesCreate.vue | 248 ++++++++++++++++++ .../components/ModalCloseContract.vue | 73 ++++++ src/router/modules/customer.js | 177 ++++++++++++- 25 files changed, 1381 insertions(+), 56 deletions(-) create mode 100644 src/pages/Customer/Card/CustomerConsumption.vue create mode 100644 src/pages/Customer/Card/CustomerContacts.vue delete mode 100644 src/pages/Customer/Card/CustomerCreditManagement.vue create mode 100644 src/pages/Customer/Card/CustomerFileManagement.vue create mode 100644 src/pages/Customer/Card/CustomerMandates.vue delete mode 100644 src/pages/Customer/Card/CustomerOthers.vue create mode 100644 src/pages/Customer/Card/CustomerSamples.vue create mode 100644 src/pages/Customer/Card/CustomerUnpaid.vue create mode 100644 src/pages/Customer/Card/CustomerWebPayment.vue create mode 100644 src/pages/Customer/components/CustomerCreditContractsCreate.vue create mode 100644 src/pages/Customer/components/CustomerCreditContractsInsurance.vue create mode 100644 src/pages/Customer/components/CustomerSamplesCreate.vue create mode 100644 src/pages/Customer/components/ModalCloseContract.vue diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js index f672ca33e..9b7d4248d 100644 --- a/src/i18n/en/index.js +++ b/src/i18n/en/index.js @@ -134,6 +134,13 @@ export default { creditContracts: 'Credit contracts', creditOpinion: 'Credit opinion', others: 'Others', + samples: 'Samples', + consumption: 'Consumption', + mandates: 'Mandates', + contacts: 'Contacts', + webPayment: 'Web payment', + fileManagement: 'File management', + unpaid: 'Unpaid', }, list: { phone: 'Phone', diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js index b21bb423c..f174c3594 100644 --- a/src/i18n/es/index.js +++ b/src/i18n/es/index.js @@ -134,6 +134,13 @@ export default { creditContracts: 'Contratos de crédito', creditOpinion: 'Opinión de crédito', others: 'Otros', + samples: 'Plantillas', + consumption: 'Consumo', + mandates: 'Mandatos', + contacts: 'Contactos', + webPayment: 'Pago web', + fileManagement: 'Getión documental', + unpaid: 'Impago', }, list: { phone: 'Teléfono', diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue index 184667d6e..db514fab0 100644 --- a/src/pages/Customer/Card/CustomerBalance.vue +++ b/src/pages/Customer/Card/CustomerBalance.vue @@ -1,10 +1,11 @@ diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue index 1543eac7a..bfbb43516 100644 --- a/src/pages/Customer/Card/CustomerBillingData.vue +++ b/src/pages/Customer/Card/CustomerBillingData.vue @@ -1,10 +1,8 @@ + + + + + + +es: + Enter a new search: Introduce una nueva búsqueda + diff --git a/src/pages/Customer/Card/CustomerContacts.vue b/src/pages/Customer/Card/CustomerContacts.vue new file mode 100644 index 000000000..fb99c3e7b --- /dev/null +++ b/src/pages/Customer/Card/CustomerContacts.vue @@ -0,0 +1,147 @@ + + + + + + + +es: + Name: Nombre + Phone: Teléfono + Remove contact: Eliminar contacto + Add contact: Añadir contacto + diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue index 7f10678ed..04e8eccef 100644 --- a/src/pages/Customer/Card/CustomerCreditContracts.vue +++ b/src/pages/Customer/Card/CustomerCreditContracts.vue @@ -1,3 +1,214 @@ + + + + + + +es: + Close contract: Cerrar contrato + Since: Desde + To: Hasta + Credit: Crédito + Grade: Grade + Date: Fecha + View credits: Ver créditos + Created: Fecha creación + New contract: Nuevo contrato + diff --git a/src/pages/Customer/Card/CustomerCreditManagement.vue b/src/pages/Customer/Card/CustomerCreditManagement.vue deleted file mode 100644 index fe24ddfd0..000000000 --- a/src/pages/Customer/Card/CustomerCreditManagement.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue index fcac76ccd..74d61b7c1 100644 --- a/src/pages/Customer/Card/CustomerCreditOpinion.vue +++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue @@ -1,3 +1,75 @@ + + + + +es: + Rating: Clasificación + Recommended credit: Crédito recomendado + diff --git a/src/pages/Customer/Card/CustomerFileManagement.vue b/src/pages/Customer/Card/CustomerFileManagement.vue new file mode 100644 index 000000000..228b34a44 --- /dev/null +++ b/src/pages/Customer/Card/CustomerFileManagement.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/Card/CustomerMandates.vue b/src/pages/Customer/Card/CustomerMandates.vue new file mode 100644 index 000000000..676c9f551 --- /dev/null +++ b/src/pages/Customer/Card/CustomerMandates.vue @@ -0,0 +1,17 @@ + + + + + diff --git a/src/pages/Customer/Card/CustomerOthers.vue b/src/pages/Customer/Card/CustomerOthers.vue deleted file mode 100644 index bd4729cab..000000000 --- a/src/pages/Customer/Card/CustomerOthers.vue +++ /dev/null @@ -1,3 +0,0 @@ - diff --git a/src/pages/Customer/Card/CustomerSamples.vue b/src/pages/Customer/Card/CustomerSamples.vue new file mode 100644 index 000000000..98afe1c52 --- /dev/null +++ b/src/pages/Customer/Card/CustomerSamples.vue @@ -0,0 +1,165 @@ + + + + + + + +es: + Sent: Enviado + Description: Descripción + Worker: Trabajador + Company: Empresa + Send sample: Enviar plantilla + diff --git a/src/pages/Customer/Card/CustomerUnpaid.vue b/src/pages/Customer/Card/CustomerUnpaid.vue new file mode 100644 index 000000000..66f771aba --- /dev/null +++ b/src/pages/Customer/Card/CustomerUnpaid.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue index d3be7bec8..a782f97a2 100644 --- a/src/pages/Customer/Card/CustomerWebAccess.vue +++ b/src/pages/Customer/Card/CustomerWebAccess.vue @@ -21,40 +21,42 @@ const filter = { where: { id: `${route.params.id}` } }; model="client" > diff --git a/src/pages/Customer/Card/CustomerWebPayment.vue b/src/pages/Customer/Card/CustomerWebPayment.vue new file mode 100644 index 000000000..0fcb6c46b --- /dev/null +++ b/src/pages/Customer/Card/CustomerWebPayment.vue @@ -0,0 +1,3 @@ + diff --git a/src/pages/Customer/components/CustomerConsigneeEdit.vue b/src/pages/Customer/components/CustomerConsigneeEdit.vue index 43649c58e..cfcd140f7 100644 --- a/src/pages/Customer/components/CustomerConsigneeEdit.vue +++ b/src/pages/Customer/components/CustomerConsigneeEdit.vue @@ -321,7 +321,7 @@ const onDataSaved = () => { size="sm" > - {{ t('Remove') }} + {{ t('Remove note') }} diff --git a/src/pages/Customer/components/CustomerCreditContractsCreate.vue b/src/pages/Customer/components/CustomerCreditContractsCreate.vue new file mode 100644 index 000000000..4a3b74091 --- /dev/null +++ b/src/pages/Customer/components/CustomerCreditContractsCreate.vue @@ -0,0 +1,61 @@ + + + + + +es: + Credit: Crédito + Grade: Grade + Since: Desde + diff --git a/src/pages/Customer/components/CustomerCreditContractsInsurance.vue b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue new file mode 100644 index 000000000..eddfe3cd9 --- /dev/null +++ b/src/pages/Customer/components/CustomerCreditContractsInsurance.vue @@ -0,0 +1,108 @@ + + + + + +es: + Created: Fecha creación + Grade: Grade + Credit: Crédito + diff --git a/src/pages/Customer/components/CustomerNewCustomsAgent.vue b/src/pages/Customer/components/CustomerNewCustomsAgent.vue index b8b83e763..c9bfbc5ed 100644 --- a/src/pages/Customer/components/CustomerNewCustomsAgent.vue +++ b/src/pages/Customer/components/CustomerNewCustomsAgent.vue @@ -1,5 +1,5 @@ + + + + + + +es: + Sample: Plantilla + Recipient: Destinatario + Reply to: Responder a + Company: Empresa + Address: Dirección + Since: Desde + Its only used when sample is sent: Se utiliza únicamente cuando se envía la plantilla + To who should the recipient replay?: ¿A quien debería responder el destinatario? + diff --git a/src/pages/Customer/components/ModalCloseContract.vue b/src/pages/Customer/components/ModalCloseContract.vue new file mode 100644 index 000000000..606cfab98 --- /dev/null +++ b/src/pages/Customer/components/ModalCloseContract.vue @@ -0,0 +1,73 @@ + + + + + +es: + Are you sure you want to close this contract?: ¿Seguro que quieres cerrar este contrato? + Close contract: Cerrar contrato + diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js index 716b0fa6c..7e6171c61 100644 --- a/src/router/modules/customer.js +++ b/src/router/modules/customer.js @@ -365,8 +365,6 @@ export default { }, ], }, - component: () => - import('src/pages/Customer/Card/CustomerCreditManagement.vue'), children: [ { path: 'credit-contracts', @@ -380,6 +378,41 @@ export default { 'src/pages/Customer/Card/CustomerCreditContracts.vue' ), }, + { + path: 'credit-contracts', + name: 'CreditContractsCard', + redirect: { name: 'CustomerCreditContracts' }, + children: [ + { + path: '', + name: 'CustomerCreditContracts', + meta: { + title: 'creditContracts', + icon: 'paid', + }, + component: () => + import( + 'src/pages/Customer/Card/CustomerCreditContracts.vue' + ), + }, + { + path: 'create', + name: 'CustomerCreditContractsCreate', + component: () => + import( + 'src/pages/Customer/components/CustomerCreditContractsCreate.vue' + ), + }, + { + path: 'insurance/:creditId', + name: 'CustomerCreditContractsInsurance', + component: () => + import( + 'src/pages/Customer/components/CustomerCreditContractsInsurance.vue' + ), + }, + ], + }, { path: 'credit-opinion', name: 'CustomerCreditOpinion', @@ -394,15 +427,151 @@ export default { }, ], }, - { path: 'others', name: 'CustomerOthers', meta: { title: 'others', icon: 'pending', + menuChildren: [ + { + name: 'CustomerSamples', + title: 'samples', + icon: 'pending', + }, + { + name: 'CustomerConsumption', + title: 'consumption', + icon: 'pending', + }, + { + name: 'CustomerMandates', + title: 'mandates', + icon: 'pending', + }, + { + name: 'CustomerContacts', + title: 'contacts', + icon: 'pending', + }, + { + name: 'CustomerWebPayment', + title: 'webPayment', + icon: 'pending', + }, + { + name: 'CustomerFileManagement', + title: 'fileManagement', + icon: 'pending', + }, + { + name: 'CustomerUnpaid', + title: 'unpaid', + icon: 'pending', + }, + ], }, - component: () => import('src/pages/Customer/Card/CustomerOthers.vue'), + children: [ + { + path: 'samples', + name: 'CustomerSamples', + meta: { + title: 'samples', + icon: 'paid', + }, + component: () => + import('src/pages/Customer/Card/CustomerSamples.vue'), + }, + { + path: 'samples', + name: 'CustomerSamplesCard', + redirect: { name: 'CustomerSamples' }, + children: [ + { + path: '', + name: 'CustomerSamples', + meta: { + title: 'samples', + icon: 'paid', + }, + component: () => + import( + 'src/pages/Customer/Card/CustomerSamples.vue' + ), + }, + { + path: 'create', + name: 'CustomerSamplesCreate', + component: () => + import( + 'src/pages/Customer/components/CustomerSamplesCreate.vue' + ), + }, + ], + }, + { + path: 'consumption', + name: 'CustomerConsumption', + meta: { + title: 'consumption', + icon: 'paid', + }, + component: () => + import('src/pages/Customer/Card/CustomerConsumption.vue'), + }, + { + path: 'mandates', + name: 'CustomerMandates', + meta: { + title: 'mandates', + icon: 'paid', + }, + component: () => + import('src/pages/Customer/Card/CustomerMandates.vue'), + }, + { + path: 'contacts', + name: 'CustomerContacts', + meta: { + title: 'contacts', + icon: 'paid', + }, + component: () => + import('src/pages/Customer/Card/CustomerContacts.vue'), + }, + { + path: 'web-payment', + name: 'CustomerWebPayment', + meta: { + title: 'webPayment', + icon: 'paid', + }, + component: () => + import('src/pages/Customer/Card/CustomerWebPayment.vue'), + }, + { + path: 'file-management', + name: 'CustomerFileManagement', + meta: { + title: 'fileManagement', + icon: 'paid', + }, + component: () => + import( + 'src/pages/Customer/Card/CustomerFileManagement.vue' + ), + }, + { + path: 'unpaid', + name: 'CustomerUnpaid', + meta: { + title: 'unpaid', + icon: 'paid', + }, + component: () => + import('src/pages/Customer/Card/CustomerUnpaid.vue'), + }, + ], }, ], }, From 9c351b6494778ff03502ea1f35c700cc08383336 Mon Sep 17 00:00:00 2001 From: carlosfonseca Date: Wed, 31 Jan 2024 08:56:19 -0500 Subject: [PATCH 2/3] Tarjeta pago web sin contenido --- src/pages/Customer/Card/CustomerWebPayment.vue | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/pages/Customer/Card/CustomerWebPayment.vue b/src/pages/Customer/Card/CustomerWebPayment.vue index 0fcb6c46b..676c9f551 100644 --- a/src/pages/Customer/Card/CustomerWebPayment.vue +++ b/src/pages/Customer/Card/CustomerWebPayment.vue @@ -1,3 +1,17 @@ + + + + From b06e5b9252d9eae235e7410cc829c9b5c84f66e1 Mon Sep 17 00:00:00 2001 From: carlosfonseca Date: Fri, 2 Feb 2024 08:21:23 -0500 Subject: [PATCH 3/3] Correcciones comentarios pr --- src/pages/Customer/Card/CustomerBalance.vue | 26 +++--- .../Customer/Card/CustomerCreditContracts.vue | 5 +- src/pages/Customer/Card/CustomerCredits.vue | 64 ++++++--------- src/pages/Customer/Card/CustomerGreuges.vue | 82 ++++++++----------- .../Customer/Card/CustomerRecoveries.vue | 39 ++++----- src/pages/Customer/Card/CustomerSamples.vue | 62 ++++++-------- .../Customer/Defaulter/CustomerDefaulter.vue | 43 ++++------ .../ExtendedList/CustomerExtendedList.vue | 40 ++++----- .../Notifications/CustomerNotifications.vue | 30 +++---- .../CustomerCreditContractsInsurance.vue | 37 ++++----- .../components/CustomerSamplesCreate.vue | 8 -- src/router/modules/customer.js | 27 ++++++ 12 files changed, 208 insertions(+), 255 deletions(-) diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue index db514fab0..e74933477 100644 --- a/src/pages/Customer/Card/CustomerBalance.vue +++ b/src/pages/Customer/Card/CustomerBalance.vue @@ -22,12 +22,12 @@ const state = useState(); const user = state.getUser(); const clientRisks = ref(null); +const clientRisksRef = ref(null); const companiesOptions = ref([]); const companyId = ref(null); -const rows = ref(null); -const workerId = ref(0); const receiptsRef = ref(null); -const clientRisksRef = ref(null); +const rows = ref([]); +const workerId = ref(null); const filterCompanies = { order: ['code'] }; const params = { @@ -44,44 +44,42 @@ const tableColumnComponents = { payed: { component: 'span', props: () => {}, - event: () => {}, + event: () => (workerId.value = null), }, created: { component: 'span', props: () => {}, - event: () => {}, + event: () => (workerId.value = null), }, userName: { component: QBtn, props: () => ({ flat: true, color: 'blue' }), - event: (prop) => { - workerId.value = prop.row.clientFk; - }, + event: ({ row }) => (workerId.value = row.clientFk), }, description: { component: 'span', props: () => {}, - event: () => {}, + event: () => (workerId.value = null), }, bankFk: { component: 'span', props: () => {}, - event: () => {}, + event: () => (workerId.value = null), }, debit: { component: 'span', props: () => {}, - event: () => {}, + event: () => (workerId.value = null), }, credit: { component: 'span', props: () => {}, - event: () => {}, + event: () => (workerId.value = null), }, balance: { component: 'span', props: () => {}, - event: () => {}, + event: () => (workerId.value = null), }, isConciliate: { component: QCheckbox, @@ -89,7 +87,7 @@ const tableColumnComponents = { disable: true, 'model-value': Boolean(prop.value), }), - event: () => {}, + event: () => (workerId.value = null), }, }; diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue index 04e8eccef..71bf42fd4 100644 --- a/src/pages/Customer/Card/CustomerCreditContracts.vue +++ b/src/pages/Customer/Card/CustomerCreditContracts.vue @@ -88,6 +88,7 @@ const updateData = () => { :class="{ 'customer-card': true, 'q-mb-md': index < rows.length - 1, + 'is-active': !item.finished, }" > @@ -192,12 +193,14 @@ const updateData = () => { } .customer-card { border: 2px solid var(--vn-light-gray); - background-color: var(--vn-light-gray); border-radius: 10px; padding: 10px; display: flex; justify-content: space-between; } +.is-active { + background-color: var(--vn-light-gray); +} diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue index 077312f1b..6852b42eb 100644 --- a/src/pages/Customer/Card/CustomerCredits.vue +++ b/src/pages/Customer/Card/CustomerCredits.vue @@ -1,65 +1,52 @@