hrms-bangkok/hrms-mgt
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' into working

Browse source 
# Conflicts:
#	src/interface/request/main/main.ts
#	src/modules/08_registryEmployee/router.ts
#	src/modules/08_registryEmployee/views/Main.vue
This commit is contained in:
Tanyalak 2023-08-16 17:06:58 +07:00
commit 06c3d36c7a
333 changed files with 64333 additions and 12866 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/06_retirement/components/ListRetirement/AddList.vue
View file

@ -16,6 +16,7 @@ const retireld_params = route.params.id;
const props = defineProps({
retireld: String,
profileId: String,
dataProfile: Object,
UpdateListId: {
type: Function,
default: () => console.log("UpdateListId"),
@ -112,8 +113,8 @@ const rows = ref<any>([
watch(modal, () => {
if (modal.value === true) {
retireld.value = props.retireld;
if (type_params === "officer") {
type.value = type_params;
if (props.dataProfile.type === "OFFICER") {
type.value = "officer";
} else type.value = "all";
fecthlistRetire();
@ -125,8 +126,7 @@ const fecthlistRetire = async () => {
await http
.get(config.API.profileOrganizRoot)
.then((res) => {
// console.log(res);
console.log(res);
const id = res.data.result[0].id;
if (id !== "") {
findlist(id);