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

Merge branch 'oat_dev' into develop

Browse source
This commit is contained in:
oat_dev 2024-04-11 18:08:21 +07:00
commit 174fcac1f9
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/15_development/components/Target.vue
View file

@ -54,7 +54,7 @@ const columnsPlannedGoals = ref<QTableProps["columns"]>([
{
name: "posTypePlannedId",
align: "left",
label: "ประเภท",
label: "ตำแหน่ง",
sortable: true,
field: "posTypePlannedId",
headerStyle: "font-size: 14px",
@ -87,7 +87,7 @@ const columnsActualGoals = ref<QTableProps["columns"]>([
{
name: "posTypeActualId",
align: "left",
label: "ประเภท",
label: "ตำแหน่ง",
sortable: true,
field: "posTypeActualId",
headerStyle: "font-size: 14px",
@ -200,6 +200,7 @@ function fetchType() {
id: e.id,
name: e.posTypeName,
}));
console.log(data);
})
.catch((err) => {
messageError($q, err);
@ -542,7 +543,6 @@ onMounted(() => {
() => {
isEdit = true;
isTarget = 'planned';
editId = props.row.id;
formGroupTarget.type = props.row.type;
formGroupTarget.groupTarget = props.row.groupTarget;
@ -550,6 +550,7 @@ onMounted(() => {
formGroupTarget.amount = props.row.amount;
formGroupTarget.positions =
props.row.plannedGoalPositions;
newModalGroupTarget = true;
}
"
@ -686,7 +687,6 @@ onMounted(() => {
@click="
() => {
isEdit = true;
isTarget = 'actual';
editId = props.row.id;
formGroupTarget.type = props.row.type;
@ -1106,8 +1106,11 @@ onMounted(() => {
lazy-rules
class="inputgreen"
v-model="items.posLevelPlannedId"
:options="posLevelOp"
option-label="name"
:options="
posTypeMain.find((v) => items.posTypePlannedId === v.id)
?.posLevels || []
"
option-label="posLevelName"
option-value="id"
emit-value
map-options