diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue index 606799e50..9fcbef11e 100644 --- a/src/components/VnSelectProvince.vue +++ b/src/components/VnSelectProvince.vue @@ -1,5 +1,5 @@ <script setup> -import { ref, watch } from 'vue'; +import { ref } from 'vue'; import { useValidator } from 'src/composables/useValidator'; import { useI18n } from 'vue-i18n'; diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue index 82c3b48e0..25082697d 100644 --- a/src/pages/Item/ItemRequest.vue +++ b/src/pages/Item/ItemRequest.vue @@ -258,15 +258,28 @@ onBeforeMount(() => { <template #body-cell-attender="{ row }"> <QTd> <VnSelect + url="Workers/search" v-model="row.attenderFk" - :where="{ role: 'buyer' }" - sort-by="id" - url="Workers" + :params="{ departmentCodes: ['shopping'] }" + :fields="['id', 'nickname']" + sort-by="nickname ASC" hide-selected - option-label="firstName" + option-label="nickname" option-value="id" dense - /> + > + <template #option="scope"> + <QItem v-bind="scope.itemProps"> + <QItemSection> + <QItemLabel>{{ scope.opt?.name }}</QItemLabel> + <QItemLabel caption + >{{ scope.opt?.nickname }}, + {{ scope.opt?.code }}</QItemLabel + > + </QItemSection> + </QItem> + </template> + </VnSelect> </QTd> </template> <template #body-cell-item="{ row }"> diff --git a/src/pages/Item/ItemTypeCreate.vue b/src/pages/Item/ItemTypeCreate.vue index 290a40389..60c037510 100644 --- a/src/pages/Item/ItemTypeCreate.vue +++ b/src/pages/Item/ItemTypeCreate.vue @@ -52,15 +52,27 @@ const redirectToItemTypeBasicData = (_, { id }) => { </VnRow> <VnRow> <VnSelect + url="Workers/search" v-model="data.workerFk" - :label="t('itemType.shared.worker')" - url="Workers" - sort-by="firstName ASC" - :fields="['id', 'firstName']" + :label="t('shared.worker')" + sort-by="nickname ASC" + :fields="['id', 'nickname']" + :params="{ departmentCodes: ['shopping'] }" + option-label="nickname" option-value="id" - option-label="firstName" hide-selected - /> + ><template #option="scope"> + <QItem v-bind="scope.itemProps"> + <QItemSection> + <QItemLabel>{{ scope.opt?.name }}</QItemLabel> + <QItemLabel caption + >{{ scope.opt?.nickname }}, + {{ scope.opt?.code }}</QItemLabel + > + </QItemSection> + </QItem> + </template> + </VnSelect> <VnSelect v-model="data.categoryFk" :label="t('itemType.shared.category')" diff --git a/src/pages/ItemType/Card/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue index d35fbb17d..1d4a5cf94 100644 --- a/src/pages/ItemType/Card/ItemTypeBasicData.vue +++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue @@ -41,15 +41,27 @@ const temperaturesOptions = ref([]); </VnRow> <VnRow> <VnSelect + url="Workers/search" v-model="data.workerFk" :label="t('shared.worker')" - url="Workers" - sort-by="firstName ASC" - :fields="['id', 'firstName']" + sort-by="nickname ASC" + :fields="['id', 'nickname']" + :params="{ departmentCodes: ['shopping'] }" + option-label="nickname" option-value="id" - option-label="firstName" hide-selected - /> + ><template #option="scope"> + <QItem v-bind="scope.itemProps"> + <QItemSection> + <QItemLabel>{{ scope.opt?.name }}</QItemLabel> + <QItemLabel caption + >{{ scope.opt?.nickname }}, + {{ scope.opt?.code }}</QItemLabel + > + </QItemSection> + </QItem> + </template></VnSelect + > <VnSelect v-model="data.categoryFk" :label="t('shared.category')"