eva => เพิ่ม Duty
This commit is contained in:
parent
85caf0207e
commit
c3d24fdc33
2 changed files with 35 additions and 24 deletions
|
|
@ -28,7 +28,7 @@ const {
|
||||||
columnsCertificates,
|
columnsCertificates,
|
||||||
columnSalaries,
|
columnSalaries,
|
||||||
columnTraining,
|
columnTraining,
|
||||||
columnProjectsProposed,
|
columnExperience,
|
||||||
columnAssessments,
|
columnAssessments,
|
||||||
} = store;
|
} = store;
|
||||||
|
|
||||||
|
|
@ -63,6 +63,7 @@ const formDetail = reactive<any>({
|
||||||
salaries: [],
|
salaries: [],
|
||||||
trainings: [],
|
trainings: [],
|
||||||
assessments: [],
|
assessments: [],
|
||||||
|
experience: [],
|
||||||
honor: [],
|
honor: [],
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -164,27 +165,7 @@ async function fetchCheckSpec(data: any) {
|
||||||
issueDate: date2Thai(e.issueDate),
|
issueDate: date2Thai(e.issueDate),
|
||||||
issuer: e.issuer,
|
issuer: e.issuer,
|
||||||
}));
|
}));
|
||||||
formDetail.salaries = data.salaries
|
formDetail.salaries = data.salaries;
|
||||||
// .map((e: any) => ({
|
|
||||||
// amount: e.amount,
|
|
||||||
// date: e.date,
|
|
||||||
// mouthSalaryAmount: e.mouthSalaryAmount ? e.mouthSalaryAmount : 0,
|
|
||||||
// posNo: e.posNo,
|
|
||||||
// position: e.position,
|
|
||||||
// positionSalaryAmount: e.positionSalaryAmount ? e.positionSalaryAmount : 0,
|
|
||||||
// refCommandDate: e.refCommandDate ? e.refCommandDate : "",
|
|
||||||
// salaryClass: e.salaryClass ? e.salaryClass : "",
|
|
||||||
// salaryRef: e.salaryRef ? e.salaryRef : "",
|
|
||||||
// salaryStatus: e.salaryStatus ? e.salariesStatus : "",
|
|
||||||
// //
|
|
||||||
// oc: "-",
|
|
||||||
// lineWork: "-",
|
|
||||||
// side: "-",
|
|
||||||
// positionType: "-",
|
|
||||||
// level: "-",
|
|
||||||
// positionsAdministrative: "-",
|
|
||||||
// aspectAdministrative: "-",
|
|
||||||
// }));
|
|
||||||
formDetail.trainings = data.trainings.map((e: any) => ({
|
formDetail.trainings = data.trainings.map((e: any) => ({
|
||||||
dateOrder: date2Thai(e.dateOrder),
|
dateOrder: date2Thai(e.dateOrder),
|
||||||
department: e.department,
|
department: e.department,
|
||||||
|
|
@ -577,7 +558,11 @@ onMounted(async () => {
|
||||||
<span class="q-ml-lg q-my-sm">ประสบการณ์ในการปฏิบัติงาน </span>
|
<span class="q-ml-lg q-my-sm">ประสบการณ์ในการปฏิบัติงาน </span>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-12"><q-separator /></div>
|
<div class="col-12"><q-separator /></div>
|
||||||
<div class="col-12 q-pa-sm">-</div>
|
<TableData
|
||||||
|
class="col-12"
|
||||||
|
:columns="columnExperience"
|
||||||
|
:row="formDetail.trainings"
|
||||||
|
/>
|
||||||
</q-card>
|
</q-card>
|
||||||
|
|
||||||
<q-card class="col-12 cardSp1" bordered>
|
<q-card class="col-12 cardSp1" bordered>
|
||||||
|
|
|
||||||
|
|
@ -9,6 +9,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => {
|
||||||
const mixin = useCounterMixin();
|
const mixin = useCounterMixin();
|
||||||
const { date2Thai, findOrgNameHtml, findOrgName } = mixin;
|
const { date2Thai, findOrgNameHtml, findOrgName } = mixin;
|
||||||
|
|
||||||
|
//ใบอนุญาตประกอบวิชาชีพ
|
||||||
const columnsCertificates = ref<QTableProps["columns"]>([
|
const columnsCertificates = ref<QTableProps["columns"]>([
|
||||||
{
|
{
|
||||||
name: "certificateType",
|
name: "certificateType",
|
||||||
|
|
@ -57,6 +58,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => {
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
//ประวัติการรับราชการ
|
||||||
const columnSalaries = ref<QTableProps["columns"]>([
|
const columnSalaries = ref<QTableProps["columns"]>([
|
||||||
{
|
{
|
||||||
name: "commandDateAffect",
|
name: "commandDateAffect",
|
||||||
|
|
@ -237,6 +239,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => {
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
//ประวัติการฝึกอบรมดูงาน
|
||||||
const columnTraining = ref<QTableProps["columns"]>([
|
const columnTraining = ref<QTableProps["columns"]>([
|
||||||
{
|
{
|
||||||
name: "name",
|
name: "name",
|
||||||
|
|
@ -354,7 +357,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => {
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
/** ผลงานที่เคยเสนอขอประเมิน (ถ้ามี)*/
|
//ผลงานที่เคยเสนอขอประเมิน (ถ้ามี)
|
||||||
const columnAssessments = ref<QTableProps["columns"]>([
|
const columnAssessments = ref<QTableProps["columns"]>([
|
||||||
{
|
{
|
||||||
name: "date",
|
name: "date",
|
||||||
|
|
@ -448,6 +451,28 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => {
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
//ประสบการณ์ในการปฏิบัติงาน
|
||||||
|
const columnExperience = ref<QTableProps["columns"]>([
|
||||||
|
{
|
||||||
|
name: "name",
|
||||||
|
align: "left",
|
||||||
|
label: "ชื่อผลงาน",
|
||||||
|
sortable: true,
|
||||||
|
field: "name",
|
||||||
|
headerStyle: "font-size: 14px",
|
||||||
|
style: "font-size: 14px",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "detail",
|
||||||
|
align: "left",
|
||||||
|
label: "รายละเอียดผลงาน",
|
||||||
|
sortable: true,
|
||||||
|
field: "detail",
|
||||||
|
headerStyle: "font-size: 14px",
|
||||||
|
style: "font-size: 14px",
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
function textRangePoint(val: number | undefined) {
|
function textRangePoint(val: number | undefined) {
|
||||||
if (val == undefined) val = -1;
|
if (val == undefined) val = -1;
|
||||||
if (val < 60.0) return "(คะแนนต่ำกว่าร้อยละ 60.00)";
|
if (val < 60.0) return "(คะแนนต่ำกว่าร้อยละ 60.00)";
|
||||||
|
|
@ -473,6 +498,7 @@ export const useEvaluateDetailStore = defineStore("evaluateDetailStore", () => {
|
||||||
columnSalaries,
|
columnSalaries,
|
||||||
columnTraining,
|
columnTraining,
|
||||||
columnProjectsProposed,
|
columnProjectsProposed,
|
||||||
|
columnExperience,
|
||||||
columnAssessments,
|
columnAssessments,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue