Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 1m7s

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2026-01-29 12:07:49 +07:00
commit 6cfb939a8d
3 changed files with 10 additions and 7 deletions

View file

@ -12,8 +12,8 @@ export const apiUrlConfigReport = import.meta.env.VITE_API_REPORT_URL;
const config = ref<any>({ const config = ref<any>({
development: { development: {
// API_URI: "https://localhost:7260/api", // API_URI: "https://localhost:7260/api",
API_URI: "https://bma-ehr.frappet.synology.me/api/v1", API_URI: "https://hrmsbkk.case-collection.com/api/v1",
API_URL_SUPPORT: "https://bma-ehr.frappet.synology.me/api/v1/support", API_URL_SUPPORT: "https://hrmsbkk.case-collection.com/api/v1/support",
MEET_URI: "meet.frappet.com", MEET_URI: "meet.frappet.com",
LINK_EVALUATE_PUBLISH: "https://bma-ehr-publish.frappet.synology.me", LINK_EVALUATE_PUBLISH: "https://bma-ehr-publish.frappet.synology.me",
API_REPORT_TEMPLATE_URI: API_REPORT_TEMPLATE_URI:

View file

@ -333,6 +333,9 @@ onMounted(async () => {
> >
{{ item.sub }} {{ item.sub }}
</div> </div>
<q-tooltip v-if="item.path === '/organization-chart'">
อยระหวางปรบปร</q-tooltip
>
</q-card> </q-card>
</div> </div>
</div> </div>

View file

@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { ref, reactive, defineProps, watch } from "vue"; import { ref, reactive, watch } from "vue";
import { useQuasar } from "quasar"; import { useQuasar } from "quasar";
import { useCounterMixin } from "@/stores/mixin"; import { useCounterMixin } from "@/stores/mixin";
@ -145,7 +145,7 @@ function onSubmit(data: FormDataType) {
props.onSubmit(data); props.onSubmit(data);
}, },
"ยืนยันการบันทึกข้อมูล", "ยืนยันการบันทึกข้อมูล",
"ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?" "ต้องการยืนยันการบันทึกข้อมูลนี้หรือไม่ ?",
); );
} }
@ -160,7 +160,7 @@ watch(
formData.position = newValue.position; formData.position = newValue.position;
} }
}, },
{ deep: true } { deep: true },
); );
watch( watch(
@ -185,7 +185,7 @@ watch(
formData.historyStatus = props.data.historyStatus; formData.historyStatus = props.data.historyStatus;
} }
}, },
{ deep: true } { deep: true },
); );
</script> </script>
@ -255,7 +255,7 @@ watch(
lazy-rules lazy-rules
hide-bottom-space hide-bottom-space
/> />
<q-skeleton v-else type="QSelect" height="40px" /> <q-skeleton v-else type="QInput" height="40px" />
</div> </div>
<div class="col-xs-12 col-md-3"> <div class="col-xs-12 col-md-3">
<q-input <q-input