Merge branch 'develop' into dev

fix(discipline): clear selected employees on class change
fix(salary): add null check for id before processing
2026-03-26 10:18:08 +07:00 · 2026-03-26 10:16:46 +07:00 · 2026-03-26 09:59:29 +07:00
3 changed files with 5 additions and 1 deletions
--- a/src/components/Dialogs/AddPersonal.vue
+++ b/src/components/Dialogs/AddPersonal.vue
@ -305,7 +305,7 @@ watch(
              outlined
              option-label="name"
              option-value="id"
-              @update:model-value="rows = []"
+              @update:model-value="(rows = []), (selected = [])"
            />
          </div>
        </div>
--- a/src/modules/13_salary/components/04_salaryLists/TabMain.vue
+++ b/src/modules/13_salary/components/04_salaryLists/TabMain.vue
@ -222,6 +222,7 @@ const itemsCard = ref([
 * @param id กลุ่ม
 */
 async function fetchDataQuota(id: string) {
+  if (!id) return;
  await http
    .get(config.API.salaryListPeriodQuota(id))
    .then((res) => {
@ -254,6 +255,7 @@ async function fetchDataQuota(id: string) {
 * @param id กลุ่ม
 */
 async function fetchDataPeriod(id: string, force: boolean = false) {
+  if (!id) return;
  force && showLoader();
  let formData = {
    ...params.value,
--- a/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue
+++ b/src/modules/13_salary/components/05_salaryListsEmployee/TabMain.vue
@ -215,6 +215,7 @@ const itemsCard = ref([
 * @param id กลุ่ม
 */
 async function fetchDataQuota(id: string) {
+  if (!id) return;
  await http
    .get(config.API.salaryListPeriodQuotaEmp(id))
    .then((res) => {
@ -246,6 +247,7 @@ async function fetchDataQuota(id: string) {
 * @param id กลุ่ม
 */
 async function fetchDataPeriod(id: string, force: boolean = false) {
+  if (!id) return;
  force && showLoader();
  let formData = {
    ...params.value,
Author	SHA1	Message	Date
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	c7accb6044	Merge branch 'develop' into dev All checks were successful Build & Deploy on Dev / build (push) Successful in 3m40s Details	2026-03-26 10:18:08 +07:00
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	dd5b2e0676	fix(discipline): clear selected employees on class change	2026-03-26 10:16:46 +07:00
$DESKTOP-1R2VSQH\Lenovo ThinkPad E490$ DESKTOP-1R2VSQH\Lenovo ThinkPad E490	3c15bb3b0b	fix(salary): add null check for id before processing	2026-03-26 09:59:29 +07:00