hrms-bangkok/hrms-mgt
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-frontend into develop

Browse source
This commit is contained in:
AnandaTon 2023-09-15 10:04:22 +07:00
commit ab91c8d84e
3 changed files with 30 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/05_placement/components/probation/FormEvaluation/Template2.vue
View file

@ -26,7 +26,7 @@ const mixin = useCounterMixin();
const $q = useQuasar();
const { showLoader, hideLoader, messageError } = mixin;
const probationStore = useProbationDataStore();
// const { fecthdataAssign } = probationStore;
const { fecthdataAssign } = probationStore;
const assignId = ref<string>(route.params.form.toString());
const personalId = ref<string>(route.params.personalId.toString());
const fullname = ref<string>("");
@ -49,7 +49,7 @@ const fecthAssign = async (id: string) => {
await http
.get(config.API.createformCommader(id))
.then(async (res: any) => {
// await fecthdataAssign(res.data.data);
await fecthdataAssign(res.data.data);
evaluate.value = probationStore.evaluate;
tabs.value = evaluate.value;
fullname.value = res.data.data.experimentee ? res.data.data.experimentee.name : "";

4
src/modules/05_placement/components/probation/FormEvaluation/Template2Format2.vue
View file

@ -7,7 +7,7 @@ import { useRoute, useRouter } from "vue-router";
import { useCounterMixin } from "@/stores/mixin";
import { useProbationDataStore } from "@/modules/05_placement/storeProbation";
const probationStore = useProbationDataStore();
// const { fecthdataAssign } = probationStore;
const { fecthdataAssign } = probationStore;
const Header = defineAsyncComponent(
() =>
@ -45,7 +45,7 @@ const fecthAssign = async (id: string) => {
await http
.get(config.API.createformChairman(id))
.then(async (res: any) => {
// await fecthdataAssign(res.data.data);
await fecthdataAssign(res.data.data);
evaluate.value = probationStore.evaluate;
fullname.value = res.data.data.experimentee ? res.data.data.experimentee.name : "";
tabs.value = evaluate.value;

44
src/modules/07_insignia/components/3_result/DialogForm.vue
View file

@ -180,24 +180,24 @@ const fectDataByid = async (id: string) => {
.get(config.API.noteByid(id))
.then((res) => {
let data = res.data.result;
cardid.value = data.citizenId ?? "";
fullName.value = data.fullName ?? "";
position.value = data.position ?? "";
Advertise.value = data.number ?? "";
brand.value = data.requestInsigniaId ?? "";
receivedate.value = data.dateReceive ?? "";
issue.value = data.issue ?? "";
affiliationRequest.value = data.organizationOrganizationSend ?? "";
affiliationReceived.value = data.organizationOrganizationReceive ?? "";
announceDate.value = data.date ?? "";
volume.value = data.volumeNo ?? "";
episode.value = data.section ?? "";
duty.value = data.page ?? "";
announced.value = data.no ?? "";
invoiceDate.value = data.datePayment ?? "";
payment.value = data.typePayment ?? "";
addressPayment.value = data.address ?? "";
status.value = data.status ?? "";
cardid.value = data.citizenId;
fullName.value = data.fullName;
position.value = data.position;
Advertise.value = data.number;
brand.value = data.requestInsigniaId;
receivedate.value = data.dateReceive;
issue.value = data.issue;
affiliationRequest.value = data.organizationOrganizationSend;
affiliationReceived.value = data.organizationOrganizationReceive;
announceDate.value = data.date;
volume.value = data.volumeNo;
episode.value = data.section;
duty.value = data.page;
announced.value = data.no;
invoiceDate.value = data.datePayment;
payment.value = data.typePayment;
addressPayment.value = data.address;
status.value = data.status;
})
.catch((err) => {
console.log(err);
@ -286,6 +286,7 @@ const searchcardid = () => {
:label="`ขรก.สามัญ/ลูกจ้างประจำ`"
@update:model-value="selectType"
:disable="status !== ''"
lazy-rules
/>
</div>
<div class="col-12 text-weight-bold text-grey">
@ -412,6 +413,7 @@ const searchcardid = () => {
borderless
outlined
:rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
lazy-rules
hide-bottom-space
:model-value="
receivedate != null ? date2Thai(receivedate) : undefined
@ -453,6 +455,7 @@ const searchcardid = () => {
:rules="[(val) => !!val || 'กรุณากรอกสังกัด']"
hide-bottom-space
dense
lazy-rules
borderless
outlined
v-model="affiliationRequest"
@ -471,6 +474,7 @@ const searchcardid = () => {
outlined
v-model="affiliationReceived"
label="สังกัด ณ วันที่ได้รับประกาศนียบัตรกำกับเครื่องราชอิสริยาภรณ์"
lazy-rules
/>
</div>
<div class="col-12 q-my-xs"><q-separator size="2px" /></div>
@ -500,6 +504,7 @@ const searchcardid = () => {
dense
borderless
outlined
lazy-rules
:rules="[(val) => !!val || 'กรุณาเลือกวันที่']"
hide-bottom-space
:model-value="
@ -603,6 +608,7 @@ const searchcardid = () => {
dense
borderless
outlined
lazy-rules
hide-bottom-space
:model-value="
invoiceDate != null ? date2Thai(invoiceDate) : undefined
@ -635,6 +641,7 @@ const searchcardid = () => {
option-value="value"
outlined
emit-value
lazy-rules
map-options
v-model="payment"
:label="`เลือกรูปแบบการจ่าย`"
@ -646,6 +653,7 @@ const searchcardid = () => {
label="ที่อยู่ที่จ่าย"
class="bg-white"
dense
lazy-rules
borderless
outlined
v-model="addressPayment"