diff --git a/src/modules/20_positionTemp/components/DialogAddPosition.vue b/src/modules/20_positionTemp/components/DialogAddPosition.vue index 478b5ee8b..69f9cb4cf 100644 --- a/src/modules/20_positionTemp/components/DialogAddPosition.vue +++ b/src/modules/20_positionTemp/components/DialogAddPosition.vue @@ -196,7 +196,7 @@ watch( /> -
+
diff --git a/src/modules/20_positionTemp/components/DialogFormPosition.vue b/src/modules/20_positionTemp/components/DialogFormPosition.vue index a3399fdd2..aa72dd354 100644 --- a/src/modules/20_positionTemp/components/DialogFormPosition.vue +++ b/src/modules/20_positionTemp/components/DialogFormPosition.vue @@ -59,7 +59,7 @@ const type = ref("positionName"); const optionFilter = ref([ { id: "positionName", name: "ชื่อตำแหน่ง" }, { id: "positionType", name: "กลุ่มงาน" }, - { id: "positionLevel", name: "ระดับชั้นงาน" }, + // { id: "positionLevel", name: "ระดับชั้นงาน" }, ]); const listMenu = ref([ @@ -122,21 +122,21 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "posLevelName", - align: "left", - label: "ระดับชั้นงาน", - sortable: true, - field: "posLevelName", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, + // { + // name: "posLevelName", + // align: "left", + // label: "ระดับชั้นงาน", + // sortable: true, + // field: "posLevelName", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // }, ]); const visibleColumns = ref([ "no", "posDictName", "posTypeName", - "posLevelName", + // "posLevelName", ]); async function fetchPosition(id: string) { @@ -475,7 +475,7 @@ watch( > {{ col.value ? col.value : "-" }} -
+
{{ col.value ? col.value : "-" }}
@@ -525,14 +525,14 @@ watch( class="col-12 text-weight-medium bg-grey-1 q-py-xs q-px-md" > เลือกตำแหน่งที่ต้องการเพิ่ม - สร้างตำแหน่ง + > -->
@@ -671,7 +671,7 @@ watch( > {{ col.value ? col.value : "-" }}
-
+
{{ col.value ? col.value : "-" }} diff --git a/src/modules/20_positionTemp/components/DialogPositionDetail.vue b/src/modules/20_positionTemp/components/DialogPositionDetail.vue index 073e34490..da2416b69 100644 --- a/src/modules/20_positionTemp/components/DialogPositionDetail.vue +++ b/src/modules/20_positionTemp/components/DialogPositionDetail.vue @@ -48,7 +48,7 @@ function close() {
-
+
diff --git a/src/modules/20_positionTemp/components/DialogSelectPerson.vue b/src/modules/20_positionTemp/components/DialogSelectPerson.vue index 864c93b62..1e6413433 100644 --- a/src/modules/20_positionTemp/components/DialogSelectPerson.vue +++ b/src/modules/20_positionTemp/components/DialogSelectPerson.vue @@ -94,8 +94,7 @@ const visibleColumnsResult = ref([ "citizenId", "name", "posTypeName", - "posLevelName", - "positionName" + "positionName", ]); const columns = ref([ { @@ -126,15 +125,15 @@ const columns = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "posLevelName", - align: "left", - label: "ระดับชั้นงาน", - sortable: true, - field: "posLevelName", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, + // { + // name: "posLevelName", + // align: "left", + // label: "ระดับชั้นงาน", + // sortable: true, + // field: "posLevelName", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // }, ]); const columnsResult = ref([ { @@ -182,16 +181,15 @@ const columnsResult = ref([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - - { - name: "posLevelName", - align: "left", - label: "ระดับชั้นงาน", - sortable: true, - field: "posLevelName", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, + // { + // name: "posLevelName", + // align: "left", + // label: "ระดับชั้นงาน", + // sortable: true, + // field: "posLevelName", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // }, ]); /** @@ -239,15 +237,15 @@ function inputEdit(val: boolean) { /** * function เรียกข้แมูลระดับตำแหน่ง */ -function updateSelectType(val: string) { - const listLevel: any = dataLevel.value.find((e: TypePos) => e.id === val); - levelOpsMain.value = listLevel?.posLevels.map((e: OptionLevel) => ({ - id: e.id, - name: e.posLevelName, - })); - levelOps.value = levelOpsMain.value; - formData.positionLevel = ""; -} +// function updateSelectType(val: string) { +// const listLevel: any = dataLevel.value.find((e: TypePos) => e.id === val); +// levelOpsMain.value = listLevel?.posLevels.map((e: OptionLevel) => ({ +// id: e.id, +// name: e.posLevelName, +// })); +// levelOps.value = levelOpsMain.value; +// formData.positionLevel = ""; +// } /** * ฟังก์ชั่นตรวจสอบความถูกต้องของข้อมูลในฟอร์ม @@ -560,7 +558,6 @@ watch( :options="typeOps" emit-value dense - @update:model-value="updateSelectType" map-options outlined option-label="name" @@ -575,7 +572,7 @@ watch( /> -
+
([ headerStyle: "font-size: 14px", style: "font-size: 14px", }, - { - name: "posLevelName", - align: "left", - label: "ระดับชั้นงาน", - sortable: false, - field: "posLevelName", - headerStyle: "font-size: 14px", - style: "font-size: 14px", - }, + // { + // name: "posLevelName", + // align: "left", + // label: "ระดับชั้นงาน", + // sortable: false, + // field: "posLevelName", + // headerStyle: "font-size: 14px", + // style: "font-size: 14px", + // }, { name: "positionIsSelected", align: "left", @@ -623,7 +623,7 @@ watch( : col.value }}
-
+
{{ props.row.positionIsSelected