Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0

gaoluyang

2026-08-03 0d576fce89c6d9b987c77277b063e37e2f0a6db4

 src/views/srm/supplier/components/select-dialog.vue

@@ -20,6 +20,7 @@
const open = ref(false);
const multiple = ref(true);
const approvalFilter = ref(true);
const excludeApproved = ref(false);
const selectedRows = ref<SrmSupplierApi.SupplierVO[]>([]);
const preSelectedIds = ref<number[]>([]);

@@ -178,6 +179,9 @@
          if (approvalFilter.value) {
            params.approved = true;
          }
          if (excludeApproved.value) {
            params.excludeApproved = true;
          }
          return await getSupplierPage(params);
        },
      },
@@ -211,11 +215,12 @@

async function openModal(
  selectedIds?: number[],
  options?: { multiple?: boolean; approvalFilter?: boolean },
  options?: { multiple?: boolean; approvalFilter?: boolean; excludeApproved?: boolean },
) {
  open.value = true;
  multiple.value = options?.multiple ?? true;
  approvalFilter.value = options?.approvalFilter ?? true;
  excludeApproved.value = options?.excludeApproved ?? false;
  preSelectedIds.value = selectedIds || [];
  await nextTick();
  gridApi.setGridOptions({