diff --git a/src/modules/15_development/components/Target.vue b/src/modules/15_development/components/Target.vue index b4424ff2b..b656c5e21 100644 --- a/src/modules/15_development/components/Target.vue +++ b/src/modules/15_development/components/Target.vue @@ -184,15 +184,15 @@ const formGroupTarget = reactive({ groupTarget: "", groupTargetSub: "", position: "", - posType: "", - posLevel: "", + posType: null, + posLevel: null, type: null, amount: null, positions: [ { position: "", - posTypeId: "", - posLevelId: "", + posTypeId: null, + posLevelId: null, }, ], }); @@ -210,8 +210,8 @@ const posTypeMain = ref([]); const addGroupTargetData = async () => { formGroupTarget.positions.push({ position: "", - posTypeId: "", - posLevelId: "", + posTypeId: null, + posLevelId: null, }); }; @@ -262,8 +262,8 @@ function onClickOpenDialog(type: string, target: string) { (formGroupTarget.positions = [ { position: "", - posTypeId: "", - posLevelId: "", + posTypeId: null, + posLevelId: null, }, ]), (newModalGroupTarget.value = true); @@ -323,8 +323,12 @@ function onSubmitGroup() { groupTarget: formGroupTarget.groupTarget, groupTargetSub: formGroupTarget.groupTargetSub, position: formGroupTarget.position, - posTypeActualId: formGroupTarget.posType, - posLevelActualId: formGroupTarget.posLevel, + posTypeActualId: formGroupTarget.posType + ? formGroupTarget.posType + : null, + posLevelActualId: formGroupTarget.posLevel + ? formGroupTarget.posLevel + : null, type: formGroupTarget.type, amount: formGroupTarget.amount, } @@ -404,8 +408,8 @@ function cleanFormData() { formGroupTarget.groupTarget = ""; formGroupTarget.groupTargetSub = ""; formGroupTarget.position = ""; - formGroupTarget.posType = ""; - formGroupTarget.posLevel = ""; + formGroupTarget.posType = null; + formGroupTarget.posLevel = null; formGroupTarget.type = ""; formGroupTarget.amount = null; formGroupRelate.relate = ""; @@ -556,8 +560,8 @@ onMounted(() => { {{ `- ${row.position}` }}{{ row.posType !== null || row.posLevel !== null - ? `(${row.posType ? row.posType : ""} ${ - row.posLevel ? row.posLevel : "" + ? ` (${row.posType ? row.posType : ""}${ + row.posLevel ? " " + row.posLevel : "" })` : "" }} @@ -717,8 +721,13 @@ onMounted(() => {
- {{ - `${props.row.position} (${props.row.posType} ${props.row.posLevel})` + {{ `- ${props.row.position}` + }}{{ + props.row.posType !== null || props.row.posLevel !== null + ? ` (${props.row.posType ? props.row.posType : ""}${ + props.row.posLevel ? " " + props.row.posLevel : "" + })` + : "" }}
@@ -878,23 +887,6 @@ onMounted(() => { />
-
- -
{ map-options input-class="text-red" label="ประเภทตำแหน่ง" + clearable @update:model-value="updatePosTypeName" - :rules="[ - (val:string) => - !!val || `${'กรุณาเลือกประเภทตำแหน่ง'}`, - ]" />
{ map-options input-class="text-red" label="ระดับตำแหน่ง" + clearable + /> +
+
+ + !!val || `${'กรุณากรอกตำแหน่ง'}`, + ]" />
{ map-options input-class="text-red" label="ประเภทตำแหน่ง" + clearable @update:model-value="updatePosTypeName" />
@@ -1149,6 +1153,7 @@ onMounted(() => { map-options input-class="text-red" label="ระดับตำแหน่ง" + clearable />