ลบ log
This commit is contained in:
parent
4d0e40ea91
commit
e4188b7ed3
38 changed files with 108 additions and 167 deletions
|
|
@ -1674,8 +1674,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 +1713,6 @@ const clickHistory = async () => {
|
|||
})
|
||||
.catch((e) => {
|
||||
rowsHistory.value.splice(0);
|
||||
console.log(e);
|
||||
console.log(e.response);
|
||||
manageApiErrorMsg(e);
|
||||
// messageError($q, e);
|
||||
})
|
||||
|
|
|
|||
|
|
@ -976,7 +976,6 @@ onMounted(async () => {
|
|||
const onSelected = async (id: string) => {
|
||||
// await fetchPositionNumber(id);
|
||||
organizationId.value = id;
|
||||
console.log(organizationId.value);
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -763,7 +763,6 @@ const checkSave = async () => {
|
|||
};
|
||||
|
||||
const saveData = async () => {
|
||||
// console.log(myData.value);
|
||||
showLoader();
|
||||
const body: RequestReport2 = {
|
||||
organizationShortNameId: myData.value.goverment2,
|
||||
|
|
|
|||
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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 = "";
|
||||
|
|
|
|||
|
|
@ -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({
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -838,7 +838,6 @@ const fetchData = async () => {
|
|||
} else {
|
||||
leaveReason.value = ` (พ้นจากราชการด้วยสาเหตุ: ${data.leaveReason})`;
|
||||
}
|
||||
console.log(data.leaveReason);
|
||||
reasonStatus.value = reason.length > 0 ? true : false;
|
||||
})
|
||||
.catch((e) => {
|
||||
|
|
@ -1301,12 +1300,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 +1326,6 @@ const clickSaveDeceased = async () => {
|
|||
router.push("/deceased");
|
||||
})
|
||||
.catch((e) => {
|
||||
console.log(e);
|
||||
messageError($q, e);
|
||||
})
|
||||
.finally(() => {
|
||||
|
|
|
|||
|
|
@ -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({
|
||||
|
|
|
|||
|
|
@ -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({
|
||||
|
|
|
|||
|
|
@ -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({
|
||||
|
|
|
|||
|
|
@ -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 &&
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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()), {
|
||||
|
|
|
|||
|
|
@ -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 ?? "",
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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 &&
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
})
|
||||
|
|
|
|||
|
|
@ -284,7 +284,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();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -94,8 +94,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;
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ import { useCounterMixin } from "@/stores/mixin";
|
|||
import { useRouter, useRoute } from "vue-router";
|
||||
import http from "@/plugins/http";
|
||||
import config from "@/app.config";
|
||||
import criterion from "@/modules/05_placement/components/Other/Criterion.vue"
|
||||
import criterion from "@/modules/05_placement/components/Other/Criterion.vue";
|
||||
|
||||
const router = useRouter();
|
||||
const routeName = router.currentRoute.value.name;
|
||||
|
|
@ -28,9 +28,7 @@ const {
|
|||
const route = useRoute();
|
||||
const assignId = ref<string>(route.params.form.toString());
|
||||
const personalId = ref<string>(route.params.personalId.toString());
|
||||
const saveEdit = (id: string) => {
|
||||
dialogConfirm($q, () => console.log("save"));
|
||||
};
|
||||
|
||||
const edit = () => {
|
||||
status.value = true;
|
||||
};
|
||||
|
|
@ -87,7 +85,6 @@ const fecthAssign = async () => {
|
|||
chairman.value = res.data.data.chairman;
|
||||
commander.value = res.data.data.commander;
|
||||
mentors.value = res.data.data.mentors;
|
||||
console.log(commander.value.name);
|
||||
})
|
||||
.catch((e) => {
|
||||
messageError($q, e);
|
||||
|
|
|
|||
|
|
@ -265,7 +265,7 @@ const savaForm = () => {
|
|||
alerts[index + 11].value = true;
|
||||
}
|
||||
});
|
||||
console.log(evaluate_expenct_level.value);
|
||||
|
||||
|
||||
dialogMessageNotify($q, "กรุณากรอกข้อมูลให้ครบ");
|
||||
} else {
|
||||
|
|
@ -346,13 +346,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;
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ const getSurveyData = async () => {
|
|||
}
|
||||
})
|
||||
.catch((e) => {
|
||||
console.log(e);
|
||||
messageError($q,e)
|
||||
});
|
||||
};
|
||||
const classBordered = ref<string>("");
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
})
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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 =
|
||||
|
|
|
|||
|
|
@ -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({
|
||||
|
|
|
|||
|
|
@ -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({
|
||||
|
|
|
|||
|
|
@ -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) => {
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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({
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue