Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me
# Conflicts: # src/api/05_placement/api.placement.ts # src/api/index.ts # src/modules/05_placement/components/pass/Table.vue
This commit is contained in:
commit
3230b5e8c4
29 changed files with 5189 additions and 4217 deletions
|
|
@ -1,10 +1,14 @@
|
|||
import type { zipCodeOption } from "../../components/PersonalDetail/profileType";
|
||||
interface DataOption {
|
||||
id: number | string;
|
||||
name: string;
|
||||
id: number|null;
|
||||
name:string|null;
|
||||
disable?: boolean;
|
||||
}
|
||||
interface DataOption1 {
|
||||
id: string|null;
|
||||
name:string|null;
|
||||
disable?: boolean;
|
||||
}
|
||||
|
||||
interface DataOptionInsignia {
|
||||
id: string;
|
||||
name: string;
|
||||
|
|
@ -137,6 +141,7 @@ export type {
|
|||
AddressOps,
|
||||
Pagination,
|
||||
EduOps,
|
||||
DataOption1,
|
||||
InsigniaOps,
|
||||
CheckboxItem,
|
||||
Property,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue