โครงสร้างอัตรากำลังข้าราชการ ส่งไปออกคำสั่งกรณีสำนักปลัด

This commit is contained in:
DESKTOP-1R2VSQH\Lenovo ThinkPad E490 2025-04-30 11:21:39 +07:00
parent aecf75c1e7
commit f33da756af
4 changed files with 9 additions and 0 deletions

View file

@ -29,6 +29,7 @@ const { showLoader, hideLoader, messageError } = useCounterMixin();
/** props*/ /** props*/
const historyId = defineModel<string>("historyId", { required: true }); // id const historyId = defineModel<string>("historyId", { required: true }); // id
const count = defineModel<number>("count", { required: true }); const count = defineModel<number>("count", { required: true });
const isDeputy = defineModel<boolean>("isDeputy", { default: false });
const nodeTree = ref<OrgTree[]>(); // Tree const nodeTree = ref<OrgTree[]>(); // Tree
const nodeId = ref<string>(""); // id Tree const nodeId = ref<string>(""); // id Tree
@ -267,6 +268,7 @@ onMounted(async () => {
v-model:short-name="shortName" v-model:short-name="shortName"
v-model:node-id="nodeId" v-model:node-id="nodeId"
v-model:org-root-id="orgRootId" v-model:org-root-id="orgRootId"
v-model:is-deputy="isDeputy"
:fetch-data-table="fetchDataTable" :fetch-data-table="fetchDataTable"
:fetch-data-tree="fetchDataTree" :fetch-data-tree="fetchDataTree"
/> />

View file

@ -32,6 +32,7 @@ const nodeId = defineModel<string>("nodeId", { required: true });
const orgRootId = defineModel<string | undefined>("orgRootId", { const orgRootId = defineModel<string | undefined>("orgRootId", {
required: true, required: true,
}); });
const isDeputy = defineModel<boolean>("isDeputy", { default: false });
const shortName = defineModel<string>("shortName", { required: true }); const shortName = defineModel<string>("shortName", { required: true });
const props = defineProps({ const props = defineProps({
fetchDataTree: { fetchDataTree: {
@ -101,6 +102,7 @@ const orgId = ref<string>("");
* @param data อม Tree * @param data อม Tree
*/ */
function updateSelected(data: DataTree) { function updateSelected(data: DataTree) {
isDeputy.value = data.isDeputy;
orgRootId.value = data?.orgLevel === 0 ? data?.orgTreeId : data?.orgRootId; orgRootId.value = data?.orgLevel === 0 ? data?.orgTreeId : data?.orgRootId;
store.rootId = ( store.rootId = (
data.orgLevel === 0 ? data.orgTreeId : data.orgRootId data.orgLevel === 0 ? data.orgTreeId : data.orgRootId

View file

@ -77,6 +77,7 @@ interface DataTree {
totalRootPositionCurrentVacant: number; totalRootPositionCurrentVacant: number;
totalRootPositionNextUse: number; totalRootPositionNextUse: number;
totalRootPositionNextVacant: number; totalRootPositionNextVacant: number;
isDeputy: boolean;
children?: DataTree[]; children?: DataTree[];
} }

View file

@ -39,6 +39,7 @@ const count = ref<number>(0);
const modalCommand = ref<boolean>(false); // const modalCommand = ref<boolean>(false); //
const modalRemark = ref<boolean>(false); // const modalRemark = ref<boolean>(false); //
const isDeputy = ref<boolean>(false); //
/** /**
* function เรยกขอมลโครงสราง แบบปนและ แบบราง * function เรยกขอมลโครงสราง แบบปนและ แบบราง
@ -333,6 +334,7 @@ onMounted(async () => {
@click="ocClickAddStructure('ADD')" @click="ocClickAddStructure('ADD')"
class="q-px-md" class="q-px-md"
/> />
<q-btn <q-btn
v-if=" v-if="
store.typeOrganizational === 'draft' && store.typeOrganizational === 'draft' &&
@ -407,6 +409,7 @@ onMounted(async () => {
v-if="store.statusView === 'list'" v-if="store.statusView === 'list'"
v-model:historyId="historyId" v-model:historyId="historyId"
v-model:count="count" v-model:count="count"
v-model:is-deputy="isDeputy"
/> />
</q-tab-panel> </q-tab-panel>
@ -447,6 +450,7 @@ onMounted(async () => {
v-model:is-staff="store.isStaff as boolean" v-model:is-staff="store.isStaff as boolean"
v-model:root-id="store.rootId" v-model:root-id="store.rootId"
:system-name="'ORGANIZATION'" :system-name="'ORGANIZATION'"
v-model:is-deputy="isDeputy"
/> />
<q-dialog v-model="modalRemark"> <q-dialog v-model="modalRemark">