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

8627-devToTest #1421

Merged
alexm merged 768 commits from 8627-devToTest into test 2025-02-18 12:37:37 +00:00
Conversation 0 Commits 768 Files Changed 335 +13 -24
2 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 00b7883aed - Show all commits

35
src/pages/Department/Card/DepartmentBasicData.vue
View File

@ -1,26 +1,15 @@
<script setup> <script setup>
import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n';
import FormModel from 'components/FormModel.vue'; import FormModel from 'components/FormModel.vue';
import VnRow from 'components/ui/VnRow.vue'; import VnRow from 'components/ui/VnRow.vue';
import VnInput from 'src/components/common/VnInput.vue'; import VnInput from 'src/components/common/VnInput.vue';
import VnSelect from 'src/components/common/VnSelect.vue'; import VnSelect from 'src/components/common/VnSelect.vue';
const route = useRoute();
const { t } = useI18n();
</script> </script>
<template> <template>
<FormModel <FormModel model="Department" auto-load class="full-width">
:url="`Departments/${route.params.id}`"
model="department"
auto-load
class="full-width"
>
<template #form="{ data, validate }"> <template #form="{ data, validate }">
<VnRow> <VnRow>
<VnInput <VnInput
:label="t('globals.name')" :label="$t('globals.name')"
v-model="data.name" v-model="data.name"
:rules="validate('globals.name')" :rules="validate('globals.name')"
clearable clearable
@ -28,28 +17,28 @@ const { t } = useI18n();
/> />
<VnInput <VnInput
v-model="data.code" v-model="data.code"
:label="t('globals.code')" :label="$t('globals.code')"
:rules="validate('globals.code')" :rules="validate('globals.code')"
clearable clearable
/> />
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnInput <VnInput
:label="t('department.chat')" :label="$t('department.chat')"
v-model="data.chatName" v-model="data.chatName"
:rules="validate('department.chat')" :rules="validate('department.chat')"
clearable clearable
/> />
<VnInput <VnInput
v-model="data.notificationEmail" v-model="data.notificationEmail"
:label="t('globals.params.email')" :label="$t('globals.params.email')"
:rules="validate('globals.params.email')" :rules="validate('globals.params.email')"
clearable clearable
/> />
</VnRow> </VnRow>
<VnRow> <VnRow>
<VnSelect <VnSelect
:label="t('department.bossDepartment')" :label="$t('department.bossDepartment')"
v-model="data.workerFk" v-model="data.workerFk"
url="Workers/search" url="Workers/search"
option-value="id" option-value="id"
@ -59,7 +48,7 @@ const { t } = useI18n();
:rules="validate('department.workerFk')" :rules="validate('department.workerFk')"
/> />
<VnSelect <VnSelect
:label="t('department.selfConsumptionCustomer')" :label="$t('department.selfConsumptionCustomer')"
v-model="data.clientFk" v-model="data.clientFk"
url="Clients" url="Clients"
option-value="id" option-value="id"
@ -71,11 +60,11 @@ const { t } = useI18n();
</VnRow> </VnRow>
<VnRow> <VnRow>
<QCheckbox <QCheckbox
:label="t('department.telework')" :label="$t('department.telework')"
v-model="data.isTeleworking" v-model="data.isTeleworking"
/> />
<QCheckbox <QCheckbox
:label="t('department.notifyOnErrors')" :label="$t('department.notifyOnErrors')"
v-model="data.hasToMistake" v-model="data.hasToMistake"
:false-value="0" :false-value="0"
:true-value="1" :true-value="1"
@ -83,17 +72,17 @@ const { t } = useI18n();
</VnRow> </VnRow>
<VnRow> <VnRow>
<QCheckbox <QCheckbox
:label="t('department.worksInProduction')" :label="$t('department.worksInProduction')"
v-model="data.isProduction" v-model="data.isProduction"
/> />
<QCheckbox <QCheckbox
:label="t('department.hasToRefill')" :label="$t('department.hasToRefill')"
v-model="data.hasToRefill" v-model="data.hasToRefill"
/> />
</VnRow> </VnRow>
<VnRow> <VnRow>
<QCheckbox <QCheckbox
:label="t('department.hasToSendMail')" :label="$t('department.hasToSendMail')"
v-model="data.hasToSendMail" v-model="data.hasToSendMail"
/> />
</VnRow> </VnRow>

2
src/pages/Department/Card/DepartmentDescriptor.vue
View File

@ -50,7 +50,7 @@ const { openConfirmationModal } = useVnConfirm();
:url="`Departments/${entityId}`" :url="`Departments/${entityId}`"
:summary="$props.summary" :summary="$props.summary"
:to-module="{ name: 'WorkerDepartment' }" :to-module="{ name: 'WorkerDepartment' }"
data-key="department" data-key="Department"
> >
<template #menu="{}"> <template #menu="{}">
<QItem <QItem