fix: improve monitorClient.department
gitea/salix-front/pipeline/head This commit looks good
Details
gitea/salix-front/pipeline/head This commit looks good
Details
This commit is contained in:
parent
cce3a0cef8
commit
d60d7da33c
|
@ -26,9 +26,11 @@ const filter = computed(() => {
|
|||
if (!formatFrom && formatTo) stamp = { lte: formatTo };
|
||||
else if (formatFrom && !formatTo) stamp = { gte: formatFrom };
|
||||
else if (formatFrom && formatTo) stamp = { between: [formatFrom, formatTo] };
|
||||
|
||||
return Object.assign(obj, {
|
||||
where: { 'v.stamp': stamp, departmentFk: state.getUser().departmentFk },
|
||||
where: {
|
||||
'v.stamp': stamp,
|
||||
'c.departmentFk': state.getUser().value.departmentFk,
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
|
@ -36,8 +38,6 @@ function exprBuilder(param, value) {
|
|||
switch (param) {
|
||||
case 'clientFk':
|
||||
return { [`c.id`]: value };
|
||||
case 'departmentFk':
|
||||
return { [`c.${param}`]: value };
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -70,9 +70,13 @@ const columns = computed(() => [
|
|||
align: 'left',
|
||||
name: 'departmentFk',
|
||||
label: t('customer.summary.team'),
|
||||
component: 'select',
|
||||
attrs: {
|
||||
url: 'Departments',
|
||||
columnFilter: {
|
||||
component: 'select',
|
||||
attrs: {
|
||||
url: 'Departments',
|
||||
},
|
||||
alias: 'c',
|
||||
inWhere: true,
|
||||
},
|
||||
columnField: {
|
||||
component: null,
|
||||
|
|
Loading…
Reference in New Issue