chamomind/jws-frontend
chamomind/jws-frontend
7
0
Fork 0
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop'
Some checks failed
Spell Check / Spell Check with Typos (push) Failing after 6s
Details

Browse source
This commit is contained in:
Methapon2001 2025-09-18 10:29:45 +07:00
commit 35e23aa291
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pages/03_customer-management/MainPage.vue
View file

@ -213,10 +213,10 @@ async function triggerExport() {
status: currentStatus.value === 'All' ? undefined : currentStatus.value, status: currentStatus.value === 'All' ? undefined : currentStatus.value,
startDate: searchDate.value[0], startDate: searchDate.value[0],
endDate: searchDate.value[1], endDate: searchDate.value[1],
businessType: filterBusinessType.value, businessTypeId: filterBusinessType.value,
province: filterAddress.provinceId || undefined, provinceId: filterAddress.provinceId || undefined,
district: filterAddress.districtId || undefined, districtId: filterAddress.districtId || undefined,
subDistrict: filterAddress.subDistrictId || undefined, subDistrictId: filterAddress.subDistrictId || undefined,
customerType: customerType:
customerTypeSelected.value.value === 'customerLegalEntity' customerTypeSelected.value.value === 'customerLegalEntity'
? CustomerType.Corporate ? CustomerType.Corporate
@ -489,8 +489,8 @@ onMounted(async () => await init());
v-model="searchDate" v-model="searchDate"
:active=" :active="
($q.screen.lt.md && currentStatus !== 'All') || ($q.screen.lt.md && currentStatus !== 'All') ||
!!filterBusinessType || (currentTab === 'employer' && !!filterBusinessType) ||
!!filterAddress.provinceId (currentTab === 'employer' && !!filterAddress.provinceId)
" "
> >
<div <div

8
src/pages/03_customer-management/TabCustomer.vue
View file

@ -186,10 +186,10 @@ async function fetchListCustomer(fetchStats = false, mobileFetch?: boolean) {
? 'ACTIVE' ? 'ACTIVE'
: 'INACTIVE', : 'INACTIVE',
query: props.inputSearch, query: props.inputSearch,
businessType: props.filterBusinessType, businessTypeId: props.filterBusinessType,
province: props.filterAddress.provinceId || undefined, provinceId: props.filterAddress.provinceId || undefined,
district: props.filterAddress.districtId || undefined, districtId: props.filterAddress.districtId || undefined,
subDistrict: props.filterAddress.subDistrictId || undefined, subDistrictId: props.filterAddress.subDistrictId || undefined,
startDate: props.searchDate[0], startDate: props.searchDate[0],
endDate: props.searchDate[1], endDate: props.searchDate[1],
customerType: ( customerType: (

16
src/stores/customer/index.ts
View file

@ -115,10 +115,10 @@ const useCustomerStore = defineStore('api-customer', () => {
customerType?: CustomerType; customerType?: CustomerType;
startDate?: string; startDate?: string;
endDate?: string; endDate?: string;
businessType?: string; businessTypeId?: string;
province?: string; provinceId?: string;
district?: string; districtId?: string;
subDistrict?: string; subDistrictId?: string;
}, },
Data extends Pagination< Data extends Pagination<
(Customer & (Customer &
@ -488,10 +488,10 @@ const useCustomerStore = defineStore('api-customer', () => {
activeBranchOnly?: boolean; activeBranchOnly?: boolean;
startDate?: string | Date; startDate?: string | Date;
endDate?: string | Date; endDate?: string | Date;
businessType?: string; businessTypeId?: string;
province?: string; provinceId?: string;
district?: string; districtId?: string;
subDistrict?: string; subDistrictId?: string;
}) { }) {
let url = baseUrl + '/' + 'customer-export'; let url = baseUrl + '/' + 'customer-export';