Merge branch 'master' into hotfix_newCustomer_SalesPerson

src/pages/Account/AccountList.vue

@@ -5,7 +5,8 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
+import AccountFilter from './AccountFilter.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@@ -18,14 +19,6 @@ const columns = computed(() => [
         isId: true,
         field: 'id',
         cardVisible: true,
-        columnFilter: {
-            component: 'select',
-            name: 'search',
-            attrs: {
-                url: 'VnUsers/preview',
-                fields: ['id', 'name'],
-            },
-        },
     },
     {
         align: 'left',
@@ -36,9 +29,6 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        columnFilter: {
-            inWhere: true,
-        },
         cardVisible: true,
         create: true,
     },
@@ -50,9 +40,6 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        columnFilter: {
-            inWhere: true,
-        },
         cardVisible: true,
         create: true,
     },
@@ -105,7 +92,11 @@ const exprBuilder = (param, value) => {
         :label="t('account.search')"
         :info="t('account.searchInfo')"
     />
-
+    <RightMenu>
+        <template #right-panel>
+            <AccountFilter data-key="AccountUsers" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="AccountUsers"
@@ -115,6 +106,8 @@ const exprBuilder = (param, value) => {
         default-mode="table"
         redirect="account"
         :use-model="true"
+        :right-search="false"
+        auto-load
     />
 </template>
 

src/pages/Account/Card/AccountCard.vue

@@ -10,7 +10,7 @@ const { t } = useI18n();
     <VnCard
         data-key="Account"
         :descriptor="AccountDescriptor"
-        search-data-key="AccountUsers"
+        search-data-key="AccountList"
         :searchbar-props="{
             url: 'VnUsers/preview',
             label: t('account.search'),