diff --git a/src/api/reports/api.report.ts b/src/api/reports/api.report.ts index 410060d13..889e26301 100644 --- a/src/api/reports/api.report.ts +++ b/src/api/reports/api.report.ts @@ -30,7 +30,8 @@ export default { `${reportProbation}/13/${type}/${id}`, reportEvaluateRecord1: (type: string, id: string) => `${reportProbation}/14/${type}/${id}`, - // reportEvaluateRecord2:(type:string, id:string) => `${reportProbation}/15/${type}/${id}`, + reportEvaluateRecord2: (type: string, id: string) => + `${reportProbation}/15/${type}/${id}`, reportEvaluate: (type: string, id: string) => `${reportProbation}/16/${type}/${id}`, reportEvaluateChairman: (type: string, id: string) => diff --git a/src/components/Dialogs/AddPersonal.vue b/src/components/Dialogs/AddPersonal.vue index 264c245d2..1efebccab 100644 --- a/src/components/Dialogs/AddPersonal.vue +++ b/src/components/Dialogs/AddPersonal.vue @@ -45,9 +45,11 @@ interface tableType { } const rows = ref([]); +const rowsMain = ref([]); const type = ref("citizenId"); const search = ref(""); const selected = ref([]); +const isSelect = ref(false); const employeeClass = ref("officer"); const employeeClassOption = ref([ @@ -105,6 +107,8 @@ const emit = defineEmits(["returnData"]); async function close() { modal.value = false; rows.value = []; + rowsMain.value = []; + selected.value = []; employeeClass.value = "officer"; search.value = ""; } @@ -196,24 +200,26 @@ async function getSearch() { child3DnaId: e.child3DnaId, child4DnaId: e.child4DnaId, })); + rowsMain.value = list; + rows.value = list; - if (route.name == "disciplineInvestigatefactsEdit") { - const idIsSend = mainStore.rowsAdd - .filter( - (item: any) => item.isSend === "DONE" || item.isAncestorDNA === true - ) - .map((item: any) => item.personId); - rows.value = list.filter( - (item: any) => !idIsSend.includes(item.personId) - ); - } else { - const idIsSend = mainStore.rowsAdd - .filter((item: any) => item.isAncestorDNA === true) - .map((item: any) => item.personId); - rows.value = list.filter( - (item: any) => !idIsSend.includes(item.personId) - ); - } + // if (route.name == "disciplineInvestigatefactsEdit") { + // const idIsSend = mainStore.rowsAdd + // .filter( + // (item: any) => item.isSend === "DONE" || item.isAncestorDNA === true + // ) + // .map((item: any) => item.personId); + // rows.value = list.filter( + // (item: any) => !idIsSend.includes(item.personId) + // ); + // } else { + // const idIsSend = mainStore.rowsAdd + // .filter((item: any) => item.isAncestorDNA === true) + // .map((item: any) => item.personId); + // rows.value = list.filter( + // (item: any) => !idIsSend.includes(item.personId) + // ); + // } }) .catch((err) => { messageError($q, err); @@ -226,20 +232,33 @@ async function getSearch() { function updateSelect() { search.value = ""; } -watch( - () => props.selectedData, - () => { - if (props.selectedData) { - selected.value = props.selectedData; - } - } -); +// watch( +// () => props.selectedData, +// () => { +// if (props.selectedData) { +// selected.value = props.selectedData; +// } +// } +// ); function updatePagination(newPagination: any) { pagination.value.page = 1; pagination.value.rowsPerPage = newPagination.rowsPerPage; } +function checkList(propsRow: tableType) { + // const filterCondition = + // route.name === "disciplineInvestigatefactsEdit" + // ? (item: any) => item.isSend === "DONE" || item.isAncestorDNA === true + // : (item: any) => item.isAncestorDNA === true; + + const idIsSend = mainStore.rowsAdd + // .filter(filterCondition) + .map((item: any) => item.personId); + + return !idIsSend.includes(propsRow.personId); +} + watch( () => pagination.value.rowsPerPage, async () => { @@ -384,11 +403,20 @@ watch( +
diff --git a/src/modules/03_recruiting/components/Education.vue b/src/modules/03_recruiting/components/Education.vue index 436c083ff..c0fae43d4 100644 --- a/src/modules/03_recruiting/components/Education.vue +++ b/src/modules/03_recruiting/components/Education.vue @@ -129,10 +129,7 @@ const getClass = (val: boolean) => {
-
+
{ :label="`${'ชื่อปริญญา'}`" />
-
+
v.code === "C-PM-11" || v.code === "C-PM-12" ); + console.log(listCommand.value); } } } diff --git a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue index 354526790..292631d95 100644 --- a/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue +++ b/src/modules/05_placement/components/probation/FormEvaluation/Template1.vue @@ -132,6 +132,7 @@ onMounted(async () => { :checkPermission="probationStore?.dataPermissions?.tab2?.isEdit as boolean" :is-max="probationStore.tabs.length === 3" /> + { const data = res.data.result; await genReport( @@ -108,7 +108,7 @@ async function FileDownload(type: string) { //ผุ้บังคับ showLoader(); await http - .get(config.API.reportEvaluateRecord1(type, numTab.id)) + .get(config.API.reportEvaluateRecord2(type, numTab.id)) .then(async (res) => { const data = res.data.result; await genReport( @@ -148,6 +148,7 @@ onMounted(async () => { :checkPermission="probationStore?.dataPermissions?.tab3?.isEdit as boolean" :is-max="probationStore.tabs.length === 3" /> + { unelevated color="public" type="submit" - :disable=" + :disable="!typeReport || !org" + /> +
diff --git a/src/modules/11_discipline/components/1_Complaint/Form.vue b/src/modules/11_discipline/components/1_Complaint/Form.vue index 9c085af6b..f09578759 100644 --- a/src/modules/11_discipline/components/1_Complaint/Form.vue +++ b/src/modules/11_discipline/components/1_Complaint/Form.vue @@ -182,7 +182,7 @@ function handleSave(returnData: any) { } /** - * ฟังก์ชั่นสำหรับอัพโหลดไฟล์เอกสารหลักฐาน + * ฟังก์ชั่นสำหรับอัปโหลดไฟล์เอกสารหลักฐาน */ function upLoadFileDoc() { const Data = new FormData(); @@ -195,7 +195,7 @@ function upLoadFileDoc() { countNum.value = 2; formData.documentFile = null; - success($q, "อัพโหลดไฟล์สำเร็จ"); + success($q, "อัปโหลดไฟล์สำเร็จ"); }) .catch((e) => { messageError($q, e); @@ -960,7 +960,7 @@ onMounted(async () => {
- +
diff --git a/src/modules/11_discipline/components/1_Complaint/TableComplaint.vue b/src/modules/11_discipline/components/1_Complaint/TableComplaint.vue index a0bccc8fd..6f6758130 100644 --- a/src/modules/11_discipline/components/1_Complaint/TableComplaint.vue +++ b/src/modules/11_discipline/components/1_Complaint/TableComplaint.vue @@ -173,10 +173,12 @@ onMounted(() => { @click="onDetail(props.row.id)" >รายละเอียด + {
-
{ + console.log(res); + const dataList = res.data.result; dataInvestigatefacts.id = dataList.id; dataInvestigatefacts.idComplaint = dataList.idComplaint; @@ -191,6 +193,8 @@ async function fetchDetailInvestigate() { dataList.investigationDaysExtend; dataInvestigatefacts.organizationId = dataList.organizationId; dataInvestigatefacts.organization = dataList.organization; + dataInvestigatefacts.investigationExtendHistory = + dataList.investigationExtendHistory; }) .catch((err) => { messageError($q, err); diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue index 7d7ad81db..1afb7673e 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Form.vue @@ -1849,7 +1849,7 @@ onMounted(async () => {
- +
diff --git a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue index 04ae6b6ac..950ff47e7 100644 --- a/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue +++ b/src/modules/11_discipline/components/3_InvestigateDisciplinary/Table.vue @@ -244,7 +244,8 @@ function filterOptionFn(val: string, update: Function) {
- +
diff --git a/src/modules/11_discipline/components/8_AppealComplain/Form.vue b/src/modules/11_discipline/components/8_AppealComplain/Form.vue index dea819eea..51b746fdb 100644 --- a/src/modules/11_discipline/components/8_AppealComplain/Form.vue +++ b/src/modules/11_discipline/components/8_AppealComplain/Form.vue @@ -658,7 +658,7 @@ onMounted(() => {
- +
{ file.value = null; props.fetchData(); - success($q, "บันทึกข้อมูลสำเร็จ"); + success($q, "อัปโหลดไฟล์สำเร็จ"); }) .catch((e) => { messageError($q, e); diff --git a/src/modules/11_discipline/interface/response/complaint.ts b/src/modules/11_discipline/interface/response/complaint.ts index 0d82c29e0..f3e69103c 100644 --- a/src/modules/11_discipline/interface/response/complaint.ts +++ b/src/modules/11_discipline/interface/response/complaint.ts @@ -9,6 +9,7 @@ interface DataListRow { levelConsideration: string; dateConsideration: string | null; status: string; + statusMain?: string; } interface DataAdd { id: string; diff --git a/src/modules/11_discipline/store/ComplaintsStore.ts b/src/modules/11_discipline/store/ComplaintsStore.ts index 7993b203c..e35f4ef5e 100644 --- a/src/modules/11_discipline/store/ComplaintsStore.ts +++ b/src/modules/11_discipline/store/ComplaintsStore.ts @@ -45,6 +45,7 @@ export const useComplainstDataStore = defineStore( ? date2Thai(e.dateConsideration) : "-", status: e.status ? statusTothai(e.status) : "-", + statusMain: e.status, })); rows.value = dataList; } diff --git a/src/modules/11_discipline/store/InvestigateDisStore.ts b/src/modules/11_discipline/store/InvestigateDisStore.ts index d93cdce23..f582bddb1 100644 --- a/src/modules/11_discipline/store/InvestigateDisStore.ts +++ b/src/modules/11_discipline/store/InvestigateDisStore.ts @@ -277,6 +277,7 @@ export const useInvestigateDisStore = defineStore( )}` : "-", status: convertStatus(e.status) ?? "-", + startMain: e.status, dateReceived: e.dateReceived ? date2Thai(e.dateReceived) : "-", })); diff --git a/src/modules/15_development/components/Budget.vue b/src/modules/15_development/components/Budget.vue index 2661281fd..ce85a9f88 100644 --- a/src/modules/15_development/components/Budget.vue +++ b/src/modules/15_development/components/Budget.vue @@ -204,6 +204,7 @@ defineExpose({ label="จํานวนงบประมาณที่ขอรับการจัดสรร ฯ" mask="###,###,###,###,###" reverse-fill-mask + maxlength="18" @update:model-value="props.onCheckChangeData()" />
@@ -216,6 +217,7 @@ defineExpose({ v-model="formData.receive" mask="###,###,###,###,###" reverse-fill-mask + maxlength="18" label="จํานวนงบประมาณที่ได้รับการจัดสรร ฯ" @update:model-value="props.onCheckChangeData()" /> diff --git a/src/modules/15_development/components/scholarship/DetailView.vue b/src/modules/15_development/components/scholarship/DetailView.vue index c61b07099..a16e770c5 100644 --- a/src/modules/15_development/components/scholarship/DetailView.vue +++ b/src/modules/15_development/components/scholarship/DetailView.vue @@ -1028,6 +1028,7 @@ onMounted(async () => { label="งบประมาณที่ได้รับอนุมัติตลอดหลักสูตร" mask="###,###,###,###,###,###" reverse-fill-mask + maxlength="18" :rules="[ (val: any) => { if (!val && !formBody.isNoUseBudget && formBody.fundType != 'FUND4') { diff --git a/src/modules/15_development/components/scholarship/DialogReturn.vue b/src/modules/15_development/components/scholarship/DialogReturn.vue index 0c0199316..27131c4b7 100644 --- a/src/modules/15_development/components/scholarship/DialogReturn.vue +++ b/src/modules/15_development/components/scholarship/DialogReturn.vue @@ -159,7 +159,7 @@ watch( class="inputgreen" :rules="[ (val:string) => - !!val || `${'กรุณากรอกหนังสือรายงานตัวกลับเข้าปฏิบัติราชการลงวันที่'}`, + !!val || `${'กรุณาเลือกลงวันที่ของหนังสือรายงานตัวกลับเข้าปฏิบัติราชการ'}`, ]" >