diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index 593262b..35f7bb3 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -1,30 +1,30 @@ -// 测量设备 +// 财务管理 import type { Route } from '@/global' const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { - path: '/businessSettlement', + path: '/finance', component: Layout, - redirect: '/businessSettlement/vocational', + redirect: '/finance/businessSettlement', name: 'businessSettlement', meta: { title: '业务结算', icon: 'ep:key', - auth: '/businessSettlement/vocational', + auth: '/finance', }, children: [ { - path: 'vocational', - name: 'businessSettlementVocationalx', - component: () => import('@/views/financial/businessSettlement/vocational.vue'), + path: 'businessSettlement', + name: 'businessSettlement', + component: () => import('@/views/finance/businessSettlement/list.vue'), meta: { title: '业务结算', - auth: '/businessSettlement/vocational', + auth: '/finance/businessSettlement', sidebar: false, breadcrumb: true, - activeMenu: '/businessSettlement', + activeMenu: '/finance/businessSettlement', }, }, ], diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index 593262b..35f7bb3 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -1,30 +1,30 @@ -// 测量设备 +// 财务管理 import type { Route } from '@/global' const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { - path: '/businessSettlement', + path: '/finance', component: Layout, - redirect: '/businessSettlement/vocational', + redirect: '/finance/businessSettlement', name: 'businessSettlement', meta: { title: '业务结算', icon: 'ep:key', - auth: '/businessSettlement/vocational', + auth: '/finance', }, children: [ { - path: 'vocational', - name: 'businessSettlementVocationalx', - component: () => import('@/views/financial/businessSettlement/vocational.vue'), + path: 'businessSettlement', + name: 'businessSettlement', + component: () => import('@/views/finance/businessSettlement/list.vue'), meta: { title: '业务结算', - auth: '/businessSettlement/vocational', + auth: '/finance/businessSettlement', sidebar: false, breadcrumb: true, - activeMenu: '/businessSettlement', + activeMenu: '/finance/businessSettlement', }, }, ], diff --git a/src/router/routes.ts b/src/router/routes.ts index e1140de..54e0d4c 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import deviceRoute from './modules/device' import customerRoute from './modules/customer' import businessRoute from './modules/business' +import financialRoute from './modules/financial' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -123,11 +124,12 @@ meta: { title: '财务产值', icon: '', - auth: 'cwcz', + auth: '/finance', }, children: [ - MultilevelMenuExample, - BreadcrumbExample, + ...financialRoute, + // MultilevelMenuExample, + // BreadcrumbExample, ], }, { diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index 593262b..35f7bb3 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -1,30 +1,30 @@ -// 测量设备 +// 财务管理 import type { Route } from '@/global' const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { - path: '/businessSettlement', + path: '/finance', component: Layout, - redirect: '/businessSettlement/vocational', + redirect: '/finance/businessSettlement', name: 'businessSettlement', meta: { title: '业务结算', icon: 'ep:key', - auth: '/businessSettlement/vocational', + auth: '/finance', }, children: [ { - path: 'vocational', - name: 'businessSettlementVocationalx', - component: () => import('@/views/financial/businessSettlement/vocational.vue'), + path: 'businessSettlement', + name: 'businessSettlement', + component: () => import('@/views/finance/businessSettlement/list.vue'), meta: { title: '业务结算', - auth: '/businessSettlement/vocational', + auth: '/finance/businessSettlement', sidebar: false, breadcrumb: true, - activeMenu: '/businessSettlement', + activeMenu: '/finance/businessSettlement', }, }, ], diff --git a/src/router/routes.ts b/src/router/routes.ts index e1140de..54e0d4c 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import deviceRoute from './modules/device' import customerRoute from './modules/customer' import businessRoute from './modules/business' +import financialRoute from './modules/financial' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -123,11 +124,12 @@ meta: { title: '财务产值', icon: '', - auth: 'cwcz', + auth: '/finance', }, children: [ - MultilevelMenuExample, - BreadcrumbExample, + ...financialRoute, + // MultilevelMenuExample, + // BreadcrumbExample, ], }, { diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts new file mode 100644 index 0000000..be785fa --- /dev/null +++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts @@ -0,0 +1,16 @@ +// 列表查询参数类型 +export interface IListQuery { + fileNo: string // 编号 + fileName: string // 名称 + fileCode: string // 文件号 + effectiveStatus: string // 实施状态 + limit: number + offset: number + fileType: string // 类型 + publishStartTime: string + publishEndTime: string + effectiveEndTime: string + effectiveStartTime: string + ids: string[] + formId: string +} diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index 593262b..35f7bb3 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -1,30 +1,30 @@ -// 测量设备 +// 财务管理 import type { Route } from '@/global' const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { - path: '/businessSettlement', + path: '/finance', component: Layout, - redirect: '/businessSettlement/vocational', + redirect: '/finance/businessSettlement', name: 'businessSettlement', meta: { title: '业务结算', icon: 'ep:key', - auth: '/businessSettlement/vocational', + auth: '/finance', }, children: [ { - path: 'vocational', - name: 'businessSettlementVocationalx', - component: () => import('@/views/financial/businessSettlement/vocational.vue'), + path: 'businessSettlement', + name: 'businessSettlement', + component: () => import('@/views/finance/businessSettlement/list.vue'), meta: { title: '业务结算', - auth: '/businessSettlement/vocational', + auth: '/finance/businessSettlement', sidebar: false, breadcrumb: true, - activeMenu: '/businessSettlement', + activeMenu: '/finance/businessSettlement', }, }, ], diff --git a/src/router/routes.ts b/src/router/routes.ts index e1140de..54e0d4c 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import deviceRoute from './modules/device' import customerRoute from './modules/customer' import businessRoute from './modules/business' +import financialRoute from './modules/financial' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -123,11 +124,12 @@ meta: { title: '财务产值', icon: '', - auth: 'cwcz', + auth: '/finance', }, children: [ - MultilevelMenuExample, - BreadcrumbExample, + ...financialRoute, + // MultilevelMenuExample, + // BreadcrumbExample, ], }, { diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts new file mode 100644 index 0000000..be785fa --- /dev/null +++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts @@ -0,0 +1,16 @@ +// 列表查询参数类型 +export interface IListQuery { + fileNo: string // 编号 + fileName: string // 名称 + fileCode: string // 文件号 + effectiveStatus: string // 实施状态 + limit: number + offset: number + fileType: string // 类型 + publishStartTime: string + publishEndTime: string + effectiveEndTime: string + effectiveStartTime: string + ids: string[] + formId: string +} diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue new file mode 100644 index 0000000..accd71c --- /dev/null +++ b/src/views/finance/businessSettlement/list.vue @@ -0,0 +1,209 @@ + + + + diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index 593262b..35f7bb3 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -1,30 +1,30 @@ -// 测量设备 +// 财务管理 import type { Route } from '@/global' const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { - path: '/businessSettlement', + path: '/finance', component: Layout, - redirect: '/businessSettlement/vocational', + redirect: '/finance/businessSettlement', name: 'businessSettlement', meta: { title: '业务结算', icon: 'ep:key', - auth: '/businessSettlement/vocational', + auth: '/finance', }, children: [ { - path: 'vocational', - name: 'businessSettlementVocationalx', - component: () => import('@/views/financial/businessSettlement/vocational.vue'), + path: 'businessSettlement', + name: 'businessSettlement', + component: () => import('@/views/finance/businessSettlement/list.vue'), meta: { title: '业务结算', - auth: '/businessSettlement/vocational', + auth: '/finance/businessSettlement', sidebar: false, breadcrumb: true, - activeMenu: '/businessSettlement', + activeMenu: '/finance/businessSettlement', }, }, ], diff --git a/src/router/routes.ts b/src/router/routes.ts index e1140de..54e0d4c 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import deviceRoute from './modules/device' import customerRoute from './modules/customer' import businessRoute from './modules/business' +import financialRoute from './modules/financial' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -123,11 +124,12 @@ meta: { title: '财务产值', icon: '', - auth: 'cwcz', + auth: '/finance', }, children: [ - MultilevelMenuExample, - BreadcrumbExample, + ...financialRoute, + // MultilevelMenuExample, + // BreadcrumbExample, ], }, { diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts new file mode 100644 index 0000000..be785fa --- /dev/null +++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts @@ -0,0 +1,16 @@ +// 列表查询参数类型 +export interface IListQuery { + fileNo: string // 编号 + fileName: string // 名称 + fileCode: string // 文件号 + effectiveStatus: string // 实施状态 + limit: number + offset: number + fileType: string // 类型 + publishStartTime: string + publishEndTime: string + effectiveEndTime: string + effectiveStartTime: string + ids: string[] + formId: string +} diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue new file mode 100644 index 0000000..accd71c --- /dev/null +++ b/src/views/finance/businessSettlement/list.vue @@ -0,0 +1,209 @@ + + + + diff --git a/src/views/financial/businessSettlement/vocational.vue b/src/views/financial/businessSettlement/vocational.vue deleted file mode 100644 index e69de29..0000000 --- a/src/views/financial/businessSettlement/vocational.vue +++ /dev/null diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index 593262b..35f7bb3 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -1,30 +1,30 @@ -// 测量设备 +// 财务管理 import type { Route } from '@/global' const Layout = () => import('@/layouts/index.vue') const routes: Route.recordRaw[] = [ { - path: '/businessSettlement', + path: '/finance', component: Layout, - redirect: '/businessSettlement/vocational', + redirect: '/finance/businessSettlement', name: 'businessSettlement', meta: { title: '业务结算', icon: 'ep:key', - auth: '/businessSettlement/vocational', + auth: '/finance', }, children: [ { - path: 'vocational', - name: 'businessSettlementVocationalx', - component: () => import('@/views/financial/businessSettlement/vocational.vue'), + path: 'businessSettlement', + name: 'businessSettlement', + component: () => import('@/views/finance/businessSettlement/list.vue'), meta: { title: '业务结算', - auth: '/businessSettlement/vocational', + auth: '/finance/businessSettlement', sidebar: false, breadcrumb: true, - activeMenu: '/businessSettlement', + activeMenu: '/finance/businessSettlement', }, }, ], diff --git a/src/router/routes.ts b/src/router/routes.ts index e1140de..54e0d4c 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -7,6 +7,7 @@ import deviceRoute from './modules/device' import customerRoute from './modules/customer' import businessRoute from './modules/business' +import financialRoute from './modules/financial' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -123,11 +124,12 @@ meta: { title: '财务产值', icon: '', - auth: 'cwcz', + auth: '/finance', }, children: [ - MultilevelMenuExample, - BreadcrumbExample, + ...financialRoute, + // MultilevelMenuExample, + // BreadcrumbExample, ], }, { diff --git a/src/views/finance/businessSettlement/businessSettlement-interface.ts b/src/views/finance/businessSettlement/businessSettlement-interface.ts new file mode 100644 index 0000000..be785fa --- /dev/null +++ b/src/views/finance/businessSettlement/businessSettlement-interface.ts @@ -0,0 +1,16 @@ +// 列表查询参数类型 +export interface IListQuery { + fileNo: string // 编号 + fileName: string // 名称 + fileCode: string // 文件号 + effectiveStatus: string // 实施状态 + limit: number + offset: number + fileType: string // 类型 + publishStartTime: string + publishEndTime: string + effectiveEndTime: string + effectiveStartTime: string + ids: string[] + formId: string +} diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue new file mode 100644 index 0000000..accd71c --- /dev/null +++ b/src/views/finance/businessSettlement/list.vue @@ -0,0 +1,209 @@ + + + + diff --git a/src/views/financial/businessSettlement/vocational.vue b/src/views/financial/businessSettlement/vocational.vue deleted file mode 100644 index e69de29..0000000 --- a/src/views/financial/businessSettlement/vocational.vue +++ /dev/null diff --git a/src/views/financial/contractManagement/income/list.vue b/src/views/financial/contractManagement/income/list.vue deleted file mode 100644 index a9cf2c9..0000000 --- a/src/views/financial/contractManagement/income/list.vue +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - -