diff --git a/src/modules/02_organizationalNew/components/DialogMovePos.vue b/src/modules/02_organizationalNew/components/DialogMovePos.vue index fe44ad51a..792d871c5 100644 --- a/src/modules/02_organizationalNew/components/DialogMovePos.vue +++ b/src/modules/02_organizationalNew/components/DialogMovePos.vue @@ -126,66 +126,12 @@ watch( - - - - - - - - - - - - - - {{ prop.node.orgTreeName }} - - - {{ prop.node.orgCode == null ? null : prop.node.orgCode }} - {{ - prop.node.orgTreeShortName == null - ? null - : prop.node.orgTreeShortName - }} - - - - - - - - + + + เลือกตำแหน่งที่ต้องการย้าย @@ -240,6 +186,70 @@ watch( + + + + เลือกหน่วยงาน/ส่วนราชการปลายทาง + + + + + + + + + + + + + + {{ prop.node.orgTreeName }} + + + {{ prop.node.orgCode == null ? null : prop.node.orgCode }} + {{ + prop.node.orgTreeShortName == null + ? null + : prop.node.orgTreeShortName + }} + + + + + + diff --git a/src/modules/02_organizationalNew/components/tableTree.vue b/src/modules/02_organizationalNew/components/tableTree.vue index eda46d2a3..3a3e58094 100644 --- a/src/modules/02_organizationalNew/components/tableTree.vue +++ b/src/modules/02_organizationalNew/components/tableTree.vue @@ -150,7 +150,7 @@ const columns = ref([ { name: "positionIsSelected", align: "left", - label: "มีคนครองหรือไม่", + label: "คนครอง", sortable: true, field: "positionIsSelected", headerStyle: "font-size: 14px", @@ -429,12 +429,12 @@ function updatePagination(newPagination: NewPagination) {