fix: refs #7129 remove templates

src/components/VnTable/VnTable.vue

@@ -275,7 +275,7 @@ defineExpose({
                         />
                         <VnTableOrder
                             v-if="
-                                !(col?.columnFilter === false) &&
+                                col?.columnFilter !== false &&
                                 col?.name !== 'tableActions'
                             "
                             v-model="orders[col.name]"

src/pages/Route/Cmr/CmrList.vue

@@ -37,23 +37,25 @@ const columns = computed(() => [
         cardVisible: true,
     },
     {
+        align: 'left',
         label: t('route.cmr.list.ticketFk'),
         name: 'ticketFk',
     },
     {
+        align: 'left',
         label: t('route.cmr.list.routeFk'),
         name: 'routeFk',
     },
     {
+        align: 'left',
         label: t('route.cmr.list.clientFk'),
         name: 'clientFk',
     },
     {
-        align: 'left',
+        align: 'right',
         label: t('route.cmr.list.country'),
         name: 'countryFk',
         cardVisible: true,
-        component: 'select',
         attrs: {
             url: 'countries',
             fields: ['id', 'name'],
@@ -62,30 +64,35 @@ const columns = computed(() => [
         },
         columnFilter: {
             inWhere: true,
-        },
-    },
-    {
-        align: 'center',
-        label: t('route.cmr.list.shipped'),
-        name: 'shipped',
-        cardVisible: true,
-        component: 'date',
-        columnFilter: {
-            inWhere: true,
-        },
-        format: ({ date }) => toDate(date),
-    },
-    {
-        align: 'center',
-        name: 'warehouseFk',
-        label: t('globals.warehouse'),
             component: 'select',
-        attrs: {
-            options: warehouses.value,
         },
+        format: ({ countryName }) => countryName,
     },
     {
         align: 'right',
+        label: t('route.cmr.list.shipped'),
+        name: 'shipped',
+        cardVisible: true,
+        columnFilter: {
+            component: 'date',
+            inWhere: true,
+        },
+        format: ({ shipped }) => toDateHourMin(shipped),
+    },
+    {
+        align: 'right',
+        name: 'warehouseFk',
+        label: t('globals.warehouse'),
+        columnFilter: {
+            component: 'select',
+        },
+        attrs: {
+            options: warehouses.value,
+        },
+        format: ({ warehouseName }) => warehouseName,
+    },
+    {
+        align: 'center',
         name: 'tableActions',
         actions: [
             {
@@ -166,14 +173,5 @@ function downloadPdfs() {
                 <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
         </template>
-        <template #column-shipped="{ row }">
-            {{ toDateHourMin(row.shipped) }}
-        </template>
-        <template #column-warehouseFk="{ row }">
-            {{ row.warehouseName }}
-        </template>
-        <template #column-countryFk="{ row }">
-            {{ row.countryName }}
-        </template>
     </VnTable>
 </template>