|
|
@@ -313,7 +313,7 @@ const useEnterprise = useEnterpriseStore();
|
|
|
|
|
|
const currentEmployeeId = ref<string>("");
|
|
|
const currentDepartmentId = ref<string>("");
|
|
|
-const currentEnterpriseId = computed(() => useEnterprise.getCurrentEnterprise?.enterprise_id || "");
|
|
|
+const currentEnterpriseId = computed(() => enterpriseIdFromUrl.value || useEnterprise.getCurrentEnterprise?.enterprise_id || "");
|
|
|
|
|
|
// 部门搜索配置
|
|
|
const deptSearchConfig = reactive<ISearchConfig>({
|
|
|
@@ -404,6 +404,8 @@ const contentConfig = reactive<IContentConfig<EmployeePageQuery>>({
|
|
|
page_no: params.page_no,
|
|
|
page_size: params.page_size,
|
|
|
};
|
|
|
+ const eid = enterpriseIdFromUrl.value || useEnterprise.getCurrentEnterprise?.enterprise_id;
|
|
|
+ if (eid) query.enterprise_id = eid;
|
|
|
if (params.employee_name) query.employee_name = params.employee_name;
|
|
|
if (params.employee_mobile) query.employee_mobile = params.employee_mobile;
|
|
|
if (params.employee_no) query.employee_no = params.employee_no;
|
|
|
@@ -555,7 +557,7 @@ async function handleDeleteDepartment(departmentId: string, departmentName: stri
|
|
|
// 获取员工签约激活链接
|
|
|
async function handleGetInviteLink(row: any) {
|
|
|
try {
|
|
|
- const enterpriseId = currentEnterpriseId.value || enterpriseIdFromUrl.value;
|
|
|
+ const enterpriseId = row.enterprise_id || currentEnterpriseId.value || enterpriseIdFromUrl.value;
|
|
|
if (!enterpriseId) {
|
|
|
ElMessage.warning("请先选择企业");
|
|
|
return;
|