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

Merge branch 'develop' into devTee

Browse source
This commit is contained in:
setthawutttty 2023-11-30 14:18:15 +07:00
commit b78b1c99c0
5 changed files with 36 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/api/11_discipline/api.discipline.ts
View file

@ -53,7 +53,7 @@ export default {
disciplineDisciplinaryById: (id: string) => `${discipline}/${id}`,
disciplineInvestigateById: (id: string) => `${discipline}/investigate/${id}`,
disciplineComplaintsById: (id: string) => `${discipline}/complaint/${id}`,
disciplineDirector: () => `${discipline}/director`,
// disciplineDirector: () => `${disciplineMain}/director`,
disciplineDoc: (type: string, id: string) =>
`${discipline}/${type}/file/${id}`,
disciplineByIdDoc: (type: string, id: string, docId: string) =>

53
src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue
View file

@ -3,7 +3,7 @@ import { ref, onMounted, reactive, watch } from "vue";
import http from "@/plugins/http";
import config from "@/app.config";
import { useQuasar } from "quasar";
import { useRoute,useRouter } from "vue-router";
import { useRoute, useRouter } from "vue-router";
/**import type*/
import type { QTableProps } from "quasar";
@ -357,7 +357,7 @@ async function fetchDatadetail() {
disciplineDisciplinary_DocRelevants.value =
props.data.disciplineDisciplinary_DocRelevants;
investigateDis.rowSent = formData.persons
investigateDis.rowSent = formData.persons;
/** MAP รายชื่อกรรมการ หน้าหลัก */
let datalistDirector: responseType[] = formData.directors.map(
@ -402,7 +402,7 @@ async function addPerson(data: Persons[]) {
}));
const mergedArray = [...formData.persons, ...newPerson];
formData.persons = mergedArray;
investigateDis.rowSent = formData.persons
investigateDis.rowSent = formData.persons;
toggleModal();
}
@ -451,8 +451,11 @@ async function fetchDListDirector() {
showLoader();
await http
.get(
config.API.disciplineDirector() +
`?page=${page.value}&pageSize=${rowsPerPage.value}&keyword=${filterKeyword2.value}`
config.API.directorList(
page.value,
rowsPerPage.value,
filterKeyword2.value
)
)
.then((res) => {
maxPage.value = Math.ceil(res.data.result.total / rowsPerPage.value);
@ -683,25 +686,29 @@ onMounted(async () => {
{{ props.rowIndex + 1 }}
</div>
<div v-else-if="col.name == 'info'">
<q-btn
size="14px"
flat
round
dense
color="info"
icon="info"
@click="
router.push(`/registry/${props.row.personId}`)
"
><q-tooltip>ดูข้อมูลในทะเบียนประวัติ</q-tooltip></q-btn
<q-btn
size="14px"
flat
round
dense
color="info"
icon="info"
@click="
router.push(
`/registry/${props.row.personId}`
)
"
><q-tooltip
>ดูข้อมูลในทะเบียนประวัติ</q-tooltip
></q-btn
>
</div>
<div
v-else-if="col.name === 'organization'"
class="table_ellipsis"
>
</div>
<div
v-else-if="col.name === 'organization'"
class="table_ellipsis"
>
{{ props.row.organization }}
</div>
{{ props.row.organization }}
</div>
<div v-else>
{{ col.value }}
</div>

2
src/modules/11_discipline/store.ts
View file

@ -36,6 +36,8 @@ export const useStoreResultMain = defineStore("resultMain", () => {
return "ยุติเรื่อง";
case "SEND_DISCIPLINARY":
return "ส่งไปสอบสวน";
case "DONE":
return "ส่งไปสรุปผลการพิจารณาทางวินัย";
}
}
return { convertRespondentType, convertFault, convertStatus };

39
src/modules/11_discipline/store/InvestigateDisStore.ts
View file

@ -59,7 +59,7 @@ export const useInvestigateDisStore = defineStore(
const statusOps = ref<DataOption[]>([
{ id: "NEW", name: "กำลังสอบสวน" },
{ id: "STOP", name: "ยุติเรื่อง" },
{ id: "COMPLETE", name: "ส่งไปสอบสวน" },
{ id: "DONE", name: "ส่งไปสรุปผลการพิจารณา" },
]);
const causeTextOptions = ref<DataOption[]>([
@ -86,6 +86,7 @@ export const useInvestigateDisStore = defineStore(
rows.value = datalist;
}
async function fecthDirector(data: directorType[]) {
let datalistDirector: responseType[] = data.map((e: directorType) => ({
id: e.id,
@ -125,42 +126,6 @@ export const useInvestigateDisStore = defineStore(
return "-";
}
}
function convertSatatus(val: string) {
switch (val) {
case "0":
return "เสร็จสิ้นแล้ว";
case "1":
return "ยุติเรื่อง";
}
}
function activeStatus(val: string) {
switch (val) {
case "0":
return "กำลังยืนยันผล";
case "1":
return "ยืนยันผลเเล้ว";
case "2":
return "ยืนยันผล";
}
}
function convertPenaltyLevel(val: string) {
switch (val) {
case "0":
return "ไม่ร้ายแรง";
case "1":
return "ภาคทัณฑ์";
case "3":
return "ตัดเงินเดือน";
case "4":
return "ลดขั้นเงินเดือน";
case "5":
return "ร้ายแรง";
case "6":
return "ปลดออก";
case "7":
return "ไล่ออก";
}
}
const visibleColumns = ref<String[]>([
"no",

2
src/modules/11_discipline/store/InvestigateFactStore.ts
View file

@ -50,7 +50,7 @@ export const useInvestigateFactStore = defineStore(
const faultOps = ref<DataOption[]>([
{ id: "NEW", name: "กำลังสืบสวน" },
{ id: "STOP", name: "ยุติเรื่อง" },
{ id: "COMPLETE", name: "ส่งไปสอบสวน" },
{ id: "SEND_DISCIPLINARY", name: "ส่งไปสอบสวน" },
]);
const investigationStatusResultOptions = ref<DataOption[]>([
{ id: "NOT_SPECIFIED", name: "ยังไม่ระบุ" },