diff --git a/src/modules/02_users/components/Users/DialogManagementRole.vue b/src/modules/02_users/components/Users/DialogManagementRole.vue deleted file mode 100644 index d71107e3..00000000 --- a/src/modules/02_users/components/Users/DialogManagementRole.vue +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - - - - เพิ่มสิทธิ์ - - - - - - - - - - - - - - - - - {{ col.label }} - - - - - - - - - {{ props.rowIndex + 1 }} - - - {{ col.value ? col.value : "-" }} - - - - - ลบ - - - - - - - - - - - - - - diff --git a/src/modules/02_users/components/Users/DialogRoleUser.vue b/src/modules/02_users/components/Users/DialogRoleUser.vue index 2a1ffde7..7e9ed8d8 100644 --- a/src/modules/02_users/components/Users/DialogRoleUser.vue +++ b/src/modules/02_users/components/Users/DialogRoleUser.vue @@ -5,6 +5,7 @@ import { useQuasar } from "quasar"; import http from "@/plugins/http"; import config from "@/app.config"; import { useCounterMixin } from "@/stores/mixin"; +import { setAuthen, authenticated, tokenParsed } from "@/plugins/auth"; import type { QTableProps } from "quasar"; import type { Roles } from "@/modules/02_users/interface/request/Main"; @@ -27,7 +28,6 @@ const { const modal = defineModel("modal", { required: true }); const roleSuper = defineModel("roleSuper", { required: true }); const userId = defineModel("userId", { required: true }); -const isUpdate = defineModel("isUpdate", { required: true }); const roles = defineModel("roles"); const props = defineProps({ fetchlist: { @@ -108,7 +108,6 @@ function onSubmit() { await props.fetchlist?.(); success($q, "บันทึกข้อมูลสำเร็จ"); closeDialog(); - isUpdate.value = true; }) .catch((err) => { messageError($q, err); @@ -143,7 +142,7 @@ watch( - + diff --git a/src/modules/02_users/views/01_user.vue b/src/modules/02_users/views/01_user.vue index 80c6c9e5..fb37c2b6 100644 --- a/src/modules/02_users/views/01_user.vue +++ b/src/modules/02_users/views/01_user.vue @@ -23,7 +23,6 @@ import type { Users, Roles } from "@/modules/02_users/interface/response/Main"; /** importComponents*/ import DialogAddUser from "@/modules/02_users/components/Users/DialogFormUser.vue"; -import DialogManagementRole from "@/modules/02_users/components/Users/DialogManagementRole.vue"; /** use*/ const $q = useQuasar(); @@ -208,8 +207,6 @@ const employeeClassMain = ref([ ]); const employeeClassOption = ref(employeeClassMain.value); -const modalDialogManagementRole = ref(false); // จัดการสิทธิ์ผู้ใช้งาน - /** ฟังก์ชันเรียกข้อมูลโครงสร้าง แบบปัจุบัน*/ async function fetchOrganizationActive() { showLoader(); @@ -311,10 +308,7 @@ function onClickAction(type: string, data: Users) { onDeleteUser(data.id); } else if (type === "managementRole") { // ไปยังหน้าจัดการสิทธิ์ของผู้ใช้งาน - // data && router.push(`/users/roles/${data.id}`); - // data && (userId.value = data.id); - userId.value = data.id; - modalDialogManagementRole.value = true; + data && router.push(`/users/roles/${data.id}`); } else if (type === "open" || type === "close") { // เปลี่ยนสถานะเปิด/ปิดของผู้ใช้งาน const status = type === "open" ? true : false; @@ -766,12 +760,6 @@ onMounted(async () => { :user-id="userId" :employee-class="employeeClass" /> - -