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

Merge branch 'master' into 6820-remove-rule
gitea/salix-front/pipeline/pr-master This commit looks good Details

This commit is contained in:
Pablo Natek 2024-08-08 12:59:36 +00:00
parent c5358313df 10cbf6f46e
commit eb74297d06
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/components/common/VnLog.vue
View File

@ -214,7 +214,7 @@ function getLogTree(data) {
} }
nLogs++; nLogs++;
modelLog.logs.push(log); modelLog.logs.push(log);
modelLog.summaryId = modelLog.logs[0].summaryId;
// Changes // Changes
const notDelete = log.action != 'delete'; const notDelete = log.action != 'delete';
const olds = (notDelete ? log.oldInstance : null) || {}; const olds = (notDelete ? log.oldInstance : null) || {};
@ -472,12 +472,17 @@ watch(
> >
{{ t(modelLog.modelI18n) }} {{ t(modelLog.modelI18n) }}
</QChip> </QChip>
<span class="model-id" v-if="modelLog.summaryId"
>#{{ modelLog.summaryId }}</span <span
> class="model-id q-mr-xs"
<span class="model-value" :title="modelLog.showValue"> v-if="modelLog.summaryId"
{{ modelLog.showValue }} v-text="`#${modelLog.summaryId}`"
</span> />
<span
class="model-value"
:title="modelLog.showValue"
v-text="modelLog.showValue"
/>
<QBtn <QBtn
flat flat
round round

1
src/pages/Route/Card/RouteFilter.vue
View File

@ -119,6 +119,7 @@ const emit = defineEmits(['search']);
sort-by="numberPlate ASC" sort-by="numberPlate ASC"
option-value="id" option-value="id"
option-label="numberPlate" option-label="numberPlate"
option-filter-value="numberPlate"
dense dense
outlined outlined
rounded rounded

1
src/pages/Route/RouteList.vue
View File

@ -99,6 +99,7 @@ const columns = computed(() => [
url: 'vehicles', url: 'vehicles',
fields: ['id', 'numberPlate'], fields: ['id', 'numberPlate'],
optionLabel: 'numberPlate', optionLabel: 'numberPlate',
optionFilterValue: 'numberPlate',
find: { find: {
value: 'vehicleFk', value: 'vehicleFk',
label: 'vehiclePlateNumber', label: 'vehiclePlateNumber',