Merge branch 'dev' into warmFix_invoiceOut_Global
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
gitea/salix-front/pipeline/pr-dev This commit looks good
Details
This commit is contained in:
commit
18cc3888e5
|
@ -3,11 +3,12 @@ import { ref, computed } from 'vue';
|
|||
import { useI18n } from 'vue-i18n';
|
||||
import { useRoute } from 'vue-router';
|
||||
import VnTable from 'components/VnTable/VnTable.vue';
|
||||
import FetchData from 'src/components/FetchData.vue';
|
||||
const tableRef = ref();
|
||||
const payrollComponents = ref([]);
|
||||
const { t } = useI18n();
|
||||
const route = useRoute();
|
||||
const entityId = computed(() => route.params.id);
|
||||
|
||||
const columns = computed(() => [
|
||||
{
|
||||
align: 'left',
|
||||
|
@ -25,8 +26,9 @@ const columns = computed(() => [
|
|||
create: true,
|
||||
component: 'select',
|
||||
attrs: {
|
||||
url: 'payrollComponents',
|
||||
fields: ['id', 'name'],
|
||||
options: payrollComponents,
|
||||
optionLabel: 'name',
|
||||
optionValue: 'id',
|
||||
},
|
||||
cardVisible: true,
|
||||
},
|
||||
|
@ -73,6 +75,16 @@ const columns = computed(() => [
|
|||
]);
|
||||
</script>
|
||||
<template>
|
||||
<FetchData
|
||||
url="PayrollComponents"
|
||||
:filter="{
|
||||
fields: ['id', 'name'],
|
||||
where: { name: { neq: '' } },
|
||||
order: 'name ASC',
|
||||
}"
|
||||
@on-fetch="(data) => (payrollComponents = data)"
|
||||
auto-load
|
||||
/>
|
||||
<VnTable
|
||||
ref="tableRef"
|
||||
data-key="WorkerBalance"
|
||||
|
@ -94,6 +106,7 @@ const columns = computed(() => [
|
|||
:is-editable="true"
|
||||
:use-model="true"
|
||||
:default-remove="false"
|
||||
search-url="balance"
|
||||
/>
|
||||
</template>
|
||||
<i18n>
|
||||
|
|
|
@ -134,6 +134,7 @@ const columns = computed(() => [
|
|||
:is-editable="true"
|
||||
:use-model="true"
|
||||
:default-remove="false"
|
||||
search-url="formation"
|
||||
/>
|
||||
</template>
|
||||
<style lang="scss" scoped>
|
||||
|
|
|
@ -100,5 +100,6 @@ const columns = [
|
|||
:is-editable="true"
|
||||
:use-model="true"
|
||||
:default-remove="false"
|
||||
search-url="medical"
|
||||
/>
|
||||
</template>
|
||||
|
|
|
@ -71,6 +71,7 @@ function setNotifications(data) {
|
|||
:default-remove="false"
|
||||
:default-save="false"
|
||||
@on-fetch="setNotifications"
|
||||
search-url="notifications"
|
||||
>
|
||||
<template #body>
|
||||
<div
|
||||
|
|
|
@ -63,6 +63,7 @@ function reloadData() {
|
|||
url="DeviceProductionUsers"
|
||||
:filter="{ where: { userFk: routeId } }"
|
||||
order="id"
|
||||
search-url="pda"
|
||||
auto-load
|
||||
>
|
||||
<template #body="{ rows }">
|
||||
|
|
Loading…
Reference in New Issue