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

Merge branch 'develop' of https://github.com/Frappet/BMA-EHR-USER into develop

Browse source
This commit is contained in:
setthawutttty 2025-02-04 15:34:05 +07:00
commit 11ccd3ffff
3 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/modules/08_KPI/components/Tab/Dialog/01_FormIndicator.vue
View file

@ -86,7 +86,7 @@ const roundOp = ref<DataOptions[]>([
]);
function fetchListPlan() {
formFilter.nodeId = store.dataProfile.nodeId;
formFilter.nodeId = store.dataProfile.nodeDnaId;
formFilter.node = store.dataProfile.node;
formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
@ -146,7 +146,7 @@ function fetchListPlanByid(id: string) {
}
function fetchListRole() {
formFilter.nodeId = store.dataProfile.nodeId;
formFilter.nodeId = store.dataProfile.nodeDnaId;
formFilter.node = store.dataProfile.node;
formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
formFilter.position = store.dataProfile.position;
@ -199,8 +199,8 @@ function fetchRoleByid(id: string) {
}
function fetchListSpecial() {
formFilter.nodeId = store.dataProfile.nodeId;
formFilter.node = store.dataProfile.node;
// formFilter.nodeId = store.dataProfile.nodeDnaId;
// formFilter.node = store.dataProfile.node;
formFilter.year = formFilter?.year ? formFilter.year.toString() : "";
const body = {

5
src/modules/08_KPI/components/Tab/Topic/01_Indicator.vue
View file

@ -161,7 +161,7 @@ const modalProblem = ref<boolean>(false);
const type = ref<string>("");
const idList = ref<string>("");
function openPopupProgress(data: any) {
store.mainRowData = data
store.mainRowData = data;
modalProgress.value = true;
type.value =
numpage.value === 1 ? "plan" : numpage.value === 2 ? "role" : "special";
@ -334,6 +334,7 @@ const isEditStep3 = computed(() => {
>
<q-tooltip>รายงานความก้าวหน้า</q-tooltip>
</q-btn>
<q-btn
flat
round
@ -341,7 +342,7 @@ const isEditStep3 = computed(() => {
color="red-5"
dense
main="problem"
@click="openPopupProblem(props.row)"
@click="openPopupProblem(props.row.id)"
>
<q-tooltip>รายงานปัญหา</q-tooltip>
</q-btn>

6
src/views/MainLayout.vue
View file

@ -238,6 +238,10 @@ const landingPageUrl = ref<string>(getLandingUrl());
function getLandingUrl() {
return configParam.landingPageUrl;
}
function onViewDetailNoti(url: string) {
window.open(url, "_blank");
}
</script>
<!-- โครงเว็บ -->
@ -354,7 +358,7 @@ function getLandingUrl() {
: 'caption q-pa-xs'
"
@click.stop.prevent="
item.payload ? $router.push(`/${item.payload}`) : ''
item.payload ? onViewDetailNoti(item.payload) : ''
"
>
<q-item