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

Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me

Browse source 
# Conflicts:
#	src/api/05_placement/api.placement.ts
#	src/modules/05_placement/components/OrderPlacement/step/step01.vue
This commit is contained in:
Thanit Konmek 2023-08-08 00:24:40 +07:00
commit d8f2a89051
16 changed files with 2518 additions and 413 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/modules/05_placement/components/OrderPlacement/step/step01.vue
View file

@ -208,24 +208,10 @@
) " -->
</div>
<div class="col-xs-12 col-md-6">
<selector
:class="getClass(true)"
outlined
dense
lazy-rules
v-model="position"
:rules="[(val: string) => !!val || `${'กรุณาเลือกตำแหน่งรับสมัคร'}`]"
hide-bottom-space
:label="`${'ตำแหน่งรับสมัคร'}`"
@update:modelValue="clickEditRow"
emit-value
map-options
option-label="name"
:options="positionOption"
option-value="id"
use-input
input-debounce="0"
/>
<!-- <selector :class="getClass(true)" outlined dense lazy-rules v-model="position"
:rules="[(val: string) => !!val || `${'กรุณาเลือกตำแหน่งรับสมัคร'}`]" hide-bottom-space
:label="`${'ตำแหน่งรับสมัคร'}`" @update:modelValue="clickEditRow" emit-value map-options option-label="name"
:options="positionOption" option-value="id" use-input input-debounce="0" /> -->
<!-- @filter="(inputValue:string, doneFn:Function) =>
filterSelector(inputValue, doneFn,'positionOption' ) " -->
</div>
@ -552,7 +538,7 @@ const fetchdetailOrder = async () => {
nameCommand.value = data.signatoryBy;
positionCommand.value = data.signatoryPosition;
examRound.value = data.examRound;
position.value = data.registerPosition;
// position.value = data.registerPosition;
register.value = data.conclusionRegisterNo;
dateRegister.value = data.conclusionRegisterDate;
announce.value = data.conclusionResultNo;

23
src/modules/05_placement/components/OrderPlacement/step/step04.vue
View file

@ -422,10 +422,15 @@ import { VuePDF, usePDF } from "@tato30/vue-pdf";
import type { PDFDocumentLoadingTask } from "pdfjs-dist/types/src/display/api";
import type { QForm } from "quasar";
import { useCounterMixin } from "@/stores/mixin";
import { useRoute } from "vue-router";
import http from "@/plugins/http";
import config from "@/app.config";
const mixin = useCounterMixin();
const { date2Thai } = mixin;
const route = useRoute();
const orderId_params = route.params.orderid;
const dialog = ref<boolean>(false);
// onUnmounted(() => {
@ -433,8 +438,15 @@ const dialog = ref<boolean>(false);
// myEventHandler(e);
// });
// });
const orderId = ref<string>("");
onMounted(async () => {
console.log(orderId_params);
if (orderId_params !== undefined) {
orderId.value == orderId_params.toString();
}
fetchAttachment(orderId.value);
// window.addEventListener("resize", (e: any) => {
// myEventHandler(e);
// });
@ -447,6 +459,15 @@ onMounted(async () => {
}, 1000);
});
const fetchAttachment = async (orderId: string) => {
console.log(123);
await http
.get(config.API.attachmentOrder("08db94be-f7c6-43e2-83eb-3c5cef3a91c7"))
.then((res) => {
console.log(res);
});
};
// const myEventHandler = (e: any) => {
// console.log("e", e.target.innerWidth);
// if (vuePDFRef !== null) {