Merge branch 'dev' into 7896_down_devToTest_2436

src/pages/Account/Card/AccountPrivileges.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -12,17 +12,14 @@ const route = useRoute();
 
 const rolesOptions = ref([]);
 const formModelRef = ref();
+watch(
+    () => route.params.id,
+    () => formModelRef.value.reset()
+);
 </script>
 <template>
     <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" />
-    <FormModel
-        ref="formModelRef"
-        model="AccountPrivileges"
-        :url="`VnUsers/${route.params.id}/privileges`"
-        :url-create="`VnUsers/${route.params.id}/privileges`"
-        auto-load
-        @on-data-saved="formModelRef.fetch()"
-    >
+    <FormModel ref="formModelRef" model="AccountPrivileges" url="VnUsers" auto-load>
         <template #form="{ data }">
             <div class="q-gutter-y-sm">
                 <QCheckbox

src/pages/InvoiceOut/InvoiceOutGlobalForm.vue

@@ -101,7 +101,17 @@ onMounted(async () => {
                 dense
                 outlined
                 rounded
-            />
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>
+                                #{{ scope.opt?.id }} {{ scope.opt?.name }}
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
             <VnSelect
                 :label="t('invoiceOutSerialType')"
                 v-model="formData.serialType"

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -226,10 +226,18 @@ watchEffect(selectedRows);
                     url="Tickets"
                     v-model="data.ticketFk"
                     :label="t('invoiceOutList.tableVisibleColumns.ticket')"
-                    :options="ticketsOptions"
-                    option-label="nickname"
+                    option-label="id"
                     option-value="id"
-                />
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
                 <span class="q-ml-md">O</span>
             </div>
             <VnSelect