API มอบหมายหน้าที่ความรับผิดชอบ
This commit is contained in:
parent
88bf249250
commit
e7568373c8
4 changed files with 135 additions and 78 deletions
|
|
@ -93,6 +93,10 @@ export default {
|
|||
orgProfileListKeycloak: () => `${orgProfile}/search-personal-no-keycloak`,
|
||||
|
||||
/** กำหนดสิทธิ์จัดการโครงสร้าง */
|
||||
permissionOrg: `${organization}/permission-org`,
|
||||
permissionOrg: `${organization}/permission-org`,
|
||||
permissionOrgProfile: `${organization}/permission-org/profile`, // คนที่มีสิทธิ์จัดการโครงสร้าง
|
||||
|
||||
/** หมอบหมาย*/
|
||||
commandSysAssign: `${organization}/commandSys/assign`,
|
||||
posAssign: `${organization}/pos/assign`,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -10,24 +10,18 @@ import { useCounterMixin } from "@/stores/mixin";
|
|||
import DialogHeader from "@/components/DialogHeader.vue";
|
||||
|
||||
/** importType*/
|
||||
import type { QTableProps } from "quasar";
|
||||
import type { FilterReqMaster } from "@/modules/02_users/interface/request/Main";
|
||||
import type { Roles } from "@/modules/02_users/interface/response/Main";
|
||||
import type {
|
||||
PosMaster,
|
||||
CommandSysAssign,
|
||||
} from "@/modules/02_users/interface/response/Main";
|
||||
|
||||
/** use*/
|
||||
const $q = useQuasar();
|
||||
const {
|
||||
showLoader,
|
||||
hideLoader,
|
||||
dialogConfirm,
|
||||
messageError,
|
||||
success,
|
||||
dialogMessageNotify,
|
||||
} = useCounterMixin();
|
||||
const { showLoader, hideLoader, dialogConfirm, messageError, success } =
|
||||
useCounterMixin();
|
||||
|
||||
/** props*/
|
||||
const modal = defineModel<boolean>("modal", { required: true });
|
||||
|
||||
const props = defineProps({
|
||||
fetchDataTable: {
|
||||
type: Function,
|
||||
|
|
@ -37,40 +31,34 @@ const props = defineProps({
|
|||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
reqMaster: {
|
||||
type: Object,
|
||||
required: true,
|
||||
},
|
||||
});
|
||||
|
||||
const sysType = ref<any[]>(["SALARY_EMP"]);
|
||||
const posMasterId = ref<string>("");
|
||||
const sysType = ref<string[]>([]);
|
||||
const isChangData = ref<boolean>(false);
|
||||
const sysTypeOptions = ref<any[]>([
|
||||
{
|
||||
code: "SALARY",
|
||||
name: "ระบบเงินเดือน",
|
||||
modules: [
|
||||
{
|
||||
code: "SALARY_EMP",
|
||||
name: "เงินเดือนข้าราชการ",
|
||||
},
|
||||
{
|
||||
code: "SALARY_TEMP",
|
||||
name: "เงินเดือนลูกจ้างประจำ",
|
||||
},
|
||||
],
|
||||
},
|
||||
{
|
||||
code: "PLACEMENT",
|
||||
name: "ระบบบรรจุ",
|
||||
modules: [
|
||||
{
|
||||
code: "PLACEMENT_NEW",
|
||||
name: "เงินเดือนข้าราชการ",
|
||||
},
|
||||
{
|
||||
code: "TRANSFER",
|
||||
name: "ขอโอน",
|
||||
},
|
||||
],
|
||||
},
|
||||
]);
|
||||
const sysTypeOptions = ref<CommandSysAssign[]>([]);
|
||||
|
||||
async function fetchCommandSysAssign() {
|
||||
if (sysTypeOptions.value.length === 0) {
|
||||
showLoader();
|
||||
await http
|
||||
.get(config.API.commandSysAssign)
|
||||
.then(async (res) => {
|
||||
const data = await res.data.result;
|
||||
sysTypeOptions.value = data;
|
||||
})
|
||||
.catch((err) => {
|
||||
messageError($q, err);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
function closeDialog() {
|
||||
modal.value = false;
|
||||
|
|
@ -79,14 +67,45 @@ function closeDialog() {
|
|||
|
||||
function onSubmit() {
|
||||
if (sysType.value.length !== 0) {
|
||||
dialogConfirm($q, () => {});
|
||||
dialogConfirm($q, async () => {
|
||||
const body = {
|
||||
posMasterId: posMasterId.value,
|
||||
assignIds: sysType.value,
|
||||
};
|
||||
showLoader();
|
||||
await http
|
||||
.post(config.API.posAssign, body)
|
||||
.then(async () => {
|
||||
await props.fetchDataTable(
|
||||
props.reqMaster.id,
|
||||
props.reqMaster.revisionId,
|
||||
props.reqMaster.type
|
||||
);
|
||||
success($q, "บันทึกข้อมูลสำเร็จ");
|
||||
closeDialog();
|
||||
})
|
||||
.catch((err) => {
|
||||
messageError($q, err);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
watch(
|
||||
() => modal.value,
|
||||
() => {
|
||||
modal.value;
|
||||
async () => {
|
||||
if (modal.value) {
|
||||
await fetchCommandSysAssign();
|
||||
posMasterId.value = props.dataPosMaster.id;
|
||||
const assignId = props.dataPosMaster.posMasterAssigns.map(
|
||||
(r: PosMaster) => r.assignId
|
||||
);
|
||||
sysType.value = assignId;
|
||||
isChangData.value = false;
|
||||
}
|
||||
}
|
||||
);
|
||||
</script>
|
||||
|
|
@ -105,22 +124,22 @@ watch(
|
|||
>
|
||||
<div class="row q-ml-md q-col-gutter-sm">
|
||||
<div class="text-weight-medium text-body2">
|
||||
{{ item.name }}
|
||||
{{ item.sysName }}
|
||||
</div>
|
||||
<div class="col-12">
|
||||
<q-list class="q-mt-none">
|
||||
<q-item
|
||||
dense
|
||||
v-for="(op, index) in item.modules"
|
||||
v-for="(op, index) in item.assgins"
|
||||
:key="index"
|
||||
>
|
||||
<q-item-section avatar :top="item.caption">
|
||||
<q-item-section avatar>
|
||||
<q-checkbox
|
||||
keep-color
|
||||
color="primary"
|
||||
dense
|
||||
v-model="sysType"
|
||||
:val="op.code"
|
||||
:val="op.id"
|
||||
@update:model-value="isChangData = true"
|
||||
/>
|
||||
</q-item-section>
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ interface NodeTree {
|
|||
totalRootPositionNextUse: number;
|
||||
totalRootPositionNextVacant: number;
|
||||
children: NodeTree;
|
||||
isOfficer: boolean;
|
||||
}
|
||||
|
||||
interface PosMaster {
|
||||
|
|
@ -81,6 +82,7 @@ interface PosMaster {
|
|||
profilePostype: null | string;
|
||||
reason: null | string;
|
||||
positions: Position[];
|
||||
assignId: string[];
|
||||
}
|
||||
|
||||
interface Position {
|
||||
|
|
@ -135,4 +137,25 @@ interface Profile {
|
|||
salary: number;
|
||||
}
|
||||
|
||||
export type { Users, Roles, NodeTree, PosMaster, Position, SysList, Profile };
|
||||
interface CommandSysAssign {
|
||||
assgins: DataAssgins[];
|
||||
id: "REGISTRY";
|
||||
sysName: "ทะเบียนประวัติ";
|
||||
}
|
||||
|
||||
interface DataAssgins {
|
||||
description: "เงินเดือนข้าราชการ";
|
||||
id: "00942120-9787-43a1-934a-e146e0618622";
|
||||
name: "เงินเดือนข้าราชการ";
|
||||
}
|
||||
|
||||
export type {
|
||||
Users,
|
||||
Roles,
|
||||
NodeTree,
|
||||
PosMaster,
|
||||
Position,
|
||||
SysList,
|
||||
Profile,
|
||||
CommandSysAssign,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ const nodes = ref<Array<NodeTree[]>>([]); // ข้อมูลโครงส
|
|||
const lazy = ref(nodes);
|
||||
const expanded = ref<string[]>([]); // แสดงข้อมูลในโหนดที่เลือก
|
||||
const nodeId = ref<string>(""); // id โหนด
|
||||
const isOfficer = ref<boolean>(false);
|
||||
|
||||
/** Table*/
|
||||
const columns = ref<QTableProps["columns"]>([
|
||||
|
|
@ -97,11 +98,11 @@ const columns = ref<QTableProps["columns"]>([
|
|||
style: "font-size: 14px",
|
||||
},
|
||||
{
|
||||
name: "responsibilities",
|
||||
align: "left",
|
||||
name: "isPosMasterAssign",
|
||||
align: "center",
|
||||
label: "การเจ้าหน้าที่",
|
||||
sortable: false,
|
||||
field: "responsibilities",
|
||||
field: "isPosMasterAssign",
|
||||
headerStyle: "font-size: 14px",
|
||||
style: "font-size: 14px",
|
||||
},
|
||||
|
|
@ -287,6 +288,7 @@ async function fetchDataTable(id: string, revisionId: string, level: number) {
|
|||
*/
|
||||
function updateSelected(data: NodeTree) {
|
||||
nodeId.value = data.orgTreeId;
|
||||
isOfficer.value = data.isOfficer;
|
||||
fetchDataTable(data.orgTreeId, data.orgRevisionId, data.orgLevel);
|
||||
}
|
||||
|
||||
|
|
@ -309,27 +311,24 @@ function onClickAddRole(data: PosMaster) {
|
|||
* @param id ตำแหน่ง
|
||||
*/
|
||||
function onDelete(id: string) {
|
||||
dialogRemove($q, () => {
|
||||
// showLoader();
|
||||
// http
|
||||
// .post(config.API.managementPermission, {
|
||||
// authRoleId: "",
|
||||
// posMasterId: id,
|
||||
// })
|
||||
// .then(async () => {
|
||||
// await fetchDataTable(
|
||||
// reqMaster.id,
|
||||
// reqMaster.revisionId,
|
||||
// reqMaster.type
|
||||
// );
|
||||
// success($q, "ลบข้อมูลสำเร็จ");
|
||||
// })
|
||||
// .catch((err) => {
|
||||
// messageError($q, err);
|
||||
// })
|
||||
// .finally(() => {
|
||||
// hideLoader();
|
||||
// });
|
||||
dialogRemove($q, async () => {
|
||||
showLoader();
|
||||
await http
|
||||
.delete(config.API.posAssign + `/${id}`)
|
||||
.then(async () => {
|
||||
await fetchDataTable(
|
||||
reqMaster.id,
|
||||
reqMaster.revisionId,
|
||||
reqMaster.type
|
||||
);
|
||||
success($q, "ลบข้อมูลสำเร็จ");
|
||||
})
|
||||
.catch((err) => {
|
||||
messageError($q, err);
|
||||
})
|
||||
.finally(() => {
|
||||
hideLoader();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -506,7 +505,15 @@ onMounted(() => {
|
|||
:key="col.name"
|
||||
:props="props"
|
||||
>
|
||||
<span class="text-weight-medium">{{ col.label }}</span>
|
||||
<span class="text-weight-medium">
|
||||
<template v-if="col.name === 'isPosMasterAssign'">
|
||||
{{ !isOfficer ? col.label : "สกจ." }}
|
||||
</template>
|
||||
|
||||
<template v-else>
|
||||
{{ col.label }}
|
||||
</template>
|
||||
</span>
|
||||
</q-th>
|
||||
<q-th auto-width></q-th>
|
||||
</q-tr>
|
||||
|
|
@ -531,7 +538,10 @@ onMounted(() => {
|
|||
:key="col.name"
|
||||
:props="props"
|
||||
>
|
||||
<div>
|
||||
<div v-if="col.name === 'isPosMasterAssign'">
|
||||
<q-icon name="check" v-if="col.value" color="primary" />
|
||||
</div>
|
||||
<div v-else>
|
||||
{{ col.value ? col.value : "-" }}
|
||||
</div>
|
||||
</q-td>
|
||||
|
|
@ -682,6 +692,7 @@ onMounted(() => {
|
|||
v-model:modal="modalDialog"
|
||||
:dataPosMaster="dataPosMaster as PosMaster"
|
||||
:fetchDataTable="fetchDataTable"
|
||||
:reqMaster="reqMaster"
|
||||
/>
|
||||
</template>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue