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

Merge branch 'develop'

Browse source
This commit is contained in:
Methapon2001 2025-02-07 17:27:06 +07:00
commit 78513543d4
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/03_customer-management/FormEmployeeWorkHistory.vue
View file

@ -268,7 +268,7 @@ const workplaceFilter = selectFilterOptionRefMod(
hide-bottom-space hide-bottom-space
class="col-md-4 col-6" class="col-md-4 col-6"
:label="$t('customerEmployee.formWorkHistory.permitIssuedAt')" :label="$t('customerEmployee.formWorkHistory.permitIssuedAt')"
v-model="work.workPermitIssueAt" v-model="work.workPermitAt"
/> />
<DatePicker <DatePicker

2
src/stores/employee/types.ts
View file

@ -212,7 +212,7 @@ export type EmployeeWorkCreate = {
workPermitExpireDate?: Date | null; workPermitExpireDate?: Date | null;
workPermitIssueDate?: Date | null; workPermitIssueDate?: Date | null;
workPermitNo?: string; workPermitNo?: string;
workPermitIssueAt?: string; workPermitAt?: string;
identityNo?: string; identityNo?: string;
workplace?: string; workplace?: string;
jobType?: string; jobType?: string;