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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
STW_TTTY\stwtt 2024-07-03 14:48:11 +07:00
commit b971e9eab4
2 changed files with 131 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

241
src/modules/15_development/components/Target.vue
View file

@ -29,7 +29,14 @@ const route = useRoute();
const projectId = ref<string>(route.params.id.toLocaleString());
const $q = useQuasar();
const mixin = useCounterMixin();
const { dialogRemove, showLoader, hideLoader, messageError, success } = mixin;
const {
dialogRemove,
showLoader,
hideLoader,
messageError,
success,
dialogConfirm,
} = mixin;
const groupTargetData: any = reactive({
targetData: [{}],
});
@ -269,123 +276,127 @@ function onClickOpenDialog(type: string, target: string) {
}
/** เพิ่ม/แก้ไขกลุ่มเป้าหมาย */
async function onSubmitGroup() {
if (isTarget.value === "planned") {
await http
.put(
config.API.developmentMainTab(
isEdit.value ? "tab2_1_edit" : "tab2_1_add",
isEdit.value ? editId.value : projectId.value
),
{
groupTarget: formGroupTarget.groupTarget,
groupTargetSub: formGroupTarget.groupTargetSub,
positions:
formGroupTarget.groupTarget !== "OUTSIDERS"
? formGroupTarget.positions.map((v) => ({
position: v.position ? v.position : "",
posTypePlannedId: v.posTypeId ? v.posTypeId : "",
posLevelPlannedId: v.posLevelId ? v.posLevelId : "",
}))
: [],
type:
formGroupTarget.groupTarget === "OUTSIDERS"
? formGroupTarget.type
: "",
amount: formGroupTarget.amount,
}
)
.then(() => {
success($q, "บันทึกข้อมูลสำเร็จ");
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
} else {
await http
.put(
config.API.developmentMainTab(
isEdit.value ? "tab2_3_edit" : "tab2_3_add",
isEdit.value ? editId.value : projectId.value
),
{
groupTarget: formGroupTarget.groupTarget,
groupTargetSub: formGroupTarget.groupTargetSub,
position: formGroupTarget.position,
posTypeActualId: formGroupTarget.posType,
posLevelActualId: formGroupTarget.posLevel,
type: formGroupTarget.type,
amount: formGroupTarget.amount,
}
)
.then(() => {
success($q, "บันทึกข้อมูลสำเร็จ");
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
}
setTimeout(() => {
fetchData(projectId.value);
onClickCloseDialog();
}, 100);
function onSubmitGroup() {
dialogConfirm($q, async () => {
if (isTarget.value === "planned") {
await http
.put(
config.API.developmentMainTab(
isEdit.value ? "tab2_1_edit" : "tab2_1_add",
isEdit.value ? editId.value : projectId.value
),
{
groupTarget: formGroupTarget.groupTarget,
groupTargetSub: formGroupTarget.groupTargetSub,
positions:
formGroupTarget.groupTarget !== "OUTSIDERS"
? formGroupTarget.positions.map((v) => ({
position: v.position ? v.position : "",
posTypePlannedId: v.posTypeId ? v.posTypeId : "",
posLevelPlannedId: v.posLevelId ? v.posLevelId : "",
}))
: [],
type:
formGroupTarget.groupTarget === "OUTSIDERS"
? formGroupTarget.type
: "",
amount: formGroupTarget.amount,
}
)
.then(() => {
success($q, "บันทึกข้อมูลสำเร็จ");
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
} else {
await http
.put(
config.API.developmentMainTab(
isEdit.value ? "tab2_3_edit" : "tab2_3_add",
isEdit.value ? editId.value : projectId.value
),
{
groupTarget: formGroupTarget.groupTarget,
groupTargetSub: formGroupTarget.groupTargetSub,
position: formGroupTarget.position,
posTypeActualId: formGroupTarget.posType,
posLevelActualId: formGroupTarget.posLevel,
type: formGroupTarget.type,
amount: formGroupTarget.amount,
}
)
.then(() => {
success($q, "บันทึกข้อมูลสำเร็จ");
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
}
setTimeout(() => {
fetchData(projectId.value);
onClickCloseDialog();
}, 100);
});
}
/** เพิ่มผู้เกี่ยวข้อง */
async function onSubmitRelate() {
if (isTarget.value === "planned") {
await http
.put(
config.API.developmentMainTab(
isEdit.value ? "tab2_2_edit" : "tab2_2_add",
isEdit.value ? editId.value : projectId.value
),
{
groupTarget: formGroupRelate.relate,
amount: formGroupRelate.amount,
}
)
.then(() => {
success($q, "บันทึกข้อมูลสำเร็จ");
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
} else {
await http
.put(
config.API.developmentMainTab(
isEdit.value ? "tab2_4_edit" : "tab2_4_add",
isEdit.value ? editId.value : projectId.value
),
{
groupTarget: formGroupRelate.relate,
amount: formGroupRelate.amount,
}
)
.then(() => {
success($q, "บันทึกข้อมูลสำเร็จ");
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
}
setTimeout(() => {
fetchData(projectId.value);
onClickCloseDialog();
}, 100);
function onSubmitRelate() {
dialogConfirm($q, async () => {
if (isTarget.value === "planned") {
await http
.put(
config.API.developmentMainTab(
isEdit.value ? "tab2_2_edit" : "tab2_2_add",
isEdit.value ? editId.value : projectId.value
),
{
groupTarget: formGroupRelate.relate,
amount: formGroupRelate.amount,
}
)
.then(() => {
success($q, "บันทึกข้อมูลสำเร็จ");
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
} else {
await http
.put(
config.API.developmentMainTab(
isEdit.value ? "tab2_4_edit" : "tab2_4_add",
isEdit.value ? editId.value : projectId.value
),
{
groupTarget: formGroupRelate.relate,
amount: formGroupRelate.amount,
}
)
.then(() => {
success($q, "บันทึกข้อมูลสำเร็จ");
})
.catch((err) => {
messageError($q, err);
})
.finally(() => {
hideLoader();
});
}
setTimeout(() => {
fetchData(projectId.value);
onClickCloseDialog();
}, 100);
});
}
/** clear form */

6
src/modules/15_development/views/Scholarship.vue
View file

@ -270,7 +270,11 @@ onMounted(() => {
label="เลือกประเภททุน"
@update:model-value="fetchNewList"
class="select_ellipsis"
/>
>
<q-tooltip>{{
scholarshipTypeOp.find((e) => e.id === formQuery.type)?.name
}}</q-tooltip>
</q-select>
</div>
<q-btn