Merge branch 'develop'

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

View file

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

View file

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