Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into develop
This commit is contained in:
commit
01c44ee65e
7 changed files with 623 additions and 136 deletions
|
|
@ -66,20 +66,26 @@ const OPgroup = ref<
|
|||
>([]);
|
||||
|
||||
const dataEdit = async (id: string) => {
|
||||
showLoader();
|
||||
const data = putDataEdit(id);
|
||||
await http
|
||||
.put(config.API.saveEditAssign(id), data)
|
||||
.then(() => {})
|
||||
.catch(() => {})
|
||||
.finally(async () => {
|
||||
status.value = false;
|
||||
getAssign();
|
||||
hideLoader();
|
||||
});
|
||||
await myForm.value.validate().then((result: boolean) => {
|
||||
if (result) {
|
||||
showLoader();
|
||||
const data = putDataEdit(id);
|
||||
http
|
||||
.put(config.API.saveEditAssign(id), data)
|
||||
.then(() => {})
|
||||
.catch(() => {})
|
||||
.finally(async () => {
|
||||
status.value = false;
|
||||
getAssign();
|
||||
hideLoader();
|
||||
});
|
||||
}else {
|
||||
dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ");
|
||||
}
|
||||
});
|
||||
};
|
||||
const saveEdit = (id: string) => {
|
||||
dialogConfirm($q, () => dataEdit(id));
|
||||
dialogConfirm($q, async () => await dataEdit(id));
|
||||
};
|
||||
const edit = () => {
|
||||
status.value = true;
|
||||
|
|
@ -392,7 +398,7 @@ const putDataEdit = (id: string) => {
|
|||
|
||||
const assign_director = [
|
||||
{
|
||||
personal_id: caretaker1.value.personal_id,
|
||||
personal_id: caretaker1.value.id != null ? caretaker1.value.id:caretaker1.value.personal_id,
|
||||
role: "mentor",
|
||||
dated:
|
||||
date2.value instanceof Date
|
||||
|
|
@ -400,15 +406,7 @@ const putDataEdit = (id: string) => {
|
|||
: dateToISO(new Date(date2.value)),
|
||||
},
|
||||
{
|
||||
personal_id: caretaker2.value.personal_id,
|
||||
role: "mentor",
|
||||
dated:
|
||||
date3.value instanceof Date
|
||||
? dateToISO(date3.value)
|
||||
: dateToISO(new Date(date3.value)),
|
||||
},
|
||||
{
|
||||
personal_id: commander.value.personal_id,
|
||||
personal_id: commander.value.id != null ? commander.value.id:commander.value.personal_id,
|
||||
role: "commander",
|
||||
dated:
|
||||
date4.value instanceof Date
|
||||
|
|
@ -416,10 +414,20 @@ const putDataEdit = (id: string) => {
|
|||
: dateToISO(new Date(date4.value)),
|
||||
},
|
||||
{
|
||||
personal_id: chairman.value.personal_id,
|
||||
personal_id: chairman.value.id != null ? chairman.value.id:chairman.value.personal_id,
|
||||
role: "chairman",
|
||||
},
|
||||
];
|
||||
if (caretaker2.value) {
|
||||
assign_director.push({
|
||||
personal_id: caretaker2.value.id != null ? caretaker2.value.id:caretaker2.value.personal_id,
|
||||
role: "mentor",
|
||||
dated:
|
||||
date3.value instanceof Date
|
||||
? dateToISO(date3.value)
|
||||
: dateToISO(new Date(date3.value)),
|
||||
});
|
||||
}
|
||||
const data = {
|
||||
personal_id: GUID,
|
||||
fullname: fullname.value,
|
||||
|
|
@ -658,8 +666,11 @@ const getAssign = async () => {
|
|||
date_finish.value = data.assign.date_finish;
|
||||
date1.value = data.assign.experimenter_dated;
|
||||
if (data.mentors.length > 1) {
|
||||
date2.value = data.mentors[0].dated;
|
||||
caretaker1.value = data.mentors[0];
|
||||
date3.value = data.mentors[1].dated;
|
||||
caretaker2.value = data.mentors[1];
|
||||
|
||||
} else {
|
||||
date2.value = data.mentors[0].dated;
|
||||
caretaker1.value = data.mentors[0];
|
||||
|
|
@ -1000,7 +1011,6 @@ watch(knowledge.value, () => {
|
|||
<q-avatar class="bg-grey-2 q-mr-sm" size="28px">2</q-avatar>
|
||||
ผู้ดูแลการทดลองปฏิบัติหน้าที่ราชการ (อาจมีได้มากกว่า 1 คน)
|
||||
</div>
|
||||
|
||||
<div v-if="status == true" class="col-12 row q-col-gutter-md">
|
||||
<q-select
|
||||
:rules="[(val) => !!val || 'กรุณาเลือกผู้ดูเเล']"
|
||||
|
|
@ -2264,11 +2274,15 @@ watch(knowledge.value, () => {
|
|||
:disable="!caretaker2"
|
||||
:readonly="status != true"
|
||||
dense
|
||||
s
|
||||
:rules="
|
||||
caretaker2
|
||||
? [(val) => !!val || 'กรุณาเลือกวันที่']
|
||||
: []
|
||||
"
|
||||
borderless
|
||||
:outlined="status == true"
|
||||
class="full-width datepicker"
|
||||
:model-value="date3 != null ? date2Thai(date3) : null"
|
||||
:model-value="caretaker2 != null ? date2Thai(date3) : null"
|
||||
label="ลงวันที่"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
|
|
|
|||
|
|
@ -461,12 +461,12 @@ const paginationLabel = (start: number, end: number, total: number) => {
|
|||
v-model="fileUpload"
|
||||
accept=".pdf"
|
||||
:style="fileUpload === null ? 'width: 150px' : 'width: auto'"
|
||||
label="อัพโหลดไฟล์"
|
||||
label="อัปโหลดไฟล์"
|
||||
v-if="statusUpload !== true"
|
||||
>
|
||||
<template v-slot:prepend>
|
||||
<q-icon color="light-blue" name="attach_file" />
|
||||
<q-tooltip>อัพโหลดไฟล์</q-tooltip>
|
||||
<q-tooltip>อัปโหลดไฟล์</q-tooltip>
|
||||
</template>
|
||||
</q-file>
|
||||
<q-btn
|
||||
|
|
|
|||
|
|
@ -85,12 +85,12 @@ const editData = async (id: string) => {
|
|||
formData.append("amount", datelast.value.toString());
|
||||
formData.append("round", roundInsig.value.value);
|
||||
if (dateStart.value !== null) {
|
||||
formData.append("startDate", dateToISO(dateStart.value));
|
||||
formData.append("StartDate", dateToISO(dateStart.value));
|
||||
}
|
||||
if (dateEnd.value !== null) {
|
||||
formData.append("endDate", dateToISO(dateEnd.value));
|
||||
formData.append("EndDate", dateToISO(dateEnd.value));
|
||||
}
|
||||
formData.append("file", files.value);
|
||||
formData.append("Files", files.value);
|
||||
console.log(formData);
|
||||
showLoader();
|
||||
await http
|
||||
|
|
|
|||
|
|
@ -5,12 +5,11 @@
|
|||
header="ข้อมูลลูกจ้างชั่วคราว"
|
||||
icon="mdi-account"
|
||||
:save="saveData"
|
||||
:history="!statusAdd()"
|
||||
:changeBtn="changeBtn"
|
||||
:disable="statusEdit"
|
||||
:cancel="refreshData"
|
||||
:historyClick="clickHistory"
|
||||
:addEmployee="statusAdd()"
|
||||
:history="!statusAdd()"
|
||||
/>
|
||||
<q-form ref="myform">
|
||||
<div class="row col-12 items-center q-col-gutter-x-sm q-col-gutter-y-sm">
|
||||
|
|
@ -199,7 +198,7 @@ import http from "@/plugins/http";
|
|||
import config from "@/app.config";
|
||||
import type { DataOption } from "@/modules/04_registry/components/profileType";
|
||||
import { defaultTempInformation } from "@/modules/04_registry/components/profileType";
|
||||
import HeaderTop from "@/modules/04_registry/components/Information/top.vue";
|
||||
import HeaderTop from "@/modules/08_registryEmployee/views/topEmployeeTemp.vue";
|
||||
import HistoryTable from "@/components/TableHistory.vue";
|
||||
import { useRoute } from "vue-router";
|
||||
import type { QTableProps } from "quasar";
|
||||
|
|
@ -421,36 +420,38 @@ const fetchDataSelector = async () => {
|
|||
/**
|
||||
* ฟังชั้นดูข้อมูลประวัติแก้ไขข้อมูลที่เลือก
|
||||
*/
|
||||
const clickHistory = async () => {
|
||||
modalHistory.value = true;
|
||||
showLoader();
|
||||
await http
|
||||
.get(config.API.profileEmployeeTempId(route.params.id.toString()))
|
||||
.then((res) => {
|
||||
let data = res.data.result;
|
||||
rowsHistory.value = [];
|
||||
data.map((e: any) => {
|
||||
rowsHistory.value.push({
|
||||
EmployeeMoneyIncrease: e.employeeMoneyIncrease,
|
||||
EmployeeMoneyAllowance: e.employeeMoneyAllowance,
|
||||
EmployeeMoneyEmployee: e.employeeMoneyEmployee,
|
||||
EmployeeMoneyEmployer: e.employeeMoneyEmployer,
|
||||
PositionEmployeeGroupId: e.positionEmployeeGroupId,
|
||||
PositionEmployeePositionId: e.positionEmployeePositionId,
|
||||
PositionEmployeeLineId: e.positionEmployeeLineId,
|
||||
EmployeeTypeIndividual: e.employeeTypeIndividual,
|
||||
EmployeeOc: e.employeeOc,
|
||||
EmployeeWage: e.employeeWage,
|
||||
});
|
||||
});
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
};
|
||||
// const clickHistory = async () => {
|
||||
// modalHistory.value = true;
|
||||
// showLoader();
|
||||
// await http
|
||||
// .get(config.API.profileEmployeeTempId(route.params.id.toString()))
|
||||
// .then((res) => {
|
||||
// let data = res.data.result;
|
||||
// rowsHistory.value = [];
|
||||
// data.map((e: any) => {
|
||||
// rowsHistory.value.push({
|
||||
// employeeMoneyIncrease: e.employeeMoneyIncrease,
|
||||
// employeeMoneyAllowance: e.employeeMoneyAllowance,
|
||||
// employeeMoneyEmployee: e.employeeMoneyEmployee,
|
||||
// employeeMoneyEmployer: e.employeeMoneyEmployer,
|
||||
// positionEmployeeGroupId: e.positionEmployeeGroupId,
|
||||
// positionEmployeePositionId: e.positionEmployeePositionId,
|
||||
// positionEmployeeLineId: e.positionEmployeeLineId,
|
||||
// employeeTypeIndividual: e.employeeTypeIndividual,
|
||||
// employeeOc: e.employeeOc,
|
||||
// employeeWage: e.employeeWage,
|
||||
// createdFullName: e.createdFullName,
|
||||
// createdAt: new Date(e.createdAt),
|
||||
// });
|
||||
// });
|
||||
// })
|
||||
// .catch((e) => {
|
||||
// messageError($q, e);
|
||||
// })
|
||||
// .finally(() => {
|
||||
// hideLoader();
|
||||
// });
|
||||
// };
|
||||
|
||||
const refreshData = async () => {
|
||||
myform.value.reset();
|
||||
|
|
|
|||
199
src/modules/08_registryEmployee/views/topEmployeeTemp.vue
Normal file
199
src/modules/08_registryEmployee/views/topEmployeeTemp.vue
Normal file
|
|
@ -0,0 +1,199 @@
|
|||
<template>
|
||||
<div class="flex items-center">
|
||||
<div class="flex items-center">
|
||||
<q-icon
|
||||
:name="icon"
|
||||
size="1.5em"
|
||||
color="grey-5"
|
||||
class="q-mr-md"
|
||||
v-if="icon != ''"
|
||||
/>
|
||||
<div
|
||||
class="text-bold text-subtitle2 col-12 row items-center"
|
||||
v-if="header != ''"
|
||||
>
|
||||
{{ header }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="q-gutter-sm q-mx-sm" v-if="addData == false">
|
||||
<q-btn
|
||||
size="12px"
|
||||
v-if="!edit"
|
||||
flat
|
||||
round
|
||||
:disabled="disable"
|
||||
:color="edit ? 'grey-7' : 'primary'"
|
||||
@click="ClickEdit"
|
||||
icon="mdi-pencil-outline"
|
||||
>
|
||||
<q-tooltip>แก้ไขข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
size="12px"
|
||||
flat
|
||||
round
|
||||
v-if="edit"
|
||||
:color="!edit ? 'grey-7' : 'public'"
|
||||
@click="save"
|
||||
icon="mdi-content-save-outline"
|
||||
>
|
||||
<q-tooltip>บันทึกข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn
|
||||
size="12px"
|
||||
flat
|
||||
round
|
||||
v-if="edit && !addEmployee"
|
||||
:color="!edit ? 'grey-7' : 'red'"
|
||||
@click="ClickCancel"
|
||||
icon="mdi-undo"
|
||||
>
|
||||
<q-tooltip>ยกเลิก</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
<div class="q-pl-sm" v-else-if="iconAdd != '' && iconAdd != null">
|
||||
<q-btn
|
||||
size="12px"
|
||||
flat
|
||||
round
|
||||
color="add"
|
||||
@click="addleave"
|
||||
icon="mdi-plus"
|
||||
>
|
||||
<q-tooltip>เพิ่มข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
<q-btn size="12px" flat round color="add" @click="add" :icon="iconAdd">
|
||||
<q-tooltip>สรุปวันลา</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
|
||||
<div class="q-pl-sm" v-else>
|
||||
<q-btn
|
||||
size="12px"
|
||||
flat
|
||||
round
|
||||
:disabled="disable"
|
||||
color="add"
|
||||
@click="add"
|
||||
icon="mdi-plus"
|
||||
>
|
||||
<q-tooltip>เพิ่มข้อมูล</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
<q-space />
|
||||
<!-- <q-btn
|
||||
color="info"
|
||||
flat
|
||||
dense
|
||||
round
|
||||
size="14px"
|
||||
icon="mdi-history"
|
||||
v-if="history"
|
||||
@click="historyClick"
|
||||
>
|
||||
<q-tooltip>ประวัติ{{ header }}</q-tooltip>
|
||||
</q-btn> -->
|
||||
</div>
|
||||
</template>
|
||||
<script setup lang="ts">
|
||||
const props = defineProps({
|
||||
header: {
|
||||
type: String,
|
||||
default: "ข้อความ",
|
||||
required: true,
|
||||
},
|
||||
iconAdd: {
|
||||
type: String,
|
||||
default: null,
|
||||
},
|
||||
icon: {
|
||||
type: String,
|
||||
default: "mdi-help",
|
||||
required: true,
|
||||
},
|
||||
edit: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
required: true,
|
||||
},
|
||||
history: {
|
||||
type: Boolean,
|
||||
default: true,
|
||||
required: true,
|
||||
},
|
||||
addData: {
|
||||
type: Boolean,
|
||||
defualt: false,
|
||||
},
|
||||
disable: {
|
||||
type: Boolean,
|
||||
defualt: false,
|
||||
},
|
||||
historyClick: {
|
||||
type: Function,
|
||||
default: () => console.log("not function"),
|
||||
},
|
||||
add: {
|
||||
type: Function,
|
||||
default: () => console.log("not function"),
|
||||
},
|
||||
addleave: {
|
||||
type: Function,
|
||||
default: () => console.log("not function"),
|
||||
},
|
||||
save: {
|
||||
type: Function,
|
||||
default: () => console.log("not function"),
|
||||
},
|
||||
deleted: {
|
||||
type: Function,
|
||||
default: () => console.log("not function"),
|
||||
},
|
||||
cancel: {
|
||||
type: Function,
|
||||
default: () => console.log("not function"),
|
||||
},
|
||||
changeBtn: {
|
||||
type: Function,
|
||||
default: () => console.log("not function"),
|
||||
},
|
||||
addEmployee: {
|
||||
type: Boolean,
|
||||
defualt: false,
|
||||
},
|
||||
});
|
||||
|
||||
const emit = defineEmits(["update:edit"]);
|
||||
|
||||
const updateEdit = (value: any) => {
|
||||
emit("update:edit", value);
|
||||
};
|
||||
|
||||
const ClickEdit = () => {
|
||||
updateEdit(!props.edit);
|
||||
props.changeBtn();
|
||||
};
|
||||
|
||||
const historyClick = async () => {
|
||||
await props.historyClick();
|
||||
};
|
||||
|
||||
const ClickCancel = () => {
|
||||
updateEdit(!props.edit);
|
||||
props.cancel();
|
||||
props.changeBtn();
|
||||
};
|
||||
|
||||
const save = () => {
|
||||
props.save();
|
||||
};
|
||||
|
||||
const add = () => {
|
||||
props.add();
|
||||
};
|
||||
|
||||
const addleave = () => {
|
||||
props.addleave();
|
||||
};
|
||||
</script>
|
||||
<style scoped></style>
|
||||
|
|
@ -32,13 +32,14 @@ onUnmounted(() => {
|
|||
});
|
||||
|
||||
const nextStep = async () => {
|
||||
stepper.value!.next();
|
||||
// stepper.value!.next();
|
||||
|
||||
localStorage.setItem("currentStep", step.value.toString());
|
||||
if (orderId.value) {
|
||||
await http
|
||||
.put(config.API.nextStep(orderId.value))
|
||||
.then(() => {
|
||||
router.push(`/order/detail/${orderId.value}?step=${step.value}`);
|
||||
router.push(`/order/detail/${orderId.value}?step=${step.value + 1}`);
|
||||
})
|
||||
.catch((e) => {
|
||||
console.log(e);
|
||||
|
|
@ -46,13 +47,13 @@ const nextStep = async () => {
|
|||
}
|
||||
};
|
||||
const previousStep = async () => {
|
||||
stepper.value!.previous();
|
||||
// stepper.value!.previous();
|
||||
localStorage.setItem("currentStep", step.value.toString());
|
||||
if (orderId.value) {
|
||||
await http
|
||||
.put(config.API.prevStep(orderId.value))
|
||||
.then(() => {
|
||||
router.push(`/order/detail/${orderId.value}?step=${step.value}`);
|
||||
router.push(`/order/detail/${orderId.value}?step=${step.value - 1}`);
|
||||
})
|
||||
.catch((e) => {
|
||||
console.log(e);
|
||||
|
|
@ -62,7 +63,6 @@ const previousStep = async () => {
|
|||
const destroyLocalStorage = () => {
|
||||
localStorage.clear();
|
||||
};
|
||||
|
||||
onMounted(() => {
|
||||
// console.log("route query===>", route.query)
|
||||
if (route.query.step) {
|
||||
|
|
@ -79,7 +79,7 @@ onMounted(() => {
|
|||
|
||||
if (orderId_params !== undefined) {
|
||||
orderId.value = orderId_params.toString();
|
||||
// console.log(orderId.value);
|
||||
// console.log("orderId.value");
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -10,6 +10,11 @@ import { useQuasar } from "quasar";
|
|||
import { useRoute, useRouter } from "vue-router";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
import type { treeTab } from "@/modules/05_placement/interface/index/Main";
|
||||
import type { ResponseOrganiz } from "@/modules/05_placement/interface/response/Order";
|
||||
import type { QTableProps } from "quasar";
|
||||
|
||||
import DialogHeader from "@/modules/04_registry/components/DialogHeader.vue";
|
||||
|
||||
const mixin = useCounterMixin();
|
||||
const {
|
||||
|
|
@ -19,6 +24,7 @@ const {
|
|||
hideLoader,
|
||||
success,
|
||||
dialogConfirm,
|
||||
dialogMessageNotify,
|
||||
} = mixin;
|
||||
const $q = useQuasar(); //ใช้ noti quasar
|
||||
const route = useRoute();
|
||||
|
|
@ -60,66 +66,17 @@ const examRound = ref<string>("");
|
|||
const examRoundOption = ref<DataOption1[]>([]);
|
||||
const conclusionRegisterNo = ref<string>("");
|
||||
const conclusionRegisterDate = ref<Date>(new Date());
|
||||
// const registerOption = ref<DataOption1[]>([
|
||||
// {
|
||||
// name: "รับสมคัรสอบ ครั้งที่ 1",
|
||||
// id: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
|
||||
// },
|
||||
// ]);
|
||||
|
||||
const conclusionResultNo = ref<string>("");
|
||||
const conclusionResultDate = ref<Date>(new Date());
|
||||
// const announceOption = ref<DataOption1[]>([
|
||||
// {
|
||||
// name: "ผลการสอบแข่งขั้น ครั้งที่ 1",
|
||||
// id: "3fa85f64-5717-4562-b3fc-2c963f66afa6",
|
||||
// },
|
||||
// ]);
|
||||
|
||||
// C-PM-05 - 06
|
||||
const conclusion1 = ref<string>("");
|
||||
const conclusionDate1 = ref<Date>(new Date());
|
||||
const conclusion1Option = ref<DataOption1[]>([
|
||||
{ name: "ครั้งที่ 1", id: "3fa85f64-5717-4562-b3fc-2c963f66afa6" },
|
||||
]);
|
||||
const conclusion2 = ref<string>("");
|
||||
const conclusionDate2 = ref<Date>(new Date());
|
||||
const conclusion2Option = ref<DataOption1[]>([
|
||||
{ name: "ครั้งที่ 1", id: "3fa85f64-5717-4562-b3fc-2c963f66afa6" },
|
||||
]);
|
||||
const meeting = ref<string>("");
|
||||
const dateMeeting = ref<Date>(new Date());
|
||||
const meetingOption = ref<DataOption1[]>([
|
||||
{ name: "การประชุมครั้งที่ 1", id: "3fa85f64-5717-4562-b3fc-2c963f66afa6" },
|
||||
]);
|
||||
|
||||
// C-PM-07
|
||||
const conclusionRelocation1 = ref<string>("");
|
||||
const conclusionRelocationDate1 = ref<Date>(new Date());
|
||||
const RelocationOption1 = ref<DataOption1[]>([
|
||||
{ name: "ครั้งที่ 1", id: "3fa85f64-5717-4562-b3fc-2c963f66afa6" },
|
||||
]);
|
||||
const conclusionRelocation2 = ref<string>("");
|
||||
const conclusionRelocationDate2 = ref<Date>(new Date());
|
||||
const RelocationOption2 = ref<DataOption1[]>([
|
||||
{ name: "ครั้งที่ 1", id: "3fa85f64-5717-4562-b3fc-2c963f66afa6" },
|
||||
]);
|
||||
|
||||
// C-PM-08 && 14
|
||||
const conclusion = ref<string>("");
|
||||
const conclusionDate = ref<Date>(new Date());
|
||||
const conclusionOption = ref<DataOption1[]>([
|
||||
{ name: "ครั้งที่ 1", id: "3fa85f64-5717-4562-b3fc-2c963f66afa6" },
|
||||
]);
|
||||
const conclusionLeave = ref<string>("");
|
||||
const conclusionLeaveDate = ref<Date>(new Date());
|
||||
const LeaveOption = ref<DataOption1[]>([
|
||||
{ name: "ครั้งที่ 1", id: "3fa85f64-5717-4562-b3fc-2c963f66afa6" },
|
||||
]);
|
||||
const conclusionReceive = ref<string>("");
|
||||
const conclusionReceiveDate = ref<Date>(new Date());
|
||||
const ReceiveOption = ref<DataOption1[]>([
|
||||
{ name: "ครั้งที่ 1", id: "3fa85f64-5717-4562-b3fc-2c963f66afa6" },
|
||||
]);
|
||||
// C-PM-08
|
||||
const conclusionReturnNo = ref<string>("");
|
||||
const conclusionReturnDate = ref<Date>(new Date());
|
||||
|
||||
// C-PM-09
|
||||
const organizations = ref<string>("");
|
||||
|
|
@ -138,6 +95,7 @@ const bookOption = ref<DataOption1[]>([
|
|||
]);
|
||||
|
||||
// C-PM-10
|
||||
const dialogVisible = ref<boolean>(false);
|
||||
const organizationsOld = ref<string>("");
|
||||
const organizationsOldOption = ref<DataOption1[]>([
|
||||
{ name: "หน่วยงานที่ 1", id: "3fa85f64-5717-4562-b3fc-2c963f66afa6" },
|
||||
|
|
@ -193,6 +151,8 @@ const receiveOcOption = ref<DataOption1[]>([
|
|||
]);
|
||||
// C-PM-14
|
||||
const transferOrganizationName = ref<string>("");
|
||||
const conclusionReceive = ref<string>("");
|
||||
const conclusionReceiveDate = ref<Date>(new Date());
|
||||
|
||||
// C-PM-16
|
||||
const orderNumber = ref<string>();
|
||||
|
|
@ -260,10 +220,10 @@ const fetchdetailOrder = async () => {
|
|||
await http
|
||||
.get(config.API.detailOrder(orderIdString))
|
||||
.then((res: any) => {
|
||||
console.log(res);
|
||||
// console.log(res);
|
||||
|
||||
const data = res.data.result;
|
||||
console.log(data);
|
||||
// console.log(data);
|
||||
typeOrder.value = typeOrderOption.value.find(
|
||||
(e) => e.id === data.orderTypeValue
|
||||
);
|
||||
|
|
@ -286,17 +246,20 @@ const fetchdetailOrder = async () => {
|
|||
dateMeeting.value = data.conclusionMeetingDate;
|
||||
|
||||
// 08
|
||||
conclusionReceive.value = data.conclusionReturnNo;
|
||||
conclusionReceiveDate.value = data.conclusionReturnDate;
|
||||
conclusionReturnNo.value = data.conclusionReturnNo;
|
||||
conclusionReturnDate.value = data.conclusionReturnDate;
|
||||
|
||||
//09
|
||||
organizations.value = data.sourceOrganizationName;
|
||||
order.value = data.conclusionReturnNo;
|
||||
orderDate.value = data.conclusionReturnDate;
|
||||
book.value = data.militaryCommandNo;
|
||||
bookDate.value = data.militaryCommandDate;
|
||||
bookDate.value = data.militaryCommanDate;
|
||||
|
||||
//10
|
||||
if (data.orderTypeCode === "c-pm-10") {
|
||||
nodeTree();
|
||||
}
|
||||
organizationsOld.value = data.placementCommandIssuer;
|
||||
orderOld.value = data.placementCommandNo;
|
||||
orderOldDate.value = data.placementCommandDate;
|
||||
|
|
@ -356,6 +319,9 @@ const fecthCommand = async () => {
|
|||
};
|
||||
const selectCMP = (selectOrder: any) => {
|
||||
fecthExamRoundOption(selectOrder.commandCode);
|
||||
if (selectOrder.commandCode === "C-PM-10") {
|
||||
nodeTree();
|
||||
}
|
||||
//01-04
|
||||
examRound.value = "";
|
||||
conclusionRegisterNo.value = "";
|
||||
|
|
@ -422,6 +388,8 @@ const submit = async () => {
|
|||
let signBy = null;
|
||||
if (!nameCommand.value.length) {
|
||||
signBy = await nameCommand.value.name;
|
||||
} else if (nameCommand.value !== "") {
|
||||
signBy = await nameCommand.value;
|
||||
} else {
|
||||
const name2 = await CommandOption.value.find(
|
||||
(x: any) => x.name == nameCommand.value
|
||||
|
|
@ -429,6 +397,7 @@ const submit = async () => {
|
|||
signBy = await name2?.name;
|
||||
console.log("signBy", signBy);
|
||||
}
|
||||
console.log(signBy);
|
||||
|
||||
const orderByOrganizationName = await byOrderOption.value.find(
|
||||
(x: any) => x.id == byOrder.value
|
||||
|
|
@ -470,8 +439,8 @@ const submit = async () => {
|
|||
});
|
||||
} else if (typeOrder.value.commandCode == "C-PM-08") {
|
||||
Object.assign(formdata, {
|
||||
conclusionReturnNo: conclusionReceive.value,
|
||||
conclusionReturnDate: conclusionReceiveDate.value,
|
||||
conclusionReturnNo: conclusionReturnNo.value,
|
||||
conclusionReturnDate: conclusionReturnDate.value,
|
||||
});
|
||||
} else if (typeOrder.value.commandCode == "C-PM-09") {
|
||||
Object.assign(formdata, {
|
||||
|
|
@ -582,6 +551,120 @@ const updateOrder = async (formData: Object, orderId: string, type: string) => {
|
|||
hideLoader();
|
||||
});
|
||||
};
|
||||
// dialog 10
|
||||
const search = ref<string>("");
|
||||
const nodesTree = ref<treeTab[]>([]);
|
||||
const expanded = ref<string[]>([]);
|
||||
const selected = ref<string>("");
|
||||
const selectedModal = ref<ResponseOrganiz[]>([]);
|
||||
const visibleColumnsModal = ref<String[]>(["no", "idCard", "name", "position"]);
|
||||
const columnsModal = ref<QTableProps["columns"]>([
|
||||
{
|
||||
name: "no",
|
||||
align: "left",
|
||||
label: "ลำดับ",
|
||||
field: "no",
|
||||
sortable: true,
|
||||
sort: (a: string, b: string) =>
|
||||
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
||||
},
|
||||
{
|
||||
name: "idCard",
|
||||
align: "left",
|
||||
label: "เลขประจำตัวประชาชน",
|
||||
field: "idCard",
|
||||
sortable: true,
|
||||
sort: (a: string, b: string) =>
|
||||
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
||||
},
|
||||
{
|
||||
name: "name",
|
||||
align: "left",
|
||||
label: "ชื่อ-สกุล",
|
||||
field: "name",
|
||||
sortable: true,
|
||||
sort: (a: string, b: string) =>
|
||||
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
||||
},
|
||||
{
|
||||
name: "position",
|
||||
align: "left",
|
||||
label: "ตำแหน่ง",
|
||||
field: "position",
|
||||
sortable: true,
|
||||
sort: (a: string, b: string) =>
|
||||
a.localeCompare(b, undefined, { numeric: true, sensitivity: "base" }),
|
||||
},
|
||||
]);
|
||||
const rowsModal = ref<ResponseOrganiz[]>([]);
|
||||
const clickAction = ref<string>("");
|
||||
const filterModal = ref<string>("");
|
||||
const nodeTree = async () => {
|
||||
showLoader();
|
||||
await http
|
||||
.get(config.API.profileOrganizRoot)
|
||||
.then((res: any) => {
|
||||
const data = res.data.result;
|
||||
nodesTree.value = data;
|
||||
if (data.length > 0) {
|
||||
expanded.value = [data[0].id];
|
||||
}
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
};
|
||||
const onSelected = async (id: string) => {
|
||||
await listModal(id);
|
||||
};
|
||||
const listModal = async (id: string) => {
|
||||
showLoader();
|
||||
await http
|
||||
.get(config.API.copyOrderPersonsId(id))
|
||||
.then((res) => {
|
||||
const data = res.data.result;
|
||||
let list: ResponseOrganiz[] = [];
|
||||
data.map((r: ResponseOrganiz) => {
|
||||
list.push({
|
||||
firstName: r.firstName ?? "",
|
||||
idCard: r.idCard ?? "",
|
||||
lastName: r.lastName ?? "",
|
||||
name: r.name ?? "",
|
||||
position: r.position ?? "",
|
||||
prefixId: r.prefixId ?? "",
|
||||
profileId: r.profileId ?? "",
|
||||
unit: r.unit ?? "",
|
||||
});
|
||||
});
|
||||
rowsModal.value = list;
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(async () => {
|
||||
hideLoader();
|
||||
});
|
||||
};
|
||||
const openDialog = (action: string) => {
|
||||
dialogVisible.value = true;
|
||||
clickAction.value = action;
|
||||
selectedModal.value = [];
|
||||
};
|
||||
const clickSavelist = () => {
|
||||
if (selectedModal.value.length > 0) {
|
||||
if (clickAction.value === "chairman") {
|
||||
chairman.value = selectedModal.value[0].name;
|
||||
} else if (clickAction.value === "director") {
|
||||
director.value = selectedModal.value[0].name;
|
||||
} else if (clickAction.value === "director2") {
|
||||
director2.value = selectedModal.value[0].name;
|
||||
}
|
||||
dialogVisible.value = false;
|
||||
} else dialogMessageNotify($q, "โปรดเลือกรายชื่อ");
|
||||
};
|
||||
|
||||
/**
|
||||
* class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
|
||||
|
|
@ -729,7 +812,10 @@ const getClass = (val: boolean) => {
|
|||
@update:model-value="(nameCommand = ''), (positionCommand = '')"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6">
|
||||
<div
|
||||
class="col-xs-12 col-md-6"
|
||||
v-if="byOrder !== '00000000-0000-0000-0000-000000000000'"
|
||||
>
|
||||
<selector
|
||||
:class="getClass(true)"
|
||||
outlined
|
||||
|
|
@ -766,7 +852,10 @@ const getClass = (val: boolean) => {
|
|||
hide-bottom-space
|
||||
/> -->
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-6">
|
||||
<div
|
||||
class="col-xs-12 col-md-6"
|
||||
v-if="byOrder !== '00000000-0000-0000-0000-000000000000'"
|
||||
>
|
||||
<q-input
|
||||
:class="getClass(true)"
|
||||
outlined
|
||||
|
|
@ -779,6 +868,36 @@ const getClass = (val: boolean) => {
|
|||
disable
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
class="col-xs-12 col-md-6"
|
||||
v-if="byOrder == '00000000-0000-0000-0000-000000000000'"
|
||||
>
|
||||
<q-input
|
||||
:class="getClass(true)"
|
||||
outlined
|
||||
dense
|
||||
lazy-rules
|
||||
v-model="nameCommand"
|
||||
:rules="[(val) => !!val || `${'กรุณากรอกผู้มีอำนาจลงนาม'}`]"
|
||||
:label="`${'ผู้มีอำนาจลงนาม'}`"
|
||||
hide-bottom-space
|
||||
/>
|
||||
</div>
|
||||
<div
|
||||
class="col-xs-12 col-md-6"
|
||||
v-if="byOrder == '00000000-0000-0000-0000-000000000000'"
|
||||
>
|
||||
<q-input
|
||||
:class="getClass(true)"
|
||||
outlined
|
||||
dense
|
||||
lazy-rules
|
||||
v-model="positionCommand"
|
||||
:rules="[(val) => !!val || `${'กรุณากรอกตำแหน่งผู้มีอำนาจลงนาม'}`]"
|
||||
:label="`${'ตำแหน่งผู้มีอำนาจลงนาม'}`"
|
||||
hide-bottom-space
|
||||
/>
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<q-separator v-if="typeOrder.commandCode" />
|
||||
</div>
|
||||
|
|
@ -1354,7 +1473,7 @@ const getClass = (val: boolean) => {
|
|||
outlined
|
||||
dense
|
||||
lazy-rules
|
||||
v-model="conclusionReceive"
|
||||
v-model="conclusionReturnNo"
|
||||
:rules="[
|
||||
(val) =>
|
||||
!!val ||
|
||||
|
|
@ -1372,7 +1491,7 @@ const getClass = (val: boolean) => {
|
|||
<div class="col-xs-12 col-md-6">
|
||||
<datepicker
|
||||
menu-class-name="modalfix"
|
||||
v-model="conclusionReceiveDate"
|
||||
v-model="conclusionReturnDate"
|
||||
:locale="'th'"
|
||||
autoApply
|
||||
borderless
|
||||
|
|
@ -1391,8 +1510,8 @@ const getClass = (val: boolean) => {
|
|||
dense
|
||||
class="full-width datepicker"
|
||||
:model-value="
|
||||
conclusionReceiveDate != null
|
||||
? date2Thai(conclusionReceiveDate)
|
||||
conclusionReturnDate != null
|
||||
? date2Thai(conclusionReturnDate)
|
||||
: null
|
||||
"
|
||||
:label="`${'ลงวันที่ '}`"
|
||||
|
|
@ -1811,6 +1930,7 @@ const getClass = (val: boolean) => {
|
|||
:rules="[(val) => !!val || `${'กรุณากรอกชื่อประธาน'}`]"
|
||||
:label="`${'ประธาน'}`"
|
||||
hide-bottom-space
|
||||
@click="openDialog('chairman')"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-4">
|
||||
|
|
@ -1840,6 +1960,7 @@ const getClass = (val: boolean) => {
|
|||
:rules="[(val) => !!val || `${'กรุณากรอกชื่อกรรมการ'}`]"
|
||||
:label="`${'กรรมการ'}`"
|
||||
hide-bottom-space
|
||||
@click="openDialog('director')"
|
||||
/>
|
||||
</div>
|
||||
<div class="col-xs-12 col-md-4">
|
||||
|
|
@ -1869,6 +1990,7 @@ const getClass = (val: boolean) => {
|
|||
:rules="[(val) => !!val || `${'กรุณากรอกชื่อกรรมการ'}`]"
|
||||
:label="`${'กรรมการ'}`"
|
||||
hide-bottom-space
|
||||
@click="openDialog('director2')"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -2247,10 +2369,161 @@ const getClass = (val: boolean) => {
|
|||
<q-tooltip>บันทึก</q-tooltip>
|
||||
</q-btn>
|
||||
</div>
|
||||
|
||||
<q-dialog v-model="dialogVisible">
|
||||
<q-card style="width: 900px; max-width: 80vw">
|
||||
<DialogHeader tittle="เลือกรายชื่อตามหน่วยงาน" v-close-popup />
|
||||
<q-separator />
|
||||
<q-card-section class="q-pa-sm bg-grey-1">
|
||||
<div class="row col-12 q-col-gutter-sm">
|
||||
<div class="col-xs-12 col-sm-5 row">
|
||||
<q-card flat bordered class="fit q-pa-sm">
|
||||
<q-scroll-area visible style="height: 70vh">
|
||||
<q-input
|
||||
outlined
|
||||
dense
|
||||
v-model="search"
|
||||
placeholder="ค้นหา"
|
||||
class="q-mb-sm"
|
||||
>
|
||||
<template v-slot:append>
|
||||
<q-icon name="mdi-magnify" />
|
||||
</template>
|
||||
</q-input>
|
||||
<q-tree
|
||||
:nodes="nodesTree"
|
||||
dense
|
||||
node-key="id"
|
||||
:filter="search"
|
||||
v-model:selected="selected"
|
||||
v-model:expanded="expanded"
|
||||
no-selection-unset
|
||||
selected-color="primary"
|
||||
@update:selected="onSelected"
|
||||
default-expand-all
|
||||
/>
|
||||
</q-scroll-area>
|
||||
</q-card>
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-7">
|
||||
<div class="col-12 row q-py-sm items-center">
|
||||
<q-space />
|
||||
<div class="items-center" style="display: flex">
|
||||
<q-input
|
||||
standout
|
||||
dense
|
||||
v-model="filterModal"
|
||||
ref="filterRef"
|
||||
outlined
|
||||
debounce="300"
|
||||
placeholder="ค้นหา"
|
||||
style="max-width: 200px"
|
||||
class="q-ml-sm"
|
||||
>
|
||||
<template v-slot:append>
|
||||
<q-icon v-if="filterModal == ''" name="search" />
|
||||
<q-icon
|
||||
v-if="filterModal !== ''"
|
||||
name="clear"
|
||||
class="cursor-pointer"
|
||||
/>
|
||||
</template>
|
||||
</q-input>
|
||||
|
||||
<!-- <q-select
|
||||
v-model="visibleColumnsModal"
|
||||
:display-value="$q.lang.table.columns"
|
||||
multiple
|
||||
outlined
|
||||
dense
|
||||
:options="columnsModal"
|
||||
options-dense
|
||||
option-value="name"
|
||||
map-options
|
||||
emit-value
|
||||
style="min-width: 150px"
|
||||
class="gt-xs q-ml-sm"
|
||||
/> -->
|
||||
</div>
|
||||
</div>
|
||||
<d-table
|
||||
:rows="rowsModal"
|
||||
:columns="columnsModal"
|
||||
:visible-columns="visibleColumnsModal"
|
||||
row-key="profileId"
|
||||
selection="single"
|
||||
v-model:selected="selectedModal"
|
||||
no-data-label="ไม่มีข้อมูล"
|
||||
:filter="filterModal"
|
||||
>
|
||||
<template v-slot:body-selection="scope">
|
||||
<q-checkbox
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
v-model="scope.selected"
|
||||
/>
|
||||
</template>
|
||||
|
||||
<template v-slot:body-cell="props">
|
||||
<q-td :props="props">
|
||||
<div v-if="props.col.name == 'no'">
|
||||
{{ props.rowIndex + 1 }}
|
||||
</div>
|
||||
|
||||
<div v-else>
|
||||
{{ props.value }}
|
||||
</div>
|
||||
</q-td>
|
||||
</template>
|
||||
</d-table>
|
||||
</div>
|
||||
</div>
|
||||
</q-card-section>
|
||||
<q-card-actions align="right">
|
||||
<q-btn
|
||||
dense
|
||||
unelevated
|
||||
label="บันทึก"
|
||||
color="public"
|
||||
@click="clickSavelist"
|
||||
class="q-px-md"
|
||||
/>
|
||||
</q-card-actions>
|
||||
</q-card>
|
||||
</q-dialog>
|
||||
</template>
|
||||
|
||||
<style>
|
||||
.q-field--with-bottom {
|
||||
padding-bottom: 0px;
|
||||
}
|
||||
.custom-header-table {
|
||||
max-height: 64vh;
|
||||
|
||||
.q-table tr:nth-child(odd) td {
|
||||
background: white;
|
||||
}
|
||||
|
||||
.q-table tr:nth-child(even) td {
|
||||
background: #f8f8f8;
|
||||
}
|
||||
|
||||
.q-table thead tr {
|
||||
background: #ecebeb;
|
||||
}
|
||||
|
||||
.q-table thead tr th {
|
||||
position: sticky;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.q-table thead tr:last-child th {
|
||||
top: 48px;
|
||||
}
|
||||
|
||||
.q-table thead tr:first-child th {
|
||||
top: 0;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue