diff --git a/src/api/system/user/types.ts b/src/api/system/user/types.ts index deac845..b7c42b6 100644 --- a/src/api/system/user/types.ts +++ b/src/api/system/user/types.ts @@ -67,7 +67,6 @@ export interface UserForm { remark?: string; postIds: string[]; roleIds: string[]; - employeeName?: string; } diff --git a/src/api/workflow/businesstrip/index.ts b/src/api/workflow/businesstrip/index.ts index 840b68e..e9d004a 100644 --- a/src/api/workflow/businesstrip/index.ts +++ b/src/api/workflow/businesstrip/index.ts @@ -3,7 +3,7 @@ import { AxiosPromise } from 'axios'; import { BusinessTripVO, BusinessTripQuery, BusinessTripForm } from '@/api/workflow/businessTrip/types'; /** - * 查询请假列表 + * 查询出差列表 * @param query * @returns {*} */ @@ -17,7 +17,7 @@ export const listBusinessTrip = (query?: BusinessTripQuery): AxiosPromise => { @@ -28,7 +28,7 @@ export const getBusinessTrip = (id: string | number): AxiosPromise => { @@ -40,7 +40,7 @@ export const addBusinessTrip = (data: BusinessTripForm): AxiosPromise => { @@ -52,7 +52,7 @@ export const updateBusinessTrip = (data: BusinessTripForm): AxiosPromise) => { diff --git a/src/api/workflow/businesstrip/types.ts b/src/api/workflow/businesstrip/types.ts index 155a1e0..82c5ad3 100644 --- a/src/api/workflow/businesstrip/types.ts +++ b/src/api/workflow/businesstrip/types.ts @@ -1,9 +1,10 @@ export interface BusinessTripVO { id: string | number; - leaveType: string; + tripType: string; startDate: string; endDate: string; tripDays: number; + budgetType?: string; remark: string; status?: string; } @@ -14,7 +15,12 @@ export interface BusinessTripForm extends BaseEntity { startDate?: string; endDate?: string; tripDays?: number; + tripMoney?: number; + reason?: string; + budgetType?: string; + currentProjects?: string; remark?: string; + attachment?: string; status?: string; } diff --git a/src/router/index.ts b/src/router/index.ts index 2ab09dd..9797a9d 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -177,6 +177,20 @@ export const dynamicRoutes: RouteRecordRaw[] = [ } ] }, + { + path: '/workflow/tripEdit', + component: Layout, + hidden: true, + permissions: ['workflow:businessTrip:edit'], + children: [ + { + path: 'index', + component: () => import('@/views/workflow/businessTrip/tripEdit.vue'), + name: 'tripEdit', + meta: { title: '出差申请', activeMenu: '/workflow/businessTrip', noCache: true } + } + ] + }, { path: '/workflow/design', component: Layout, diff --git a/src/views/workflow/businesstrip/index.vue b/src/views/workflow/businesstrip/index.vue index 0292771..320f16f 100644 --- a/src/views/workflow/businesstrip/index.vue +++ b/src/views/workflow/businesstrip/index.vue @@ -3,12 +3,12 @@