diff --git a/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue b/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
index e04e1dc0e..437b332a8 100644
--- a/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
+++ b/src/modules/13_salary/components/SalaryChart/DialogFormMain.vue
@@ -69,6 +69,8 @@ const title = computed(() => {
? "เพิ่มผังบัญชีเงินเดือน"
: props.typeAction === "edit"
? "แก้ไขผังบัญชีเงินเดือน"
+ : props.typeAction === "view"
+ ? "รายละเอียด"
: "บัญชีเงินเดือน";
return name;
@@ -131,7 +133,7 @@ function fetchSalaryDetail(id: string) {
formData.endDate = data.endDate;
formData.details = data.details;
formData.isSpecial = data.isSpecial;
- isReadonly.value = data.isActive;
+ isReadonly.value = props.typeAction === 'view'? true: data.isActive;
})
.catch((err) => {
messageError($q, err);
@@ -150,7 +152,7 @@ watch(
if (modal.value) {
await fetchPosType();
- if (props.typeAction === "edit") {
+ if (props.typeAction === "edit" || props.typeAction === "view") {
showLoader();
setTimeout(() => {
if (props.data) {
@@ -522,7 +524,7 @@ const getClass = (val: boolean) => {
-
+
บันทึกข้อมูล
diff --git a/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue b/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue
index b1df17224..eb47b489a 100644
--- a/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue
+++ b/src/modules/13_salary/components/SalaryChart/DialogFormRate.vue
@@ -16,7 +16,6 @@ import Header from "@/components/DialogHeader.vue";
import { useCounterMixin } from "@/stores/mixin";
/** use*/
-
const $q = useQuasar();
const route = useRoute();
const { dialogConfirm, showLoader, hideLoader, messageError, success } =
@@ -39,6 +38,7 @@ const props = defineProps({
},
});
+const isReadonly = ref(false);
const salaryId = ref(route.params.id.toString());
const formData = reactive({
salaryId: "",
@@ -170,6 +170,17 @@ watch(
}
}
);
+
+/**
+ * class จัดรูปแบบแสดงระหว่างข้อมูลที่แก้ไขหรือแสดงเฉยๆ
+ * @param val ข้อมูล input สำหรับแก้ไขหรือไม่
+ */
+const getClass = (val: boolean) => {
+ return {
+ "full-width inputgreen cursor-pointer": val,
+ "full-width cursor-pointer": !val,
+ };
+};
@@ -184,6 +195,8 @@ watch(
import { ref, reactive, watch } from "vue";
+import { checkPermission } from "@/utils/permissions";
import { useQuasar } from "quasar";
import axios from "axios";
import http from "@/plugins/http";
@@ -238,7 +239,7 @@ watch(
-
+
@@ -249,7 +250,10 @@ watch(
ดาวน์โหลดไฟล์
-
+
import { ref, onMounted, reactive, watch } from "vue";
+import { checkPermission } from "@/utils/permissions";
import { useQuasar } from "quasar";
import { useRouter } from "vue-router";
import http from "@/plugins/http";
@@ -7,10 +8,7 @@ import config from "@/app.config";
/** importType*/
import type { QTableProps } from "quasar";
-import type {
- NewPagination,
- ItemsMenu,
-} from "@/modules/13_salary/interface/index/Main";
+import type { NewPagination } from "@/modules/13_salary/interface/index/Main";
import type { Salary } from "@/modules/13_salary/interface/response/Main";
import type { FormQuerySalary } from "@/modules/13_salary/interface/request/Main";
import DialogFormUpload from "@/modules/13_salary/components/SalaryChart/DialogUpload.vue";
@@ -82,34 +80,6 @@ const visibleColumns = ref([
"isActive",
]);
-/** List Mune*/
-const itemMenu = ref([
- {
- label: "แก้ไข",
- icon: "edit",
- color: "edit",
- type: "edit",
- },
- {
- label: "เอกสารอ้างอิง",
- icon: "mdi-file-document-outline",
- color: "teal",
- type: "upload",
- },
- {
- label: "อัตราเงินเดือน",
- icon: "mdi-format-list-bulleted-triangle",
- color: "secondary",
- type: "salaryRate",
- },
- {
- label: "คัดลอก",
- icon: "content_copy",
- color: "blue-6",
- type: "copy",
- },
-]);
-
/** queryString*/
const formQuery = reactive({
page: 1, //*หน้า
@@ -259,7 +229,14 @@ onMounted(() => {
-
+
เพิ่มผังบัญชีเงินเดือน
@@ -318,60 +295,130 @@ onMounted(() => {
-
+
+
+
+
+
+
+
+
+
-
{{ item.label }}
+
เอกสารอ้างอิง
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -415,7 +462,6 @@ onMounted(() => {
{{ col.value ? col.value : "-" }}
-
diff --git a/src/modules/13_salary/views/salaryRate.vue b/src/modules/13_salary/views/salaryRate.vue
index 83e2a44b9..56bba6f83 100644
--- a/src/modules/13_salary/views/salaryRate.vue
+++ b/src/modules/13_salary/views/salaryRate.vue
@@ -1,5 +1,6 @@