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

Merge branch 'develop' into warunee-dev

Browse source 
# Conflicts:
#	src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore copy.vue
#	src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAdd.vue
This commit is contained in:
Warunee Tamkoo 2023-09-26 15:30:23 +07:00
commit 556264c5f2
59 changed files with 1785 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/TableHistory.vue
View file

@ -161,11 +161,6 @@ const props = defineProps({
type: Boolean,
defualt: false,
},
// optionsHistory: Array,
// updateHistory: {
// type: Function,
// default: () => console.log("not function"),
// },
});
const emit = defineEmits([

1
src/components/information/Document.vue
View file

@ -216,7 +216,6 @@ const uploadData = async () => {
const formData = new FormData();
formData.append("avatar", newFile);
formData.append("moss", "newFile");
console.log(formData);
showLoader();
await http
.post(config.API.profilePaperId(profileId.value), formData)

2
src/components/information/Image.vue
View file

@ -332,7 +332,6 @@ const fetchData = async () => {
.get(config.API.profileAvatarId(route.params.id.toString()))
.then((res) => {
const data = res.data.result;
// console.log(data);
fullname.value = data.fullname;
imageUrl.value = data.avatar;
position.value = data.position;
@ -363,7 +362,6 @@ const fetchAvatarHistory = async () => {
.get(config.API.profileAvatarHistoryId(route.params.id.toString()))
.then((res) => {
const data = res.data.result;
console.log(data);
images.value = [];
data.map((e: any) => {
images.value.push({

3
src/components/information/Leave.vue
View file

@ -723,7 +723,6 @@ const fetchData = async () => {
.get(config.API.profileLeaveId(profileId.value))
.then((res) => {
const data = res.data.result;
// console.log(data);
data.map((e: ResponseObject) => {
rows.value.push({
id: e.id,
@ -909,7 +908,6 @@ const clickAddLeave = async () => {
numUsedLeave.value = 0;
await clickTotal();
if (rowsTotal.value.length > 0) {
// console.log(rowsTotal.value);
let data: DataOptionLeave[] = [];
rowsTotal.value.map((e: ResponseTotalObject) => {
data.push({
@ -1131,7 +1129,6 @@ const selectData = async (props: DataProps) => {
numUsedLeave.value = props.row.sumLeave;
await clickTotal();
if (rowsTotal.value.length > 0) {
// console.log(rowsTotal.value);
let data: DataOptionLeave[] = [];
rowsTotal.value.map((e: ResponseTotalObject) => {
data.push({

4
src/components/information/SalaryEmployee.vue
View file

@ -1479,7 +1479,6 @@ const fetchData = async () => {
.get(config.API.profileSalaryEmployeeId(profileId.value))
.then((res) => {
const data = res.data.result;
// console.log(data);
rows.value = [];
data.map((e: ResponseObjectEmployee) => {
rows.value.push({
@ -1600,7 +1599,6 @@ const checkRowPage = () => {
editRow.value = false;
next.value = true;
previous.value = true;
// console.log(rowIndex.value);
if (rowIndex.value + 1 >= rows.value.length) {
next.value = false;
}
@ -1834,7 +1832,6 @@ const clickClose = async () => {
* @param props ค่า props ใน row ที่เลือก
*/
const selectData = async (props: DataPropsEmployee) => {
// console.log(props.row);
modalEdit.value = true;
modal.value = true;
edit.value = false;
@ -1945,7 +1942,6 @@ const clickHistory = async (row: RequestItemsEmployee) => {
.get(config.API.profileSalaryHisId(row.id))
.then((res) => {
const data = res.data.result;
// console.log("clickHistory", data);
rowsHistory.value = [];
data.map((e: ResponseObjectEmployee) => {
rowsHistory.value.push({

4
src/components/information/SalaryEmployeeTemp.vue
View file

@ -1509,7 +1509,6 @@ const fetchData = async () => {
.get(config.API.profileSalaryEmployeeId(profileId.value))
.then((res) => {
const data = res.data.result;
// console.log(data);
rows.value = [];
data.map((e: ResponseObjectEmployee) => {
rows.value.push({
@ -1630,7 +1629,6 @@ const checkRowPage = () => {
editRow.value = false;
next.value = true;
previous.value = true;
// console.log(rowIndex.value);
if (rowIndex.value + 1 >= rows.value.length) {
next.value = false;
}
@ -1864,7 +1862,6 @@ const clickClose = async () => {
* @param props ค่า props ใน row ที่เลือก
*/
const selectData = async (props: DataPropsEmployee) => {
// console.log(props.row);
modalEdit.value = true;
modal.value = true;
edit.value = false;
@ -1975,7 +1972,6 @@ const clickHistory = async (row: RequestItemsEmployee) => {
.get(config.API.profileSalaryHisId(row.id))
.then((res) => {
const data = res.data.result;
// console.log("clickHistory", data);
rowsHistory.value = [];
data.map((e: ResponseObjectEmployee) => {
rowsHistory.value.push({

3
src/modules/02_organizational/components/AddMappingPositions.vue
View file

@ -954,8 +954,6 @@ const fetchPosition = async () => {
.get(config.API.position)
.then((res) => {
const data = res.data.result;
console.log(data.positionPaths);
let optionpositionpaths: DataOption[] = [];
data.positionPaths.map((r: any) => {
optionpositionpaths.push({
@ -1394,7 +1392,6 @@ const clickHistory = async (row: RequestItemsObject) => {
let data = res.data.result;
rowsHistory.value = [];
data.map((e: RequestItemsObject, index: number) => {
console.log(index);
if (index != 0) {
rowsHistory.value.push({
id: e.id,

19
src/modules/02_organizational/components/Tree/MappingPositions.vue
View file

@ -385,7 +385,7 @@ const ddNoResultMsg = defineAsyncComponent(
); //แสดงข้อความเมื่อ Dropdown Filter ไม่เจอข้อมูล
const mixin = useCounterMixin();
const { showLoader, hideLoader } = mixin;
const { showLoader, hideLoader, messageError } = mixin;
const $q = useQuasar(); // show dialog
const emit = defineEmits(["update:positions", "update:formprops"]);
const props = defineProps({
@ -405,8 +405,6 @@ watch(myForm, (form: QForm | null, prevForm: QForm | null) => {
if (!props.isAddNew) {
positions.value.push(JSON.parse(JSON.stringify(positionSet.value)));
if (!props.editObj != null && !props.editObj != undefined) {
// console.log("position.value", position.value);
// console.log("props.editObj", props.editObj);
positions.value[0].positionMasterId = props.editObj?.positionMasterId;
positions.value[0].positionUserNote = props.editObj?.positionUserNote;
positions.value[0].isActive = props.editObj?.isActive;
@ -442,7 +440,6 @@ const fetchPositionMaster = async () => {
// .get(config.API.getPostionMasterDraft(false))
.get(config.API.getPostionMaster(false))
.then((res) => {
// console.log("psMaster:", res.data.result);
res.data.result.map((e: any) => {
positionFilter.value.push({
id: e.id,
@ -475,7 +472,7 @@ const fetchPositionMaster = async () => {
});
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -503,7 +500,6 @@ const filterFn = (val: string, update: any) => {
(v: any) => v.positionPath != null && v.positionPath.indexOf(val) > -1
);
});
// console.log(positions.value);
};
/**Add new positionSet item into positions
@ -511,7 +507,6 @@ const filterFn = (val: string, update: any) => {
*ข้อมูลไม่ครบแสดง Alert เตือนให้รู้เฉยๆ แล้วไม่ให้เพิ่ม
*/
const addPositionItem = () => {
// console.log(positions.value);
myForm.value!.validate().then((result) => {
if (result) {
positions.value.push(JSON.parse(JSON.stringify(positionSet.value)));
@ -539,15 +534,15 @@ const deletePositionItem = (val: object) => {
persistent: true,
})
.onOk(() => {
// console.log(">>>> OK");
positions.value = positions.value.filter((x: object) => x !== val); //คำสั่งลบ
// console.log(positions.value);
})
.onCancel(() => {
// console.log(">>>> Cancel");
})
.onDismiss(() => {
// console.log("I am triggered on both OK and Cancel");
});
} else {
positions.value = positions.value.filter((x: object) => x !== val);
@ -560,11 +555,9 @@ const deletePositionItem = (val: object) => {
* @param items Array of position
*/
const isEmptyPosition = (items: any[]) => {
console.log("items", items);
const isEmpty = items.map((f: any) => !f.positionMasterId);
// ถ้าว่างเป็น true
// ถ้ามี data false
console.log("isEmpty", isEmpty[0]);
return isEmpty[0];
};

42
src/modules/02_organizational/components/Tree/OrganizationDialog.vue
View file

@ -345,7 +345,7 @@ const props = defineProps({
const emit = defineEmits(["update:organizprops", "update:formprops"]);
const mixin = useCounterMixin();
const { showLoader, hideLoader } = mixin;
const { showLoader, hideLoader, messageError } = mixin;
const $q = useQuasar(); // show dialog
const myForm = ref<QForm | null>(null);
@ -415,7 +415,7 @@ const fetchOrganizationOri = async () => {
organizationOriFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -430,7 +430,6 @@ const fetchOrganizationAgencyCode = async () => {
.get(config.API.organizationCode)
.then((res) => {
const data = res.data.result;
// console.log(data);
let option: GovermentOption[] = [];
data.map((r: any) => {
option.push({
@ -444,7 +443,7 @@ const fetchOrganizationAgencyCode = async () => {
organizationAgencyCodeFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -459,7 +458,6 @@ const fetchOrganizationGovernmentCode = async () => {
.get(config.API.organizationShortName)
.then((res) => {
const data = res.data.result;
// console.log(data);
let option: GovermentOption[] = [];
data.map((r: any) => {
option.push({
@ -473,7 +471,7 @@ const fetchOrganizationGovernmentCode = async () => {
organizationGovernmentCodeFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -488,7 +486,6 @@ const fetchOrganizationGovernmentCode = async () => {
// .get(config.API.organizationShortName)
// .then((res) => {
// const data = res.data.result;
// // console.log(data);
// let option: GovermentOption[] = [];
// data.map((r: any) => {
// option.push({
@ -502,7 +499,6 @@ const fetchOrganizationGovernmentCode = async () => {
// organizationShortNameFilter.value = option;
// })
// .catch((e) => {
// console.log(e);
// })
// .finally(() => {
// hideLoader();
@ -528,7 +524,7 @@ const fetchOrganizationAgency = async () => {
organizationAgencyFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -554,7 +550,7 @@ const fetchOrganizationGovernmentAgency = async () => {
organizationGovernmentAgencyFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -577,7 +573,7 @@ const fetchOrganizationType = async () => {
organizationTypeFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -600,7 +596,7 @@ const fetchOrganizationLevel = async () => {
organizationLevelFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -623,7 +619,7 @@ const fetchOrganizationTelInternal = async () => {
organizationTelInternalFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -646,7 +642,7 @@ const fetchOrganizationTelExternal = async () => {
organizationTelExternalFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -669,7 +665,7 @@ const fetchOrganizationFax = async () => {
organizationFaxFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -692,18 +688,12 @@ const deleteOrgItem = (val: OrganizaOption) => {
persistent: true,
})
.onOk(() => {
// console.log(">>>> OK");
organizations.value = organizations.value.filter(
(x: object) => x !== val
); //คำสั่งลบ
// console.log(positions.value);
})
.onCancel(() => {
// console.log(">>>> Cancel");
})
.onDismiss(() => {
// console.log("I am triggered on both OK and Cancel");
});
.onCancel(() => {})
.onDismiss(() => {});
} else {
organizations.value = organizations.value.filter((x: object) => x !== val);
}
@ -738,7 +728,6 @@ const isEmptyOrganization = (items: OrganizaOption[]) => {
*/
const addOrganizationItem = async () => {
await myForm.value!.validate().then(async (result: boolean) => {
// console.log(result);
if (result) {
// organizations.value.push(JSON.parse(JSON.stringify(organizationSet)));
organizations.value.push({
@ -767,7 +756,6 @@ const addOrganizationItem = async () => {
isActive: true,
});
emit("update:organizprops", organizations.value);
// console.log(organizations);
}
});
};
@ -791,7 +779,7 @@ const fetchAgencyCode = async (val: string, item: OrganizaOption) => {
// organizationAgencyCodeFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -818,7 +806,7 @@ const fetchGovernmentCode = async (val: string, item: OrganizaOption) => {
item.organizationGovernmentCodeOptionFilter = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();

45
src/modules/02_organizational/components/Tree/OrganizationDialogAddEdit.vue
View file

@ -316,7 +316,7 @@ import type { EnumStringMember } from "@babel/types";
import { useCounterMixin } from "@/stores/mixin";
const mixin = useCounterMixin();
const { showLoader, hideLoader } = mixin;
const { showLoader, hideLoader, messageError } = mixin;
const props = defineProps({
organizprops: Object as PropType<OrganizaOption>,
@ -411,9 +411,7 @@ onMounted(async () => {
await fetchOrganizationTelExternal();
await fetchOrganizationTelInternal();
await fetchOrganizationStatus();
// console.log("Edit:organization.value", organization.value);
console.log("props.orgId", props.org);
console.log("props.orgId.organizationId", props.org.organizationId);
await fillOrgEdit(); // ต้องอยู่ตรงนี้ ไม่งั้น input shortName & shortCode ไม่มา
});
@ -434,7 +432,7 @@ const fillOrgEdit = async () => {
.get(config.API.getOrgDraft(props.org.organizationId))
.then((res) => {
//ใส่ข้อมูลลงใน objOrg ที่ได้จาก OrganizationDialogAddEdit.vue
console.log("ข้อมูลเดิม", res.data.result);
organization.value.organizationOrganizationId =
res.data.result.organizationOrganizationId;
organization.value.organizationShortNameId =
@ -498,12 +496,11 @@ const fillOrgEdit = async () => {
emit("update:organizprops", organization.value);
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(async () => {
hideLoader();
});
console.log("success");
};
/**
@ -523,7 +520,7 @@ const fetchOrganizationOri = async () => {
organizationOriFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -538,7 +535,7 @@ const fetchOrganizationAgencyCode = async () => {
.get(config.API.organizationCode)
.then((res) => {
const data = res.data.result;
// console.log(data);
let option: GovermentOption[] = [];
data.map((r: any) => {
option.push({
@ -552,7 +549,7 @@ const fetchOrganizationAgencyCode = async () => {
organizationAgencyCodeFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -567,7 +564,6 @@ const fetchOrganizationGovernmentCode = async () => {
.get(config.API.organizationShortName)
.then((res) => {
const data = res.data.result;
// console.log(data);
let option: GovermentOption[] = [];
data.map((r: any) => {
option.push({
@ -584,7 +580,7 @@ const fetchOrganizationGovernmentCode = async () => {
emit("update:organizprops", organization.value);
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -599,7 +595,6 @@ const fetchOrganizationGovernmentCode = async () => {
// .get(config.API.organizationShortName)
// .then((res) => {
// const data = res.data.result;
// // console.log(data);
// let option: GovermentOption[] = [];
// data.map((r: any) => {
// option.push({
@ -613,7 +608,7 @@ const fetchOrganizationGovernmentCode = async () => {
// organizationShortNameFilter.value = option;
// })
// .catch((e) => {
// console.log(e);
// messageError($q,e)
// })
// .finally(() => {
// hideLoader();
@ -640,7 +635,7 @@ const fetchOrganizationAgency = async () => {
organizationAgencyFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -657,7 +652,7 @@ const fetchOrganizationGovernmentAgency = async () => {
.then((res) => {
const data = res.data.result;
let option: DataOption[] = [];
// console.log(data);
data.map((r: any) => {
option.push({
id: r.organizationId.toString(),
@ -668,7 +663,7 @@ const fetchOrganizationGovernmentAgency = async () => {
organizationGovernmentAgencyFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -691,7 +686,7 @@ const fetchOrganizationType = async () => {
organizationTypeFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -715,7 +710,7 @@ const fetchOrganizationStatus = async () => {
organizationStatusFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -739,7 +734,7 @@ const fetchOrganizationLevel = async () => {
organizationLevelFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -762,7 +757,7 @@ const fetchOrganizationTelInternal = async () => {
organizationTelInternalFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -785,7 +780,7 @@ const fetchOrganizationTelExternal = async () => {
organizationTelExternalFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -808,7 +803,7 @@ const fetchOrganizationFax = async () => {
organizationFaxFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -834,7 +829,7 @@ const fetchAgencyCode = async (val: string, item: OrganizaOption) => {
// organizationAgencyCodeFilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -861,7 +856,7 @@ const fetchGovernmentCode = async (val: string, item: OrganizaOption) => {
item.organizationGovernmentCodeOptionFilter = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();

8
src/modules/02_organizational/views/MainOrgChart.vue
View file

@ -1,5 +1,6 @@
<script setup lang="ts">
import { ref, onMounted } from "vue";
import { useQuasar } from "quasar";
import http from "@/plugins/http";
import config from "@/app.config";
@ -11,7 +12,8 @@ import { useCounterMixin } from "@/stores/mixin";
import chartData from "@/assets/orgChartData";
const mixin = useCounterMixin();
const { showLoader, hideLoader } = mixin;
const { showLoader, hideLoader, messageError } = mixin;
const $q = useQuasar(); // show dialog
const dataSource = ref(chartData);
// const dataSource = ref() // ข้อมูล Chart
@ -45,7 +47,7 @@ const fetchTreeRoot = async () => {
}
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -65,7 +67,7 @@ const fetchOrgChart = async () => {
}
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();

3
src/modules/02_organizational/views/MainReport.vue
View file

@ -238,7 +238,7 @@ const fetchOrganizationAgency = async () => {
govermentOPfilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -248,6 +248,5 @@ const fetchOrganizationAgency = async () => {
onMounted(async () => {
hideLoader();
await fetchOrganizationAgency();
console.log(govermentOP.value);
});
</script>

8
src/modules/02_organizational/views/MainStructChart.vue
View file

@ -1,6 +1,7 @@
<script setup lang="ts">
import { defineAsyncComponent } from "@vue/runtime-core";
import { ref, onMounted } from "vue";
import { useQuasar } from "quasar";
import http from "@/plugins/http";
import config from "@/app.config";
@ -10,7 +11,8 @@ import "structure-chart/structure-chart.css";
import { useCounterMixin } from "@/stores/mixin";
const mixin = useCounterMixin();
const { showLoader, hideLoader } = mixin;
const { showLoader, hideLoader, messageError } = mixin;
const $q = useQuasar(); // show dialog
// import chartData from '@/assets/structChartData'
// const dataSource = ref(chartData)
@ -46,7 +48,7 @@ const fetchTreeRoot = async () => {
}
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();
@ -70,7 +72,7 @@ const fetchStructChart = async () => {
}
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();

19
src/modules/02_organizational/views/MainTree.vue
View file

@ -969,7 +969,6 @@ watch(selectedFile, async (value, oldValue) => {
});
onMounted(async () => {
console.log("onMounted");
await fetchTreeRoot(true); //fetch Root Edit Tree level 1
expandedNodeView.value = [`1`];
@ -988,7 +987,6 @@ const loadTreeData = async () => {
"https://s3cluster.frappet.com/bma-public-test/organization/strueture/61a11705-8346-4336-8289-49f72ed9463f-%E0%B8%AA%E0%B8%B3%E0%B8%99%E0%B8%B1%E0%B8%81%E0%B8%87%E0%B8%B2%E0%B8%99%E0%B8%84%E0%B8%93%E0%B8%B0%E0%B8%81%E0%B8%A3%E0%B8%A3%E0%B8%A1%E0%B8%81%E0%B8%B2%E0%B8%A3%E0%B8%82%E0%B9%89%E0%B8%B2%E0%B8%A3%E0%B8%B2%E0%B8%8A%E0%B8%81%E0%B8%B2%E0%B8%A3%E0%B8%81%E0%B8%A3%E0%B8%B8%E0%B8%87%E0%B9%80%E0%B8%97%E0%B8%9E%E0%B8%A1%E0%B8%AB%E0%B8%B2%E0%B8%99%E0%B8%84%E0%B8%A3.json"
)
.then((res) => {
console.log(res.data.result);
dataTree.value = res.data.result;
})
.catch((e) => {
@ -1007,7 +1005,6 @@ const loadViewTree = async () => {
};
const loadPublishScreen = async () => {
console.log("onMounted");
await fetchPublishFile();
expandedNodeView.value = [`1`];
setTimeout(async () => {
@ -1041,12 +1038,9 @@ const loadFileServer = async (node: any) => {
`${config.s3ClusterUrl}${node.organizationId}-${node.organizationName}.json`
)
.then((res) => {
console.log(res.data);
node.children = res.data;
})
.catch((e) => {
// console.log(e);
// console.log(e.response);
manageApiErrorMsg(e);
})
.finally(() => {
@ -1061,13 +1055,9 @@ const isTreeHasDraft = async () => {
await http
.get(config.API.isOrgPohasDraft)
.then((res) => {
// console.log("isOrgPohasDraft:", res.data.result);
orgPoHasDraft = res.data.result;
})
.catch((e) => {
console.log("====isOrgPohasDraft====");
console.log(e);
console.log(e.response);
messageError($q, e);
})
.finally(() => {
@ -1077,13 +1067,9 @@ const isTreeHasDraft = async () => {
await http
.get(config.API.isOrghasDraft)
.then((res) => {
// console.log("isOrghasDraft:", res.data.result);
orgHasDraft = res.data.result;
})
.catch((e) => {
console.log("====isOrghasDraft====");
console.log(e);
console.log(e.response);
messageError($q, e);
})
.finally(() => {
@ -1101,7 +1087,6 @@ const isTreeHasDraft = async () => {
* @param isDraft แสดงข้อมูลดราฟหรือ Production
*/
const fetchTreeRoot = async (isDraft: boolean) => {
// console.log(isDraft);
showLoader();
console.log("Call API14 GetTreeRoot");
isShowEditTree.value = isDraft; // to show same tree that we fetch
@ -1674,8 +1659,6 @@ const editPositionStructure = async (node: any) => {
qtreeEdit.value.setExpanded(nodeJoin, true);
})
.catch((e) => {
console.log(e);
console.log(e.response);
messageError($q, e);
})
.finally(async () => {
@ -1715,8 +1698,6 @@ const clickHistory = async () => {
})
.catch((e) => {
rowsHistory.value.splice(0);
console.log(e);
console.log(e.response);
manageApiErrorMsg(e);
// messageError($q, e);
})

1
src/modules/02_organizational/views/MainTreeEmployee.vue
View file

@ -976,7 +976,6 @@ onMounted(async () => {
const onSelected = async (id: string) => {
// await fetchPositionNumber(id);
organizationId.value = id;
console.log(organizationId.value);
};
/**

1
src/modules/02_organizational/views/ManageReport2Add.vue
View file

@ -763,7 +763,6 @@ const checkSave = async () => {
};
const saveData = async () => {
// console.log(myData.value);
showLoader();
const body: RequestReport2 = {
organizationShortNameId: myData.value.goverment2,

5
src/modules/02_organizational/views/Report.vue
View file

@ -107,7 +107,8 @@ const $q = useQuasar(); // show dialog
const mixin = useCounterMixin();
const router = useRouter();
const route = useRoute();
const { date2Thai, success, dateToISO, showLoader, hideLoader } = mixin;
const { date2Thai, success, dateToISO, showLoader, hideLoader, messageError } =
mixin;
const govermentOP = ref<DataOption[]>([]);
const govermentOPfilter = ref<DataOption[]>([]);
@ -132,7 +133,7 @@ const fetchOrganizationAgency = async () => {
govermentOPfilter.value = option;
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {
hideLoader();

1
src/modules/03_recruiting/views/02_qualify/DisableDetailEx.vue
View file

@ -308,7 +308,6 @@ const fetchData = async () => {
cert_issuedate.value = data.certificateIssueDate;
examAttribute.value = data.examAttribute;
number.value = data.number;
console.log(data);
examOrder.value = data.examOrder;
score_expired.value = data.scoreExpire;
if (data.scoreResult != null) {

1
src/modules/04_registry/components/Document.vue
View file

@ -219,7 +219,6 @@ const uploadData = async () => {
const formData = new FormData();
formData.append("avatar", newFile);
formData.append("moss", "newFile");
console.log(formData);
showLoader();
await http
.post(config.API.profilePaperId(profileId.value), formData)

2
src/modules/04_registry/components/Information/Address.vue
View file

@ -752,8 +752,6 @@ const saveData = async () => {
};
const selectProvince = async (e: string | null, name: string) => {
console.log("5555555555555");
if (e != null) {
if (name == "1") {
addressData.value.districtId = "";

3
src/modules/04_registry/components/Leave.vue
View file

@ -726,7 +726,6 @@ const fetchData = async () => {
.get(config.API.profileLeaveId(profileId.value))
.then((res) => {
const data = res.data.result;
// console.log(data);
data.map((e: ResponseObject) => {
rows.value.push({
id: e.id,
@ -918,7 +917,6 @@ const clickAddLeave = async () => {
numUsedLeave.value = 0;
await clickTotal();
if (rowsTotal.value.length > 0) {
// console.log(rowsTotal.value);
let data: DataOptionLeave[] = [];
rowsTotal.value.map((e: ResponseTotalObject) => {
data.push({
@ -1140,7 +1138,6 @@ const selectData = async (props: DataProps) => {
numUsedLeave.value = props.row.sumLeave;
await clickTotal();
if (rowsTotal.value.length > 0) {
// console.log(rowsTotal.value);
let data: DataOptionLeave[] = [];
rowsTotal.value.map((e: ResponseTotalObject) => {
data.push({

1
src/modules/04_registry/components/PopupHistory.vue
View file

@ -90,7 +90,6 @@ const fecthPositionOfficer = async () => {
.get(config.API.listPositionPathHistory)
.then((res) => {
let data = res.data.result.items;
console.log(data);
positionOps.value = data.map((e: any) => ({ id: e.id, name: e.name }));
options.value = positionOps.value;
})

12
src/modules/04_registry/components/Profile.vue
View file

@ -833,12 +833,13 @@ const fetchData = async () => {
const reason = reasonOptions.value.filter(
(r: DataOption) => r.id == data.leaveReason
);
console.log(reason);
if (reason.length > 0) {
leaveReason.value = ` (พ้นจากราชการด้วยสาเหตุ: ${reason[0].name})`;
} else {
} else if (data.leaveReason !== null && data.leaveReason !== "") {
leaveReason.value = ` (พ้นจากราชการด้วยสาเหตุ: ${data.leaveReason})`;
}
console.log(data.leaveReason);
reasonStatus.value = reason.length > 0 ? true : false;
})
.catch((e) => {
@ -1301,12 +1302,6 @@ const Retire = async () => {
}
};
const clickSaveDeceased = async () => {
// console.log(
// filePassaway.value,
// deathCertificateNo.value,
// placeDeathCertificate.value,
// reasonDeath.value
// );
const formData = new FormData();
formData.append("File", filePassaway.value);
formData.append("Number", deathCertificateNo.value);
@ -1333,7 +1328,6 @@ const clickSaveDeceased = async () => {
router.push("/deceased");
})
.catch((e) => {
console.log(e);
messageError($q, e);
})
.finally(() => {

4
src/modules/04_registry/components/Salary.vue
View file

@ -1578,9 +1578,7 @@ const fetchData = async () => {
await http
.get(config.API.profileSalaryId(profileId.value))
.then((res) => {
let data = res.data.result;
console.log(data);
let data = res.data.result;
rows.value = [];
data.map((e: ResponseObject) => {
rows.value.push({

5
src/modules/04_registry/components/SalaryEmployee.vue
View file

@ -1493,7 +1493,7 @@ const fetchData = async () => {
.get(config.API.profileSalaryEmployeeId(profileId.value))
.then((res) => {
const data = res.data.result;
console.log(data);
rows.value = [];
data.map((e: any) => {
rows.value.push({
@ -1634,7 +1634,6 @@ const checkRowPage = () => {
editRow.value = false;
next.value = true;
previous.value = true;
// console.log(rowIndex.value);
if (rowIndex.value + 1 >= rows.value.length) {
next.value = false;
}
@ -1885,7 +1884,6 @@ const clickClose = async () => {
* @param props ค่า props ใน row ที่เลือก
*/
const selectData = async (props: DataPropsEmployee) => {
// console.log(props.row);
modalEdit.value = true;
modal.value = true;
edit.value = false;
@ -1996,7 +1994,6 @@ const clickHistory = async (row: RequestItemsEmployee) => {
.get(config.API.profileSalaryEmployeeHisId(row.id))
.then((res) => {
const data = res.data.result;
// console.log("clickHistory", data);
rowsHistory.value = [];
data.map((e: ResponseObjectEmployee) => {
rowsHistory.value.push({

4
src/modules/04_registry/components/SalaryEmployeeTemp.vue
View file

@ -1522,7 +1522,6 @@ const fetchData = async () => {
.get(config.API.profileSalaryEmployeeId(profileId.value))
.then((res) => {
const data = res.data.result;
// console.log(data);
rows.value = [];
data.map((e: ResponseObjectEmployee) => {
rows.value.push({
@ -1663,7 +1662,6 @@ const checkRowPage = () => {
editRow.value = false;
next.value = true;
previous.value = true;
// console.log(rowIndex.value);
if (rowIndex.value + 1 >= rows.value.length) {
next.value = false;
}
@ -1914,7 +1912,6 @@ const clickClose = async () => {
* @param props ค่า props ใน row ที่เลือก
*/
const selectData = async (props: DataPropsEmployee) => {
// console.log(props.row);
modalEdit.value = true;
modal.value = true;
edit.value = false;
@ -2025,7 +2022,6 @@ const clickHistory = async (row: RequestItemsEmployee) => {
.get(config.API.profileSalaryEmployeeHisId(row.id))
.then((res) => {
const data = res.data.result;
// console.log("clickHistory", data);
rowsHistory.value = [];
data.map((e: ResponseObjectEmployee) => {
rowsHistory.value.push({

7
src/modules/05_placement/components/AppointMent/Detail.vue
View file

@ -124,6 +124,11 @@ const putAppointment = async () => {
edit.value = false;
});
};
const cancel = () => {
edit.value = false
fecthappointmentByid()
}
const getClass = (val: boolean) => {
return {
"full-width inputgreen cursor-pointer": val,
@ -200,7 +205,7 @@ onMounted(async () => {
<q-btn outline color="public" dense class="q-px-sm" label="บันทึก"
style="width: 80px" @click="clickSave" />
<q-btn outline color="red" dense class="q-px-sm" label="ยกเลิก" style="width: 80px"
@click="edit = !edit" />
@click="cancel()" />
</div>
</div>
</div>

26
src/modules/05_placement/components/Other/OtherModal.vue
View file

@ -78,7 +78,6 @@ const loadTreeData = async () => {
};
function filterByPersonIdNull(obj: any) {
// console.log(obj);
if (obj.name === null && obj.isCondition != true) {
return true;
}
@ -155,8 +154,6 @@ const validateData = async () => {
};
const id = ref<string>("");
const saveAppoint = async () => {
console.log("save", dataForm);
myFormPosition.value.validate().then(async (result: boolean) => {
if (props.personalId !== undefined) {
id.value = props.personalId.toString();
@ -175,12 +172,11 @@ const saveAppoint = async () => {
// mouthSalaryAmount: dataForm.mouthSalaryAmount,
// positionSalaryAmount: dataForm.positionSalaryAmount,
};
console.log("save appoint===>", dataAppoint);
showLoader();
await http
.put(config.API.otherPosition(id.value), dataAppoint)
.then((res) => {
console.log("respone=>", res);
.then(() => {
success($q, "บันทึกสำเร็จ");
})
.catch((e) => {
@ -280,9 +276,8 @@ const positionLevelOptions = ref<Object[]>([
]);
const selectedPosition = async (data: any) => {
console.log("selecteds", data);
if (data.name == null && selected.value != data.keyId) {
// console.log("selecteds", data);
editDataStatus.value = true;
selected.value = data.keyId;
@ -364,7 +359,7 @@ const selectedPosition = async (data: any) => {
dataForm.positionPathSideId = "";
dataForm.positionTypeId = "";
}
console.log("dataForm", dataForm);
};
const checkPosition = (val: string) => {
@ -377,25 +372,25 @@ const expanded = ref<string[]>([]);
watch(props, () => {
expanded.value = [];
const dataPersonal = props.personal;
console.log(props.personal);
if (dataPersonal) {
dataPersonal.map((data: any) => {
personal.value = data;
});
console.log("personal", personal.value);
}
// console.log("draft===>", personal.value.draft);
if (personal.value) {
// const findData = dataRespone.value.find(findByPerson);
let findData: any = null;
dataRespone.value.map((x: any) => {
findData = findByPerson(x);
// console.log(findData);
if (findData != null) {
// console.log("findData===>", findData);
selectedPosition(findData);
for (let i = 3; i <= findData.keyId.length; i += 2) {
expanded.value.push(findData.keyId.slice(0, i));
@ -408,7 +403,6 @@ watch(props, () => {
});
function findByPerson(element: any): any {
// console.log("searchTree element===>", element)
if (
element.positionNumId &&
element.positionLineId === personal.value.positionLineId &&

3
src/modules/05_placement/components/PersonalDetail/Detail.vue
View file

@ -114,8 +114,7 @@ const fetchData = async () => {
.get(config.API.placementPersonalId(examId.value))
.then((res: any) => {
const data = res.data.result;
// data.value = data;
// console.log(data);
personalData.value.fullName = data.fullName;
personalData.value.id = data.personalId;

1
src/modules/05_placement/components/PersonalDetail/Education.vue
View file

@ -604,7 +604,6 @@ const clickClose = async () => {
* @param _props ค่า props ใน row ที่เลือก
*/
const selectData = async (_props: DataProps) => {
// console.log(_props.row);
modalEdit.value = true;
modal.value = true;
edit.value = false;

4
src/modules/05_placement/components/PersonalDetail/Information/Certicate.vue
View file

@ -327,9 +327,7 @@ const clickSave = async () => {
/**
* บันทึกเพิ่มข้อมูล
*/
const saveData = async () => {
// console.log("saveData");
const saveData = async () => {
showLoader();
await http
.post(config.API.placementCertId(route.params.personalId.toString()), {

1
src/modules/05_placement/components/PersonalDetail/Information/Information.vue
View file

@ -115,7 +115,6 @@ const fetchPerson = async () => {
.then((res) => {
const data = res.data.result;
let optionbloodGroups: optionData[] = [];
// console.log(data);
data.bloodGroups.map((r: any) => {
optionbloodGroups.push({
id: r.id ?? "",

2
src/modules/05_placement/components/Receive/receiveDetail2.vue
View file

@ -636,10 +636,10 @@ onMounted(async () => {
hide-bottom-space
:outlined="edit"
dense
lazy-rules
:readonly="!edit"
:borderless="!edit"
v-model="informaData.lastname"
lazy-rules
:rules="[(val:string) => !!val || `${'กรุณากรอก นามสกุล'}`]"
:label="`${'นามสกุล'}`"
/>

10
src/modules/05_placement/components/Relocation/RelocationMain.vue
View file

@ -214,7 +214,6 @@ const openModalOrder = () => {
};
const openModalTree = (id: string) => {
personalId.value = id;
console.log(personalId.value);
personal.value = rows.value.filter((e: any) => e.id === id);
modalTree.value = true;
};
@ -224,7 +223,6 @@ const getData = async () => {
.get(config.API.relocationMain())
.then((res: any) => {
const data = res.data.result;
console.log("data==>", data);
rows.value = data.map((item: relocationType) => ({
fullname: `${item.prefix}${item.firstname} ${item.lastname}`,
id: item.id,
@ -262,7 +260,6 @@ const getData = async () => {
organizationPositionOld: item.organizationPositionOld,
createdAt:date2Thai(item.createdAt),
}));
console.log(rows.value);
})
.catch((e) => {
// messageError($q, e);
@ -280,9 +277,7 @@ const saveOrder = async () => {
showLoader();
await http
.post(config.API.relocationMainReport(), body)
.then((res: any) => {
// const data = res.data.result;
// console.log(data);
.then(() => {
success($q, "ส่งไปออกคำสั่งย้าย");
closeModal();
})
@ -297,9 +292,8 @@ const saveOrder = async () => {
const deleteData = async (id: string) => {
await http
.delete(config.API.relocationMainDelete(id))
.then((res) => {
.then(() => {
success($q, "ลบข้อมูลสำเร็จ");
console.log(res);
})
.catch((e) => {
messageError($q, e);

19
src/modules/05_placement/components/Relocation/RelocationModal.vue
View file

@ -85,7 +85,6 @@ const loadTreeData = async () => {
};
function filterByPersonIdNull(obj: any) {
// console.log(obj);
if (obj.name === null && obj.isCondition != true) {
return true;
}
@ -162,8 +161,6 @@ const validateData = async () => {
};
const id = ref<string>("");
const saveAppoint = async () => {
console.log("save", dataForm);
myFormPosition.value.validate().then(async (result: boolean) => {
if (props.personalId !== undefined) {
id.value = props.personalId.toString();
@ -182,12 +179,11 @@ const saveAppoint = async () => {
// mouthSalaryAmount: dataForm.mouthSalaryAmount,
// positionSalaryAmount: dataForm.positionSalaryAmount,
};
console.log("save appoint===>", dataAppoint);
showLoader();
await http
.put(config.API.relocationMainPut(id.value), dataAppoint)
.then((res) => {
console.log("respone=>", res);
.then(() => {
success($q, "บันทึกสำเร็จ");
})
.catch((e) => {
@ -286,9 +282,8 @@ const positionLevelOptions = ref<Object[]>([
]);
const selectedPosition = async (data: any) => {
console.log("selecteds", data);
if (data.name == null && selected.value != data.keyId) {
// console.log("selecteds", data);
editDataStatus.value = true;
selected.value = data.keyId;
@ -370,7 +365,6 @@ const selectedPosition = async (data: any) => {
dataForm.positionPathSideId = "";
dataForm.positionTypeId = "";
}
console.log("dataForm", dataForm);
};
const checkPosition = (val: string) => {
@ -383,25 +377,21 @@ const expanded = ref<string[]>([]);
watch(props, () => {
expanded.value = [];
const dataPersonal = props.personal;
console.log(props.personal);
if (dataPersonal) {
dataPersonal.map((data: any) => {
personal.value = data;
});
console.log("personal", personal.value);
}
// console.log("draft===>", personal.value.draft);
if (personal.value) {
// const findData = dataRespone.value.find(findByPerson);
let findData: any = null;
dataRespone.value.map((x: any) => {
findData = findByPerson(x);
// console.log(findData);
if (findData != null) {
// console.log("findData===>", findData);
selectedPosition(findData);
for (let i = 3; i <= findData.keyId.length; i += 2) {
expanded.value.push(findData.keyId.slice(0, i));
@ -414,7 +404,6 @@ watch(props, () => {
});
function findByPerson(element: any): any {
// console.log("searchTree element===>", element)
if (
element.positionNumId &&
element.positionLineId === personal.value.positionLineId &&

4
src/modules/05_placement/components/Relocation/RelocationbyId.vue
View file

@ -207,9 +207,7 @@ const saveData = async () => {
showLoader();
await http
.put(config.API.relocationMainEdit(dataId), body)
.then((res: any) => {
// const data = res.data.result;
// console.log(data);
.then(() => {
success($q, "แก้ไขข้อมูลเพื่อลงบัญชีแนบท้ายสำเร็จ");
edit.value = false;
})

8
src/modules/05_placement/components/Transfer/transferRegistry.vue
View file

@ -274,7 +274,10 @@ const saveData = async () => {
hideLoader();
});
};
const cancel = () => {
edit.value = false
getData()
}
const getClass = (val: boolean) => {
return {
"full-width inputgreen cursor-pointer": val,
@ -284,7 +287,6 @@ const getClass = (val: boolean) => {
onMounted(async () => {
if (keycloak.tokenParsed != null) {
roleAdmin.value = await keycloak.tokenParsed.role.includes("placement1");
console.log("roleAdmin===>", roleAdmin.value);
}
await getData();
});
@ -523,7 +525,7 @@ onMounted(async () => {
class="q-px-sm"
label="ยกเลิก"
style="width: 80px"
@click="edit = !edit"
@click="cancel()"
/>
</div>
</div>

1
src/modules/05_placement/components/helpgovernment/mainHelp.vue
View file

@ -223,7 +223,6 @@ const deleteData = async (id: string) => {
.delete(config.API.officerMainDelete(id))
.then((res) => {
success($q, "ลบข้อมูลสำเร็จ");
console.log(res);
})
.catch((e) => {
messageError($q, e);

1
src/modules/05_placement/components/probation/FormAssign.vue
View file

@ -108,6 +108,7 @@ const edit = () => {
};
const cancel = () => {
status.value = false;
getAssign()
};
const filterData = (options: any[], excludedGroups: any[]) => {

4
src/modules/05_placement/components/probation/FormEvaluation/FormEvaluate.vue
View file

@ -76,6 +76,7 @@ const edit = () => {
const cancel = () => {
status.value = false;
fecthAssign()
};
const props = defineProps({
@ -94,8 +95,7 @@ const fecthAssign = async () => {
showLoader();
await http
.get(config.API.evaluateCreate(assignId.value))
.then(async (res: any) => {
console.log(res);
.then(async (res) => {
if (props.action == "add") {
person.value = res.data.data.person;
commander.value = res.data.data.commander;

1604
src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore copy.vue Normal file
View file

File diff suppressed because it is too large Load diff

1
src/modules/05_placement/components/probation/FormEvaluation/FormEvaluateScore.vue
View file

@ -36,6 +36,7 @@ const edit = () => {
};
const cancel = () => {
status.value = false;
fecthAssign()
};
const evaluate_no = ref<number>();
const evaluate_id = ref<string>("");

2
src/modules/05_placement/components/probation/FormEvaluation/FormSaveResult.vue
View file

@ -76,11 +76,13 @@ const edit = () => {
const cancel = () => {
status.value = false;
props.fecthAssign?.(assignId.value)
};
const props = defineProps({
tab: String,
data: Object,
action: String,
fecthAssign: Function,
});
const fecthFormdata = async () => {

6
src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultAddCommander.vue
View file

@ -235,8 +235,6 @@ const savaForm = () => {
alerts[index + 11].value = true;
}
});
console.log(evaluate_expenct_level.value);
dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ");
} else {
putformData();
@ -311,13 +309,13 @@ ArrayCountbotton.forEach((variable, index) => {
});
watch(lengthevaluate_expenct_level, (newLength) => {
if (newLength === evaluate_expenct_level.value.length) {
console.log(true);
alerts[0].value = false;
}
});
watch(lengthevaluate_ouptut, (newLength) => {
if (newLength === evaluate_ouptut.value.length) {
console.log(true);
alerts[1].value = false;
}
});

2
src/modules/05_placement/components/probation/FormEvaluation/FormSaveResultCommader.vue
View file

@ -88,11 +88,13 @@ const edit = () => {
const cancel = () => {
status.value = false;
props.fecthAssign?.(assignId.value)
};
const props = defineProps({
tab: String,
data: Object,
action: String,
fecthAssign: Function,
});
const fecthFormdata = async () => {

1
src/modules/05_placement/components/probation/FormEvaluation/Template1.vue
View file

@ -140,6 +140,7 @@ const addData = () => {
:key="item.no"
>
<FormSaveResult
:fecthAssign="fecthAssign"
:tab="tab"
:data="probationStore.evaluate.find((x: any) => x.no === dataArrayNumber)"
action="edit"

9
src/modules/05_placement/components/probation/FormEvaluation/Template1Commader.vue
View file

@ -142,19 +142,12 @@ const addData = () => {
:key="item.no"
>
<FormSaveResultCommader
:fecthAssign="fecthAssign"
:tab="tab"
:data="probationStore.evaluate.find((x: any) => x.no === dataArrayNumber)"
action="edit"
/>
</q-tab-panel>
<!-- <q-page-container>
<FormSaveResult
:tab="tab"
:data="probationStore.evaluate.find((x: any) => x.no === dataArrayNumber)"
action="edit"
/>
</q-page-container> -->
</q-tab-panels>
<div class="q-gutter-md" v-else-if="probationStore.tabs.length == 0">

47
src/modules/05_placement/components/probation/SummaryScore.vue
View file

@ -64,9 +64,6 @@ const result_option = ref<any>([
const note = ref<string>("");
const date = ref<Date>(new Date());
const saveEdit = (id: string) => {
dialogConfirm($q, () => console.log("save"));
};
const edit = () => {
status.value = true;
};
@ -349,24 +346,24 @@ onMounted(() => {
</div>
<div class="row col-12 q-gutter-lg q-mt-md">
<div class="col-xs-12 col-sm-6">
<div class="col-12 text-top0 items-center">
ผลการพัฒนาข้าราชการที่อยู่ระหว่างการทดลองปฏิบัติหน้าที่ราชการ
</div>
<div class="col-12">
<q-select
class="col-12"
dense
v-model="develop_result"
outlined
:options="result_option"
option-label="name"
option-value="value"
map-options
emit-value
:disable="!status"
/>
</div>
</div>
<div class="col-12 text-top0 items-center">
ผลการพัฒนาข้าราชการที่อยู่ระหว่างการทดลองปฏิบัติหน้าที่ราชการ
</div>
<div class="col-12">
<q-select
class="col-12"
dense
v-model="develop_result"
outlined
:options="result_option"
option-label="name"
option-value="value"
map-options
emit-value
:disable="!status"
/>
</div>
</div>
<div class="col-xs-12 col-sm-11">
<div class="col-12 text-top0 row items-center">
@ -434,7 +431,9 @@ onMounted(() => {
dense
:disable="!status"
class="full-width datepicker"
:model-value="evaluate_date != null ? date2Thai(evaluate_date) : null"
:model-value="
evaluate_date != null ? date2Thai(evaluate_date) : null
"
:rules="[(val) => !!val || `${'วัน เดือน ปี ที่ประเมิน'}`]"
>
<template v-slot:prepend>
@ -472,8 +471,8 @@ onMounted(() => {
.q-rating__icon {
text-shadow: transparent !important;
}
.color-txt{
color: black!important;;
.color-txt {
color: black !important;
}
.q-card {
box-shadow: 0px 0px 0px 0px !important;

2
src/modules/05_placement/components/probation/SummarySurvey.vue
View file

@ -63,7 +63,7 @@ const getSurveyData = async () => {
}
})
.catch((e) => {
console.log(e);
messageError($q,e)
});
};
const classBordered = ref<string>("");

2
src/modules/07_insignia/components/2_Manage/Tab1.vue
View file

@ -814,7 +814,9 @@ const clickShowWarn = () => {
checkStatus == true
"
/>
<q-th v-else></q-th>
</q-tr>
</template>
<template v-slot:body="props">
<q-tr

1
src/modules/07_insignia/components/4_Allocate/Main.vue
View file

@ -196,7 +196,6 @@ const fecthlistInsignia = async () => {
await http
.get(config.API.insigniaManageType(tab.value, Number(roundYear.value)))
.then((res) => {
console.log(res);
let data = res.data.result;
DataStore.listinsignia(data);
})

78
src/modules/07_insignia/views/ResultPage.vue
View file

@ -5,7 +5,7 @@ import http from "@/plugins/http";
import config from "@/app.config";
import { useResultDataStore } from "@/modules/07_insignia/storeResult";
import Dialogbody from "@/modules/07_insignia/components/3_result/Dialogbody.vue"
import Dialogbody from "@/modules/07_insignia/components/3_result/Dialogbody.vue";
import DialogForm from "@/modules/07_insignia/components/3_result/DialogForm.vue";
import fileUploadview from "../components/3_result/fileUpload.vue";
@ -36,7 +36,7 @@ const fileResult = ref<any>(null);
const fileinvoice = ref<any>(null);
const loadView = ref<boolean>(false);
const insigniaTypeOption = ref<any>([]);
const ModalDialog = ref<boolean>(false)
const ModalDialog = ref<boolean>(false);
onMounted(async () => {
await fecthRound();
});
@ -59,7 +59,7 @@ const fecthRound = async () => {
}
})
.catch((err) => {
console.log(err);
messageError($q, err);
})
.finally(() => {
hideLoader();
@ -89,7 +89,6 @@ const fecthInsigniaType = async () => {
})
.catch((err) => {
messageError($q, err);
console.log("fecthInsigniaType");
});
};
const visibleColumns = ref<String[]>([
@ -266,8 +265,6 @@ const columns = ref<QTableProps["columns"]>([
watch(tab, () => {
if (tab.value !== "doc") {
fecthlistInsignia();
console.log(DataStore.insigniaOp);
insigniaTypeOption.value = DataStore.insigniaOp.filter(
(e: any) => e.insigniaType == tab.value || e.name == "ทั้งหมด"
);
@ -349,7 +346,7 @@ const filter = ref<string>("");
const close = () => {
modal.value = false;
ModalDialog.value = false
ModalDialog.value = false;
};
const addData = () => {
@ -383,7 +380,6 @@ const perviewfile = async (event: any, actionType: string) => {
await http
.put(config.API.previewfileInsignia(actionType, id), formdata)
.then((res) => {
console.log(res);
let data = res.data.result;
rowspreview.value = data.map((e: any) => ({
id: e.id,
@ -405,7 +401,7 @@ const perviewfile = async (event: any, actionType: string) => {
}));
})
.catch((err) => {
console.log(err);
messageError($q,err)
})
.finally(() => {
modelPerview.value = true;
@ -430,9 +426,9 @@ const paginationLabel = (start: number, end: number, total: number) => {
if (paging.value == true) return " " + start + "-" + end + " ใน " + total;
else return start + "-" + end + " ใน " + total;
};
const OpenModal = () =>{
ModalDialog.value = true
}
const OpenModal = () => {
ModalDialog.value = true;
};
</script>
<template>
@ -694,23 +690,52 @@ const OpenModal = () =>{
</div>
<div v-else-if="props.col.name == 'action'">
<q-btn icon="mdi-dots-vertical" size="12px" color="grey-7"
flat round dense >
<q-menu transition-show="jump-down" transition-hide="jump-up" >
<q-list dense style="min-width: 100px" >
<q-item clickable v-close-popup @click.stop="editData(props.row)" >
<q-item-section style="min-width: 0px" avatar class="q-py-sm" >
<q-icon size="xs" name="mdi-pencil-outline" color="primary"/>
</q-item-section>
<q-btn
icon="mdi-dots-vertical"
size="12px"
color="grey-7"
flat
round
dense
>
<q-menu
transition-show="jump-down"
transition-hide="jump-up"
>
<q-list dense style="min-width: 100px">
<q-item
clickable
v-close-popup
@click.stop="editData(props.row)"
>
<q-item-section
>เเก้ไขข้อมูล</q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
size="xs"
name="mdi-pencil-outline"
color="primary"
/>
</q-item-section>
<q-item-section>เเก้ไขข้อมูล</q-item-section>
</q-item>
<q-item clickable v-close-popup @click="OpenModal()">
<q-item-section style="min-width: 0px" avatar class="q-py-sm" >
<q-icon size="xs" name="mdi-information-outline" color="blue"/>
<q-item-section
style="min-width: 0px"
avatar
class="q-py-sm"
>
<q-icon
size="xs"
name="mdi-information-outline"
color="blue"
/>
</q-item-section>
<q-item-section no-wrap>รับ-คืนเครื่องราชฯ</q-item-section>
<q-item-section no-wrap
>รับ-คืนเครื่องราชฯ</q-item-section
>
</q-item>
</q-list>
</q-menu>
@ -729,10 +754,7 @@ const OpenModal = () =>{
</q-tab-panel>
</q-tab-panels>
<Dialogbody
:modal="ModalDialog"
:close="close"
/>
<Dialogbody :modal="ModalDialog" :close="close" />
<DialogForm
:modal="modal"
:save="save"

1
src/modules/08_registryEmployee/components/EditEmployee/Document.vue
View file

@ -107,7 +107,6 @@ const Dataupload = async () => {
const formData = new FormData();
formData.append("avatar", newFile);
formData.append("moss", "newFile");
console.log(formData);
showLoader();
await http
.post(config.API.profilePaperId(profileId.value), formData)

1
src/modules/08_registryEmployee/components/EditEmployee/Information/Tempinformation.vue
View file

@ -292,7 +292,6 @@ const fetchData = async () => {
// employeeOc: e.employeeOc,
// employeeWage: e.employeeWage,
// });
// console.log(res);
// });
const data: any = res.data.result;
informaTempData.value.employeeMoneyIncrease =

2
src/modules/08_registryEmployee/components/EditEmployee/Leave.vue
View file

@ -572,7 +572,6 @@ const clickAddLeave = async () => {
numUsedLeave.value = 0;
await clickTotal();
if (rowsTotal.value.length > 0) {
// console.log(rowsTotal.value);
let data: DataOptionLeave[] = [];
rowsTotal.value.map((e: ResponseTotalObject) => {
data.push({
@ -797,7 +796,6 @@ const selectData = async (props: DataProps) => {
numUsedLeave.value = props.row.sumLeave;
await clickTotal();
if (rowsTotal.value.length > 0) {
// console.log(rowsTotal.value);
let data: DataOptionLeave[] = [];
rowsTotal.value.map((e: ResponseTotalObject) => {
data.push({

5
src/modules/08_registryEmployee/components/EditEmployee/SalaryEmployee.vue
View file

@ -1048,7 +1048,6 @@ const checkRowPage = () => {
editRow.value = false;
next.value = true;
previous.value = true;
// console.log(rowIndex.value);
if (rowIndex.value + 1 >= rows.value.length) {
next.value = false;
}
@ -1204,8 +1203,6 @@ const saveData = async () => {
* บันทึกแก้ไขข้อมูล
*/
const editData = async () => {
console.log(agencyId.value);
showLoader();
await http
.put(config.API.profileSalaryEmployeeId(id.value), {
@ -1304,7 +1301,6 @@ const clickClose = async () => {
* @param props ค่า props ใน row ที่เลือก
*/
const selectData = async (props: DataPropsEmployee) => {
// console.log(props.row);
modalEdit.value = true;
modal.value = true;
edit.value = false;
@ -1415,7 +1411,6 @@ const clickHistory = async (row: RequestItemsEmployee) => {
.get(config.API.profileSalaryEmployeeHisId(row.id))
.then((res) => {
const data = res.data.result;
console.log("clickHistory", data);
rowsHistory.value = [];
data.map((e: ResponseObjectEmployee) => {
rowsHistory.value.push({

4
src/modules/10_order/components/step/step01.vue
View file

@ -127,7 +127,7 @@ watch(byOrder, async () => {
CommandOption.value = res.data.result;
})
.catch((e) => {
console.log(e);
messageError($q, e);
});
});
//เลือกผู้ลงนาม
@ -245,7 +245,7 @@ const fecthCommand = async () => {
byOrderOption.value = res.data.result;
})
.catch((e) => {
console.log(e);
messageError($q, e);
});
};
const selectCMP = (selectOrder: OrederResult) => {

1
src/stores/roleUser.ts
View file

@ -15,7 +15,6 @@ export const useroleUserDataStore = defineStore("roleusers", () => {
const fetchroleUser = async (keycloak: any) => {
// console.log(keycloak);
if (keycloak != null) {
insignia1Role.value = await keycloak.includes("insignia1");
insignia2Role.value = await keycloak.includes("insignia2");

1
src/views/MainLayout.vue
View file

@ -89,7 +89,6 @@ const getDataNotification = async () => {
.get(config.API.msgNotificate)
.then((res: any) => {
const response = res.data.result;
// console.log("response", response);
let list: notiType[] = [];
response.map((e: any) => {
list.push({