verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 77 Releases Wiki Activity

#6943 - Customer module find salesPersons out of first get #711

Merged
jsegarra merged 25 commits from 6943_fix_customer_module into dev 2024-09-23 12:25:22 +00:00
Conversation 2 Commits 25 Files Changed 12 +18 -13
2 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ccfe61d777 - Show all commits

6
src/components/common/VnSelect.vue
View File

@ -38,6 +38,10 @@ const $props = defineProps({
type: [Array],
default: () => [],
},
exprBuilder: {
type: Function,
default: null,
},
isClearable: {
type: Boolean,
default: true,
@ -179,6 +183,8 @@ async function fetchFilter(val) {
}, {});
} else defaultWhere = { [key]: getVal(val) };
const where = { ...(val ? defaultWhere : {}), ...$props.where };
if (typeof $props.exprBuilder === 'function')
alexm commented 2024-09-19 08:10:19 +00:00
Outdated
Review
Copy Link

if (typeof $props.exprBuilder)

if (typeof $props.exprBuilder)
jsegarra commented 2024-09-19 08:28:55 +00:00
Outdated
Review
Copy Link

Mi no entender, y el editor tampoco

Mi no entender, y el editor tampoco
Object.assign(where, $props.exprBuilder(key, val));
const fetchOptions = { where, include, limit };
if (fields) fetchOptions.fields = fields;
if (sortBy) fetchOptions.order = sortBy;

25
src/pages/Customer/Card/CustomerBasicData.vue
View File

@ -16,19 +16,19 @@ const { t } = useI18n();
const businessTypes = ref([]);
const contactChannels = ref([]);
const title = ref();
const handleSalesModelValue = (val) => {
filter.value.and[1] = {
or: [
{ name: val },
{ nickname: { like: '%' + val + '%' } },
{ code: { like: `${val}%` } },
],
const handleSalesModelValue = (val) => ({
or: [
alexm commented 2024-09-17 09:37:58 +00:00
Outdated
Review
Copy Link

No hay que dar por hecho una estructura del where, puede dar problemas

No hay que dar por hecho una estructura del where, puede dar problemas
jsegarra commented 2024-09-17 11:31:07 +00:00
Outdated
Review
Copy Link

Lo revisamos porque ni con mergeWhere, ni mergeFilter, ni mergeFields
El problema es que o bien la variable val está vacia o no recoge el ultimo cambio del VnSelect filter

En otor momento revisamos la solución

Lo revisamos porque ni con mergeWhere, ni mergeFilter, ni mergeFields El problema es que o bien la variable val está vacia o no recoge el ultimo cambio del VnSelect filter En otor momento revisamos la solución
{ name: val },
{ nickname: { like: '%' + val + '%' } },
{ code: { like: `${val}%` } },
],
});
const exprBuilder = (param, value) => {
return {
and: [{ active: { neq: false } }, handleSalesModelValue(value)],
};
};
const filter = ref({
and: [{ active: { neq: false } }],
});
</script>
<template>
<FetchData
@ -109,11 +109,10 @@ const filter = ref({
:params="{
departmentCodes: ['VT', 'shopping'],
}"
:where="filter"
:fields="['id', 'nickname']"
sort-by="nickname ASC"
:rules="validate('client.salesPersonFk')"
@filter="handleSalesModelValue"
:expr-builder="exprBuilder"
emit-value
auto-load
>