diff --git a/src/modules/02_organizationalNew/components/DialogSelectPerson.vue b/src/modules/02_organizationalNew/components/DialogSelectPerson.vue index 02dc8fc88..aec7d50e6 100644 --- a/src/modules/02_organizationalNew/components/DialogSelectPerson.vue +++ b/src/modules/02_organizationalNew/components/DialogSelectPerson.vue @@ -520,174 +520,176 @@ watch([() => page.value, () => pageSize.value], () => { ค้นหาคนครอง
-
-
- -
-
- -
-
- -
-
- - -
-
- -
+
+
+
+ +
+
+ +
+
+ +
+
+ + +
+
+ +
- -
- - - + + +
diff --git a/src/modules/02_organizationalNew/components/mainTree.vue b/src/modules/02_organizationalNew/components/mainTree.vue index 9d0fb2102..88d482208 100644 --- a/src/modules/02_organizationalNew/components/mainTree.vue +++ b/src/modules/02_organizationalNew/components/mainTree.vue @@ -114,19 +114,20 @@ function updateSelected(data: DataTree) { }) .then(async (res: any) => { const data = await res.data.result; - - store.getSumPosition({ - totalPosition: data.totalPosition, - totalPositionCurrentUse: data.totalPositionCurrentUse, - totalPositionCurrentVacant: data.totalPositionCurrentVacant, - totalPositionNextUse: data.totalPositionNextUse, - totalPositionNextVacant: data.totalPositionNextVacant, - totalRootPosition: data.totalPosition, - totalRootPositionCurrentUse: data.totalPositionCurrentUse, - totalRootPositionCurrentVacant: data.totalPositionCurrentVacant, - totalRootPositionNextUse: data.totalPositionNextUse, - totalRootPositionNextVacant: data.totalPositionNextVacant, - }); + if (data) { + store.getSumPosition({ + totalPosition: data.totalPosition, + totalPositionCurrentUse: data.totalPositionCurrentUse, + totalPositionCurrentVacant: data.totalPositionCurrentVacant, + totalPositionNextUse: data.totalPositionNextUse, + totalPositionNextVacant: data.totalPositionNextVacant, + totalRootPosition: data.totalPosition, + totalRootPositionCurrentUse: data.totalPositionCurrentUse, + totalRootPositionCurrentVacant: data.totalPositionCurrentVacant, + totalRootPositionNextUse: data.totalPositionNextUse, + totalRootPositionNextVacant: data.totalPositionNextVacant, + }); + } }); // } }