diff --git a/src/api/oa/erp/contractOrder/index.ts b/src/api/oa/erp/contractOrder/index.ts index e274c1d..e7536be 100644 --- a/src/api/oa/erp/contractOrder/index.ts +++ b/src/api/oa/erp/contractOrder/index.ts @@ -21,7 +21,7 @@ export const listContractOrder = (query?: ProjectInfoQuery): AxiosPromise => { +export const listContractOrderTodo = (query?: Partial): AxiosPromise => { return request({ url: '/oa/erp/contractOrder/todoList', method: 'get', diff --git a/src/api/oa/erp/projectInfo/types.ts b/src/api/oa/erp/projectInfo/types.ts index 78ee151..7c5f936 100644 --- a/src/api/oa/erp/projectInfo/types.ts +++ b/src/api/oa/erp/projectInfo/types.ts @@ -259,6 +259,11 @@ export interface ProjectInfoForm extends BaseEntity { */ managerId?: string | number; + /** + * 待办人类型(default本人相关 create本人创建 manager本人项目经理 all全部) + */ + todoOwnerType?: string; + /** * 部门负责人 */ @@ -469,6 +474,11 @@ export interface ProjectInfoQuery extends PageQuery { */ managerId?: string | number; + /** + * 待办人类型(default本人相关 create本人创建 manager本人项目经理 all全部) + */ + todoOwnerType?: string; + /** * 部门负责人 */ diff --git a/src/views/oa/erp/orderLedger/contractOrderTodoIndex.vue b/src/views/oa/erp/orderLedger/contractOrderTodoIndex.vue index 817d928..e2abf6f 100644 --- a/src/views/oa/erp/orderLedger/contractOrderTodoIndex.vue +++ b/src/views/oa/erp/orderLedger/contractOrderTodoIndex.vue @@ -3,7 +3,7 @@
- + @@ -21,9 +21,9 @@ - - - + + + @@ -170,6 +170,11 @@ const allList = ref([]); const showSearch = ref(true); const queryFormRef = ref(); const userList = ref([]); +const todoOwnerTypeOptions = [ + { label: '本人创建', value: 'create' }, + { label: '本人项目经理', value: 'manager' }, + { label: '全部', value: 'all' } +]; const queryParams = reactive({ // 检索框字段(仿照 contractOrderIndex) @@ -178,8 +183,9 @@ const queryParams = reactive({ contractCode: undefined, contractName: undefined, managerId: undefined, + todoOwnerType: 'all', projectStatus: undefined -} as ProjectInfoQuery); +} as Partial); const formatNumber = (num: number) => { // 保持与其它页面一致:显示到小数点后两位 @@ -276,8 +282,9 @@ const refreshAllList = async () => { contractCode: queryParams.contractCode, contractName: queryParams.contractName, managerId: queryParams.managerId, + todoOwnerType: queryParams.todoOwnerType, projectStatus: queryParams.projectStatus - } as ProjectInfoQuery); + }); allList.value = res.data || []; };