diff --git a/src/views/oa/erp/contractInfo/edit.vue b/src/views/oa/erp/contractInfo/edit.vue index b59767e..6506eca 100644 --- a/src/views/oa/erp/contractInfo/edit.vue +++ b/src/views/oa/erp/contractInfo/edit.vue @@ -779,7 +779,8 @@ const getCustomerInfoListSelect = async () => { /** 查询用户信息下拉框结构 */ const userInfoList = ref([]); const getUserInfoListSelect = async () => { - const res = await getUserList({ pageNum: 1, pageSize: 1000 }); + const params = { } as any; + const res = await getUserList(params); userInfoList.value = res.data; }; diff --git a/src/views/oa/erp/projectInfo/devEdit.vue b/src/views/oa/erp/projectInfo/devEdit.vue index 5d354ad..41086e2 100644 --- a/src/views/oa/erp/projectInfo/devEdit.vue +++ b/src/views/oa/erp/projectInfo/devEdit.vue @@ -274,7 +274,7 @@ import ApprovalButton from '@/components/Process/approvalButton.vue'; import { allListDept } from '@/api/system/dept'; import { listProjectType } from '@/api/oa/erp/projectType'; import { ProjectTypeVO } from '@/api/oa/erp/projectType/types'; -import { listUser } from '@/api/system/user'; +import { getUserList } from '@/api/system/user'; import { UserQuery } from '@/api/system/user/types'; import { CodeRuleEnum, FlowCodeEnum, ProjectCategoryEnum } from '@/enums/OAEnum'; import { listProjectContracts, addProjectContracts, delProjectContracts, getErpProjectContractsList } from '@/api/oa/erp/projectContracts'; @@ -326,9 +326,9 @@ const getDeptInfoListSelect = async () => { /** 查询用户列表 */ const userList = ref([]); -const getUserList = async () => { - const params: UserQuery = { pageNum: 1, pageSize: 9999 }; - const res = await listUser(params); +const getUserSelectList = async () => { + const params = { } as any; + const res = await getUserList(params); userList.value = res.rows; }; @@ -533,7 +533,7 @@ const submitForm = (status: string, mode: boolean) => { //初始化调用 const loadSelectOptions = () => { getDeptInfoListSelect(); - getUserList(); + getUserSelectList(); }; onMounted(async () => { diff --git a/src/views/oa/erp/projectInfo/edit.vue b/src/views/oa/erp/projectInfo/edit.vue index f294e52..e9d9aff 100644 --- a/src/views/oa/erp/projectInfo/edit.vue +++ b/src/views/oa/erp/projectInfo/edit.vue @@ -278,8 +278,7 @@ import ApprovalButton from '@/components/Process/approvalButton.vue'; import { allListDept } from '@/api/system/dept'; import { listProjectType } from '@/api/oa/erp/projectType'; import { ProjectTypeVO } from '@/api/oa/erp/projectType/types'; -import { listUser } from '@/api/system/user'; -import { UserQuery } from '@/api/system/user/types'; +import { getUserList } from '@/api/system/user'; import { CodeRuleEnum, FlowCodeEnum, ProjectCategoryEnum } from '@/enums/OAEnum'; import { getErpProjectContractsList } from '@/api/oa/erp/projectContracts'; import { listContractInfo } from '@/api/oa/erp/contractInfo'; @@ -328,10 +327,10 @@ const getDeptInfoListSelect = async () => { /** 查询用户列表 */ const userList = ref([]); -const getUserList = async () => { - const params: UserQuery = { pageNum: 1, pageSize: 9999 }; - const res = await listUser(params); - userList.value = res.rows; +const getUserSelectList = async () => { + const params = { } as any; + const res = await getUserList(params); + userList.value = res.data; }; const projectTypeOptions = ref([]); @@ -529,7 +528,7 @@ const submitForm = (status: string, mode: boolean) => { //初始化调用 const loadSelectOptions = () => { getDeptInfoListSelect(); - getUserList(); + getUserSelectList(); }; onMounted(async () => { diff --git a/src/views/oa/erp/projectInfo/preEdit.vue b/src/views/oa/erp/projectInfo/preEdit.vue index 18660fa..0a53f84 100644 --- a/src/views/oa/erp/projectInfo/preEdit.vue +++ b/src/views/oa/erp/projectInfo/preEdit.vue @@ -274,7 +274,7 @@ import ApprovalButton from '@/components/Process/approvalButton.vue'; import { allListDept } from '@/api/system/dept'; import { listProjectType } from '@/api/oa/erp/projectType'; import { ProjectTypeVO } from '@/api/oa/erp/projectType/types'; -import { listUser } from '@/api/system/user'; +import { getUserList } from '@/api/system/user'; import { UserQuery } from '@/api/system/user/types'; import { CodeRuleEnum, FlowCodeEnum, ProjectCategoryEnum } from '@/enums/OAEnum'; import { listProjectContracts, addProjectContracts, delProjectContracts, getErpProjectContractsList } from '@/api/oa/erp/projectContracts'; @@ -326,9 +326,9 @@ const getDeptInfoListSelect = async () => { /** 查询用户列表 */ const userList = ref([]); -const getUserList = async () => { - const params: UserQuery = { pageNum: 1, pageSize: 9999 }; - const res = await listUser(params); +const getUserSelectList = async () => { + const params = { } as any; + const res = await getUserList(params); userList.value = res.rows; }; @@ -533,7 +533,7 @@ const submitForm = (status: string, mode: boolean) => { //初始化调用 const loadSelectOptions = () => { getDeptInfoListSelect(); - getUserList(); + getUserSelectList(); }; onMounted(async () => {