diff --git a/src/modules/13_salary/components/04_salaryLists/DialogMoveLevelMulti.vue b/src/modules/13_salary/components/04_salaryLists/DialogMoveLevelMulti.vue
index 0777f5f88..16fa30827 100644
--- a/src/modules/13_salary/components/04_salaryLists/DialogMoveLevelMulti.vue
+++ b/src/modules/13_salary/components/04_salaryLists/DialogMoveLevelMulti.vue
@@ -309,11 +309,6 @@ watch(
- {{
- `${props.row.prefix}${props.row.firstName} ${props.row.lastName}`
- }}
-
([
label: "ชื่อ-นามสกุล",
sortable: false,
field: "fullName",
+ format(val, row) {
+ return `${row.prefix}${row.firstName} ${row.lastName}`;
+ },
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
@@ -331,11 +333,7 @@ function onProperties(data: any) {
isLeave.value = data.isLeave;
}
-/**
- * function openPopup ย้ายกขั้น
- * @param id profileId
- *
- */
+/** function openPopup ย้ายกขั้น*/
function onClickMoveLevelMulti() {
modalDialogMoveLeveMulti.value = !modalDialogMoveLeve.value;
}
@@ -381,11 +379,7 @@ function onClickViewInfo(type: string, id: string) {
-
- {{
- `${props.row.prefix}${props.row.firstName} ${props.row.lastName}`
- }}
-
{{ findOrgNameHtml(props.row) }}
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/DialogMoveLevelMulti.vue b/src/modules/13_salary/components/05_salaryListsEmployee/DialogMoveLevelMulti.vue
new file mode 100644
index 000000000..705a5404d
--- /dev/null
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/DialogMoveLevelMulti.vue
@@ -0,0 +1,383 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
ทั้งหมด {{ rows.length }} รายการ
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue
index 8cef3686d..eb7675cf3 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue
@@ -40,7 +40,7 @@ const props = defineProps({
const splitterModel = ref(13);
const modalDialogInfoCriteria = ref(false); //popup หลักเกณฑ์การพิจารณาเลื่อนขั้นเงินข้าราชการ
-const isRetire = ref(false); //แสดงเฉพาะผู้เกษียณอายุราชการ
+const isRetire = ref(false); //แสดงเฉพาะผู้เกษียณอายุราชการ
const rows = ref([]); //ข้อมูลรายชื่อ
const total = ref(0); //จำนวนรายการ
const maxPage = ref(1); //จำนวนหน้า
@@ -515,6 +515,8 @@ onMounted(() => {
:rows="rows"
:total="total"
:snap-shot="props?.snapShot"
+ :is-retire="isRetire"
+ :is-close="props.periodLatest?.group1IsClose ?? false"
/>
{
:total="total"
:type="item.type"
:snap-shot="props?.snapShot"
+ :is-close="props.periodLatest?.group1IsClose ?? false"
/>
diff --git a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
index 306e3ce17..74fe96c70 100644
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TableTypeOther.vue
@@ -28,6 +28,7 @@ const { dialogRemove, messageError, showLoader, hideLoader, success } =
/** props*/
const formFilter = defineModel("formFilter", { required: true });
const maxPage = defineModel("maxPage", { required: true });
+const isClose = defineModel("isClose", { required: true });
const snapShot = defineModel("snapShot");
const props = defineProps({
rows: { type: Array },
@@ -311,7 +312,11 @@ watch(
("formFilter", { required: true });
const maxPage = defineModel("maxPage", { required: true });
+const isClose = defineModel("isClose", { required: true });
const snapShot = defineModel("snapShot");
const props = defineProps({
@@ -49,10 +52,13 @@ const props = defineProps({
total: {
type: Number,
},
+ isRetire: {
+ type: Boolean,
+ },
});
/** ข้อมูล Table*/
-const columns = ref([
+const columns = ref([
{
name: "no",
align: "left",
@@ -68,6 +74,9 @@ const columns = ref([
label: "ชื่อ-นามสกุล",
sortable: false,
field: "fullName",
+ format(val, row) {
+ return `${row.prefix}${row.firstName} ${row.lastName}`;
+ },
headerStyle: "font-size: 14px",
style: "font-size: 14px",
},
@@ -149,6 +158,9 @@ const columns = ref([
label: "สังกัด",
sortable: false,
field: "organization",
+ format(val, row) {
+ return findOrgName(row);
+ },
headerStyle: "font-size: 14px;min-width:280px",
style: "font-size: 14px",
},
@@ -223,6 +235,7 @@ const modalDialogMoveGroup = ref(false); //popup ย้ายกลุ
const modalDialogMoveLeve = ref(false); //popup เลื่อนขั้น
const modalDialogProperties = ref(false); //popup คุณสมบัติ
const modalDialogInfo = ref(false); //popup ข้อมูลส่วนตัว
+const modalDialogMoveLeveMulti = ref(false); //popup เลื่อนขั้น
/** ตัวแปร*/
const profileId = ref(""); //id คน
@@ -256,9 +269,7 @@ function onClickDelete(id: string) {
});
}
-/**
- * function openPopup เพิ่มคนเลื่อนค่าจ้าง
- */
+/** function openPopup เพิ่มคนเลื่อนค่าจ้าง*/
function onClickAddPerson() {
modalDialogAddPerson.value = !modalDialogAddPerson.value;
}
@@ -297,9 +308,7 @@ function onClickMoveLevel(id: string, typeVal: string, isReserveVal: boolean) {
isReserve.value = isReserveVal;
}
-/**
- * function updatePageTable
- */
+/** function updatePageTable*/
function updatePagePagination() {
props.fetchDataTable?.();
}
@@ -312,9 +321,7 @@ function updatePageSizePagination(newPagination: NewPagination) {
formFilter.value.pageSize = newPagination.rowsPerPage;
}
-/**
- * function ค้นหาข้อมูล Table
- */
+/** function ค้นหาข้อมูล Table*/
function searchData() {
formFilter.value.page = 1;
props.fetchDataTable?.();
@@ -345,6 +352,11 @@ function onClickViewInfo(type: string, id: string) {
modalDialogInfo.value = true;
}
+/** function openPopup ย้ายกขั้น*/
+function onClickMoveLevelMulti() {
+ modalDialogMoveLeveMulti.value = !modalDialogMoveLeve.value;
+}
+
/**
* callblack function เรียกข้อมูลรายชื่อใหม่ เมื่อมีการเปลี่ยน PageSize
*/
@@ -361,7 +373,11 @@ watch(
เพิ่ม
+
+
+ เลื่อนขั้น
+
-
- {{
- `${props.row.prefix}${props.row.firstName} ${props.row.lastName}`
- }}
-
{{ findOrgNameHtml(props.row) }}
@@ -600,6 +624,23 @@ watch(
:type="infoType"
:employee-class="'-employee'"
/>
+
+
+