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

แก้ลบ ผู้ร้องเรียน

Browse source
This commit is contained in:
setthawutttty 2024-12-20 14:20:26 +07:00
parent d84e590670
commit 02b96da93b
3 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/modules/11_discipline/components/2_InvestigateFacts/Form.vue
View file

@ -33,7 +33,7 @@ const checkRoutePermisson = ref<boolean>(
const id = ref<string>(route.params.id as string); const id = ref<string>(route.params.id as string);
const modalPerson = ref<boolean>(false); const modalPerson = ref<boolean>(false);
const toggleModal = () => (modalPerson.value = !modalPerson.value); const toggleModal = () => (modalPerson.value = !modalPerson.value);
const isEmpType = ref<string>('') const isEmpType = ref<string>("");
/**เรียกใช้ store */ /**เรียกใช้ store */
const investigateFactStore = useInvestigateFactStore(); const investigateFactStore = useInvestigateFactStore();
const mainStore = useDisciplineMainStore(); const mainStore = useDisciplineMainStore();
@ -544,10 +544,10 @@ async function saveDuty(id: string, duty: string, resolution: string) {
} }
/** ดูข้อมูลในทะเบียนประวัติ */ /** ดูข้อมูลในทะเบียนประวัติ */
function onclickViewinfo(id: string,type:string) { function onclickViewinfo(id: string, type: string) {
modalPersonal.value = true; modalPersonal.value = true;
personId.value = id; personId.value = id;
isEmpType.value = type isEmpType.value = type;
} }
/** อัพเดต ปิด/เปิดเมนู ทะเบียนประวัติ */ /** อัพเดต ปิด/เปิดเมนู ทะเบียนประวัติ */
@ -646,7 +646,7 @@ watch(props.data, async () => {
formData.investigationExtendHistory = formData.investigationExtendHistory =
props.data.investigationExtendHistory; props.data.investigationExtendHistory;
mainStore.rowsAdd = props.data.persons.map((person: any) => ({ const listDataMain = props.data.persons.map((person: any) => ({
id: person.id, id: person.id,
idcard: person.idcard, idcard: person.idcard,
name: person.name, name: person.name,
@ -663,7 +663,6 @@ watch(props.data, async () => {
isSend: person.isSend, isSend: person.isSend,
isDisciplinary: person.isDisciplinary, isDisciplinary: person.isDisciplinary,
isAncestorDNA: person.isAncestorDNA, isAncestorDNA: person.isAncestorDNA,
root: person.root, root: person.root,
rootId: person.rootId, rootId: person.rootId,
rootShortName: person.rootShortName, rootShortName: person.rootShortName,
@ -686,6 +685,8 @@ watch(props.data, async () => {
posLevelName: person.posLevelName, posLevelName: person.posLevelName,
citizenId: person.idcard, citizenId: person.idcard,
})); }));
mainStore.rowsAdd = listDataMain;
mainStore.rowsAddCheck = listDataMain;
mainStore.rowsCheck = mainStore.rowsAdd.filter( mainStore.rowsCheck = mainStore.rowsAdd.filter(
(item: any) => item.isDisciplinary === false && item.isSend === "NEW" (item: any) => item.isDisciplinary === false && item.isSend === "NEW"
); );
@ -964,9 +965,12 @@ onMounted(async () => {
</q-btn> </q-btn>
<q-btn <q-btn
v-if=" v-if="
!isReadonly && (!isReadonly &&
!checkRoutePermisson && !checkRoutePermisson &&
props.row.isAncestorDNA === false props.row.isAncestorDNA === false) ||
!mainStore.rowsAddCheck.some(
(row) => row.personId === props.row.personId
)
" "
flat flat
round round

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

@ -331,7 +331,7 @@ async function fetchDatadetail() {
formData.disciplinaryResult = props.data.disciplinaryResult; formData.disciplinaryResult = props.data.disciplinaryResult;
formData.disciplinaryExtendHistory = props.data.disciplinaryExtendHistory; formData.disciplinaryExtendHistory = props.data.disciplinaryExtendHistory;
mainStore.rowsAdd = props.data.persons.map((person: any) => ({ const listDataMain = props.data.persons.map((person: any) => ({
id: person.id, id: person.id,
idcard: person.idcard, idcard: person.idcard,
name: person.name, name: person.name,
@ -374,6 +374,8 @@ async function fetchDatadetail() {
posLevelId: person.posLevelId, posLevelId: person.posLevelId,
citizenId: person.idcard, citizenId: person.idcard,
})); }));
mainStore.rowsAdd = listDataMain;
mainStore.rowsAddCheck = listDataMain;
mainStore.rowsCheck = mainStore.rowsAdd.filter( mainStore.rowsCheck = mainStore.rowsAdd.filter(
(item: any) => item.isSuspend === "NEW" && item.isSend === "NEW" (item: any) => item.isSuspend === "NEW" && item.isSend === "NEW"
); );
@ -946,9 +948,12 @@ onMounted(async () => {
</q-btn> </q-btn>
<q-btn <q-btn
v-if=" v-if="
!checkRoutePermisson && (!checkRoutePermisson &&
!isReadonly && !isReadonly &&
props.row.isAncestorDNA === false props.row.isAncestorDNA === false) ||
!mainStore.rowsAddCheck.some(
(row) => row.personId === props.row.personId
)
" "
flat flat
round round

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

@ -31,6 +31,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
{ id: "ไม่ร้ายแรง", name: "ไม่ร้ายแรง" }, { id: "ไม่ร้ายแรง", name: "ไม่ร้ายแรง" },
]); ]);
const rowsAdd = ref<ArrayPersonAdd[]>([]); const rowsAdd = ref<ArrayPersonAdd[]>([]);
const rowsAddCheck = ref<ArrayPersonAdd[]>([]);
const rowsSend = ref<ArrayPersonAdd[]>([]); const rowsSend = ref<ArrayPersonAdd[]>([]);
const rowsCheck = ref<ArrayPersonAdd[]>([]); const rowsCheck = ref<ArrayPersonAdd[]>([]);
/** หัวตารางผู้ถูกร้องเรียน */ /** หัวตารางผู้ถูกร้องเรียน */
@ -542,6 +543,7 @@ export const useDisciplineMainStore = defineStore("disciplineMainStore", () => {
columnsDirector, columnsDirector,
visibleColumnsDirector, visibleColumnsDirector,
rowsAdd, rowsAdd,
rowsAddCheck,
fetchData, fetchData,
statusResultOptions, statusResultOptions,
convertStatusResult, convertStatusResult,