diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 07121f2..aa47bdc 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -250,6 +250,59 @@ }, ], }, + { + path: '/subpackage', + component: Layout, + redirect: '/subpackage/apply', // 子路由 + name: 'Subpackage', + meta: { + title: '分包管理', + icon: 'ep:key', + auth: '/business/subpackage', + }, + children: [ + { + path: 'apply', + name: 'Apply', + component: () => import('@/views/business/subpackage/apply/list.vue'), + meta: { + title: '分包项目申请', + icon: 'ep:key', + auth: '/subpackage/apply', + }, + }, + { + path: 'check', + name: 'Check', + component: () => import('@/views/business/subpackage/check/list.vue'), + meta: { + title: '分包项目验收', + icon: 'ep:key', + auth: '/subpackage/check', + }, + }, + { + path: 'record', + name: 'Record', + component: () => import('@/views/business/subpackage/record/list.vue'), + meta: { + title: '分包方档案', + icon: 'ep:key', + auth: '/subpackage/record', + }, + }, + { + path: 'approve', + name: 'Approve', + component: () => import('@/views/business/subpackage/approve/list.vue'), + meta: { + title: '分包方资格审批', + icon: 'ep:key', + auth: '/subpackage/approve', + }, + }, + ], + }, ] export default routes diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 07121f2..aa47bdc 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -250,6 +250,59 @@ }, ], }, + { + path: '/subpackage', + component: Layout, + redirect: '/subpackage/apply', // 子路由 + name: 'Subpackage', + meta: { + title: '分包管理', + icon: 'ep:key', + auth: '/business/subpackage', + }, + children: [ + { + path: 'apply', + name: 'Apply', + component: () => import('@/views/business/subpackage/apply/list.vue'), + meta: { + title: '分包项目申请', + icon: 'ep:key', + auth: '/subpackage/apply', + }, + }, + { + path: 'check', + name: 'Check', + component: () => import('@/views/business/subpackage/check/list.vue'), + meta: { + title: '分包项目验收', + icon: 'ep:key', + auth: '/subpackage/check', + }, + }, + { + path: 'record', + name: 'Record', + component: () => import('@/views/business/subpackage/record/list.vue'), + meta: { + title: '分包方档案', + icon: 'ep:key', + auth: '/subpackage/record', + }, + }, + { + path: 'approve', + name: 'Approve', + component: () => import('@/views/business/subpackage/approve/list.vue'), + meta: { + title: '分包方资格审批', + icon: 'ep:key', + auth: '/subpackage/approve', + }, + }, + ], + }, ] export default routes diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue new file mode 100644 index 0000000..efe8c62 --- /dev/null +++ b/src/views/business/subpackage/apply/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 07121f2..aa47bdc 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -250,6 +250,59 @@ }, ], }, + { + path: '/subpackage', + component: Layout, + redirect: '/subpackage/apply', // 子路由 + name: 'Subpackage', + meta: { + title: '分包管理', + icon: 'ep:key', + auth: '/business/subpackage', + }, + children: [ + { + path: 'apply', + name: 'Apply', + component: () => import('@/views/business/subpackage/apply/list.vue'), + meta: { + title: '分包项目申请', + icon: 'ep:key', + auth: '/subpackage/apply', + }, + }, + { + path: 'check', + name: 'Check', + component: () => import('@/views/business/subpackage/check/list.vue'), + meta: { + title: '分包项目验收', + icon: 'ep:key', + auth: '/subpackage/check', + }, + }, + { + path: 'record', + name: 'Record', + component: () => import('@/views/business/subpackage/record/list.vue'), + meta: { + title: '分包方档案', + icon: 'ep:key', + auth: '/subpackage/record', + }, + }, + { + path: 'approve', + name: 'Approve', + component: () => import('@/views/business/subpackage/approve/list.vue'), + meta: { + title: '分包方资格审批', + icon: 'ep:key', + auth: '/subpackage/approve', + }, + }, + ], + }, ] export default routes diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue new file mode 100644 index 0000000..efe8c62 --- /dev/null +++ b/src/views/business/subpackage/apply/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue new file mode 100644 index 0000000..ece8355 --- /dev/null +++ b/src/views/business/subpackage/approve/list.vue @@ -0,0 +1,207 @@ + + + + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 07121f2..aa47bdc 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -250,6 +250,59 @@ }, ], }, + { + path: '/subpackage', + component: Layout, + redirect: '/subpackage/apply', // 子路由 + name: 'Subpackage', + meta: { + title: '分包管理', + icon: 'ep:key', + auth: '/business/subpackage', + }, + children: [ + { + path: 'apply', + name: 'Apply', + component: () => import('@/views/business/subpackage/apply/list.vue'), + meta: { + title: '分包项目申请', + icon: 'ep:key', + auth: '/subpackage/apply', + }, + }, + { + path: 'check', + name: 'Check', + component: () => import('@/views/business/subpackage/check/list.vue'), + meta: { + title: '分包项目验收', + icon: 'ep:key', + auth: '/subpackage/check', + }, + }, + { + path: 'record', + name: 'Record', + component: () => import('@/views/business/subpackage/record/list.vue'), + meta: { + title: '分包方档案', + icon: 'ep:key', + auth: '/subpackage/record', + }, + }, + { + path: 'approve', + name: 'Approve', + component: () => import('@/views/business/subpackage/approve/list.vue'), + meta: { + title: '分包方资格审批', + icon: 'ep:key', + auth: '/subpackage/approve', + }, + }, + ], + }, ] export default routes diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue new file mode 100644 index 0000000..efe8c62 --- /dev/null +++ b/src/views/business/subpackage/apply/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue new file mode 100644 index 0000000..ece8355 --- /dev/null +++ b/src/views/business/subpackage/approve/list.vue @@ -0,0 +1,207 @@ + + + + diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue new file mode 100644 index 0000000..49f9c8e --- /dev/null +++ b/src/views/business/subpackage/check/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 07121f2..aa47bdc 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -250,6 +250,59 @@ }, ], }, + { + path: '/subpackage', + component: Layout, + redirect: '/subpackage/apply', // 子路由 + name: 'Subpackage', + meta: { + title: '分包管理', + icon: 'ep:key', + auth: '/business/subpackage', + }, + children: [ + { + path: 'apply', + name: 'Apply', + component: () => import('@/views/business/subpackage/apply/list.vue'), + meta: { + title: '分包项目申请', + icon: 'ep:key', + auth: '/subpackage/apply', + }, + }, + { + path: 'check', + name: 'Check', + component: () => import('@/views/business/subpackage/check/list.vue'), + meta: { + title: '分包项目验收', + icon: 'ep:key', + auth: '/subpackage/check', + }, + }, + { + path: 'record', + name: 'Record', + component: () => import('@/views/business/subpackage/record/list.vue'), + meta: { + title: '分包方档案', + icon: 'ep:key', + auth: '/subpackage/record', + }, + }, + { + path: 'approve', + name: 'Approve', + component: () => import('@/views/business/subpackage/approve/list.vue'), + meta: { + title: '分包方资格审批', + icon: 'ep:key', + auth: '/subpackage/approve', + }, + }, + ], + }, ] export default routes diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue new file mode 100644 index 0000000..efe8c62 --- /dev/null +++ b/src/views/business/subpackage/apply/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue new file mode 100644 index 0000000..ece8355 --- /dev/null +++ b/src/views/business/subpackage/approve/list.vue @@ -0,0 +1,207 @@ + + + + diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue new file mode 100644 index 0000000..49f9c8e --- /dev/null +++ b/src/views/business/subpackage/check/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue new file mode 100644 index 0000000..6ac2d08 --- /dev/null +++ b/src/views/business/subpackage/record/list.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 07121f2..aa47bdc 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -250,6 +250,59 @@ }, ], }, + { + path: '/subpackage', + component: Layout, + redirect: '/subpackage/apply', // 子路由 + name: 'Subpackage', + meta: { + title: '分包管理', + icon: 'ep:key', + auth: '/business/subpackage', + }, + children: [ + { + path: 'apply', + name: 'Apply', + component: () => import('@/views/business/subpackage/apply/list.vue'), + meta: { + title: '分包项目申请', + icon: 'ep:key', + auth: '/subpackage/apply', + }, + }, + { + path: 'check', + name: 'Check', + component: () => import('@/views/business/subpackage/check/list.vue'), + meta: { + title: '分包项目验收', + icon: 'ep:key', + auth: '/subpackage/check', + }, + }, + { + path: 'record', + name: 'Record', + component: () => import('@/views/business/subpackage/record/list.vue'), + meta: { + title: '分包方档案', + icon: 'ep:key', + auth: '/subpackage/record', + }, + }, + { + path: 'approve', + name: 'Approve', + component: () => import('@/views/business/subpackage/approve/list.vue'), + meta: { + title: '分包方资格审批', + icon: 'ep:key', + auth: '/subpackage/approve', + }, + }, + ], + }, ] export default routes diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue new file mode 100644 index 0000000..efe8c62 --- /dev/null +++ b/src/views/business/subpackage/apply/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue new file mode 100644 index 0000000..ece8355 --- /dev/null +++ b/src/views/business/subpackage/approve/list.vue @@ -0,0 +1,207 @@ + + + + diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue new file mode 100644 index 0000000..49f9c8e --- /dev/null +++ b/src/views/business/subpackage/check/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue new file mode 100644 index 0000000..6ac2d08 --- /dev/null +++ b/src/views/business/subpackage/record/list.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/views/business/subpackage/subpackage-interface.ts b/src/views/business/subpackage/subpackage-interface.ts new file mode 100644 index 0000000..13daf09 --- /dev/null +++ b/src/views/business/subpackage/subpackage-interface.ts @@ -0,0 +1,42 @@ +// 分包项目申请查询参数 + 审批公用 +export interface IListQuery { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + formId: string + offset: number + limit: number +} + +export interface IListQueryApprove { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + evaluation: string // 整体评价 + outsourcerNo: string // 分包方编号 + formId: string + offset: number + limit: number +} + +// 分包方档案查询参数 +export interface IListQueryRecord { + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + outsourcerName: string // 分包方名称 + outsourcerNo: string // 分包方编号 + ids?: string[] + formId: string + offset: number + limit: number +} diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 07121f2..aa47bdc 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -250,6 +250,59 @@ }, ], }, + { + path: '/subpackage', + component: Layout, + redirect: '/subpackage/apply', // 子路由 + name: 'Subpackage', + meta: { + title: '分包管理', + icon: 'ep:key', + auth: '/business/subpackage', + }, + children: [ + { + path: 'apply', + name: 'Apply', + component: () => import('@/views/business/subpackage/apply/list.vue'), + meta: { + title: '分包项目申请', + icon: 'ep:key', + auth: '/subpackage/apply', + }, + }, + { + path: 'check', + name: 'Check', + component: () => import('@/views/business/subpackage/check/list.vue'), + meta: { + title: '分包项目验收', + icon: 'ep:key', + auth: '/subpackage/check', + }, + }, + { + path: 'record', + name: 'Record', + component: () => import('@/views/business/subpackage/record/list.vue'), + meta: { + title: '分包方档案', + icon: 'ep:key', + auth: '/subpackage/record', + }, + }, + { + path: 'approve', + name: 'Approve', + component: () => import('@/views/business/subpackage/approve/list.vue'), + meta: { + title: '分包方资格审批', + icon: 'ep:key', + auth: '/subpackage/approve', + }, + }, + ], + }, ] export default routes diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue new file mode 100644 index 0000000..efe8c62 --- /dev/null +++ b/src/views/business/subpackage/apply/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue new file mode 100644 index 0000000..ece8355 --- /dev/null +++ b/src/views/business/subpackage/approve/list.vue @@ -0,0 +1,207 @@ + + + + diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue new file mode 100644 index 0000000..49f9c8e --- /dev/null +++ b/src/views/business/subpackage/check/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue new file mode 100644 index 0000000..6ac2d08 --- /dev/null +++ b/src/views/business/subpackage/record/list.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/views/business/subpackage/subpackage-interface.ts b/src/views/business/subpackage/subpackage-interface.ts new file mode 100644 index 0000000..13daf09 --- /dev/null +++ b/src/views/business/subpackage/subpackage-interface.ts @@ -0,0 +1,42 @@ +// 分包项目申请查询参数 + 审批公用 +export interface IListQuery { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + formId: string + offset: number + limit: number +} + +export interface IListQueryApprove { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + evaluation: string // 整体评价 + outsourcerNo: string // 分包方编号 + formId: string + offset: number + limit: number +} + +// 分包方档案查询参数 +export interface IListQueryRecord { + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + outsourcerName: string // 分包方名称 + outsourcerNo: string // 分包方编号 + ids?: string[] + formId: string + offset: number + limit: number +} diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue index 5d919c2..6ad9900 100644 --- a/src/views/device/borrow/borrowHandle.vue +++ b/src/views/device/borrow/borrowHandle.vue @@ -273,10 +273,6 @@ // 模板下载 const templateDownload = () => { } -// 标签识别 -const identify = () => { -} - // 多选发生改变时 const handleSelectionChange = (e: any) => { checkoutList.value = e.map((item: { id: string }) => item.id) @@ -377,8 +373,8 @@ onMounted(async () => { await getDict() // 获取字典-审批状态 - if (window.sessionStorage.getItem('borrowhandleActive') !== 'undefined' && window.sessionStorage.getItem('borrowhandleActive') !== '') { - active.value = window.sessionStorage.getItem('borrowhandleActive')! + if (window.sessionStorage.getItem('borrowhandleActive')) { + active.value = window.sessionStorage.getItem('borrowhandleActive') as string } else { active.value = menu.value.find(item => item.name === '待借用')!.id as string // 待借用 @@ -445,7 +441,6 @@ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 07121f2..aa47bdc 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -250,6 +250,59 @@ }, ], }, + { + path: '/subpackage', + component: Layout, + redirect: '/subpackage/apply', // 子路由 + name: 'Subpackage', + meta: { + title: '分包管理', + icon: 'ep:key', + auth: '/business/subpackage', + }, + children: [ + { + path: 'apply', + name: 'Apply', + component: () => import('@/views/business/subpackage/apply/list.vue'), + meta: { + title: '分包项目申请', + icon: 'ep:key', + auth: '/subpackage/apply', + }, + }, + { + path: 'check', + name: 'Check', + component: () => import('@/views/business/subpackage/check/list.vue'), + meta: { + title: '分包项目验收', + icon: 'ep:key', + auth: '/subpackage/check', + }, + }, + { + path: 'record', + name: 'Record', + component: () => import('@/views/business/subpackage/record/list.vue'), + meta: { + title: '分包方档案', + icon: 'ep:key', + auth: '/subpackage/record', + }, + }, + { + path: 'approve', + name: 'Approve', + component: () => import('@/views/business/subpackage/approve/list.vue'), + meta: { + title: '分包方资格审批', + icon: 'ep:key', + auth: '/subpackage/approve', + }, + }, + ], + }, ] export default routes diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue new file mode 100644 index 0000000..efe8c62 --- /dev/null +++ b/src/views/business/subpackage/apply/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue new file mode 100644 index 0000000..ece8355 --- /dev/null +++ b/src/views/business/subpackage/approve/list.vue @@ -0,0 +1,207 @@ + + + + diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue new file mode 100644 index 0000000..49f9c8e --- /dev/null +++ b/src/views/business/subpackage/check/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue new file mode 100644 index 0000000..6ac2d08 --- /dev/null +++ b/src/views/business/subpackage/record/list.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/views/business/subpackage/subpackage-interface.ts b/src/views/business/subpackage/subpackage-interface.ts new file mode 100644 index 0000000..13daf09 --- /dev/null +++ b/src/views/business/subpackage/subpackage-interface.ts @@ -0,0 +1,42 @@ +// 分包项目申请查询参数 + 审批公用 +export interface IListQuery { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + formId: string + offset: number + limit: number +} + +export interface IListQueryApprove { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + evaluation: string // 整体评价 + outsourcerNo: string // 分包方编号 + formId: string + offset: number + limit: number +} + +// 分包方档案查询参数 +export interface IListQueryRecord { + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + outsourcerName: string // 分包方名称 + outsourcerNo: string // 分包方编号 + ids?: string[] + formId: string + offset: number + limit: number +} diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue index 5d919c2..6ad9900 100644 --- a/src/views/device/borrow/borrowHandle.vue +++ b/src/views/device/borrow/borrowHandle.vue @@ -273,10 +273,6 @@ // 模板下载 const templateDownload = () => { } -// 标签识别 -const identify = () => { -} - // 多选发生改变时 const handleSelectionChange = (e: any) => { checkoutList.value = e.map((item: { id: string }) => item.id) @@ -377,8 +373,8 @@ onMounted(async () => { await getDict() // 获取字典-审批状态 - if (window.sessionStorage.getItem('borrowhandleActive') !== 'undefined' && window.sessionStorage.getItem('borrowhandleActive') !== '') { - active.value = window.sessionStorage.getItem('borrowhandleActive')! + if (window.sessionStorage.getItem('borrowhandleActive')) { + active.value = window.sessionStorage.getItem('borrowhandleActive') as string } else { active.value = menu.value.find(item => item.name === '待借用')!.id as string // 待借用 @@ -445,7 +441,6 @@ diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index 5ec3c4d..2ab77ef 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -656,7 +656,7 @@ - + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 07121f2..aa47bdc 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -250,6 +250,59 @@ }, ], }, + { + path: '/subpackage', + component: Layout, + redirect: '/subpackage/apply', // 子路由 + name: 'Subpackage', + meta: { + title: '分包管理', + icon: 'ep:key', + auth: '/business/subpackage', + }, + children: [ + { + path: 'apply', + name: 'Apply', + component: () => import('@/views/business/subpackage/apply/list.vue'), + meta: { + title: '分包项目申请', + icon: 'ep:key', + auth: '/subpackage/apply', + }, + }, + { + path: 'check', + name: 'Check', + component: () => import('@/views/business/subpackage/check/list.vue'), + meta: { + title: '分包项目验收', + icon: 'ep:key', + auth: '/subpackage/check', + }, + }, + { + path: 'record', + name: 'Record', + component: () => import('@/views/business/subpackage/record/list.vue'), + meta: { + title: '分包方档案', + icon: 'ep:key', + auth: '/subpackage/record', + }, + }, + { + path: 'approve', + name: 'Approve', + component: () => import('@/views/business/subpackage/approve/list.vue'), + meta: { + title: '分包方资格审批', + icon: 'ep:key', + auth: '/subpackage/approve', + }, + }, + ], + }, ] export default routes diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue new file mode 100644 index 0000000..efe8c62 --- /dev/null +++ b/src/views/business/subpackage/apply/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue new file mode 100644 index 0000000..ece8355 --- /dev/null +++ b/src/views/business/subpackage/approve/list.vue @@ -0,0 +1,207 @@ + + + + diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue new file mode 100644 index 0000000..49f9c8e --- /dev/null +++ b/src/views/business/subpackage/check/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue new file mode 100644 index 0000000..6ac2d08 --- /dev/null +++ b/src/views/business/subpackage/record/list.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/views/business/subpackage/subpackage-interface.ts b/src/views/business/subpackage/subpackage-interface.ts new file mode 100644 index 0000000..13daf09 --- /dev/null +++ b/src/views/business/subpackage/subpackage-interface.ts @@ -0,0 +1,42 @@ +// 分包项目申请查询参数 + 审批公用 +export interface IListQuery { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + formId: string + offset: number + limit: number +} + +export interface IListQueryApprove { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + evaluation: string // 整体评价 + outsourcerNo: string // 分包方编号 + formId: string + offset: number + limit: number +} + +// 分包方档案查询参数 +export interface IListQueryRecord { + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + outsourcerName: string // 分包方名称 + outsourcerNo: string // 分包方编号 + ids?: string[] + formId: string + offset: number + limit: number +} diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue index 5d919c2..6ad9900 100644 --- a/src/views/device/borrow/borrowHandle.vue +++ b/src/views/device/borrow/borrowHandle.vue @@ -273,10 +273,6 @@ // 模板下载 const templateDownload = () => { } -// 标签识别 -const identify = () => { -} - // 多选发生改变时 const handleSelectionChange = (e: any) => { checkoutList.value = e.map((item: { id: string }) => item.id) @@ -377,8 +373,8 @@ onMounted(async () => { await getDict() // 获取字典-审批状态 - if (window.sessionStorage.getItem('borrowhandleActive') !== 'undefined' && window.sessionStorage.getItem('borrowhandleActive') !== '') { - active.value = window.sessionStorage.getItem('borrowhandleActive')! + if (window.sessionStorage.getItem('borrowhandleActive')) { + active.value = window.sessionStorage.getItem('borrowhandleActive') as string } else { active.value = menu.value.find(item => item.name === '待借用')!.id as string // 待借用 @@ -445,7 +441,6 @@ diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index 5ec3c4d..2ab77ef 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -656,7 +656,7 @@ - + diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue index 988ba08..d92da4c 100644 --- a/src/views/device/standingBook/components/templateAdd.vue +++ b/src/views/device/standingBook/components/templateAdd.vue @@ -78,7 +78,7 @@ { text: '状态类型', value: 'managerStateName', align: 'center' }, { text: '开始日期', value: 'startDate', align: 'center' }, { text: '结束日期', value: 'endDate', align: 'center' }, - { text: '申请人', value: 'applyPerson', align: 'center' }, + { text: '申请人', value: 'applyPersonName', align: 'center' }, ], ) const stateChangedLoading = ref(false) diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 07121f2..aa47bdc 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -250,6 +250,59 @@ }, ], }, + { + path: '/subpackage', + component: Layout, + redirect: '/subpackage/apply', // 子路由 + name: 'Subpackage', + meta: { + title: '分包管理', + icon: 'ep:key', + auth: '/business/subpackage', + }, + children: [ + { + path: 'apply', + name: 'Apply', + component: () => import('@/views/business/subpackage/apply/list.vue'), + meta: { + title: '分包项目申请', + icon: 'ep:key', + auth: '/subpackage/apply', + }, + }, + { + path: 'check', + name: 'Check', + component: () => import('@/views/business/subpackage/check/list.vue'), + meta: { + title: '分包项目验收', + icon: 'ep:key', + auth: '/subpackage/check', + }, + }, + { + path: 'record', + name: 'Record', + component: () => import('@/views/business/subpackage/record/list.vue'), + meta: { + title: '分包方档案', + icon: 'ep:key', + auth: '/subpackage/record', + }, + }, + { + path: 'approve', + name: 'Approve', + component: () => import('@/views/business/subpackage/approve/list.vue'), + meta: { + title: '分包方资格审批', + icon: 'ep:key', + auth: '/subpackage/approve', + }, + }, + ], + }, ] export default routes diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue new file mode 100644 index 0000000..efe8c62 --- /dev/null +++ b/src/views/business/subpackage/apply/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue new file mode 100644 index 0000000..ece8355 --- /dev/null +++ b/src/views/business/subpackage/approve/list.vue @@ -0,0 +1,207 @@ + + + + diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue new file mode 100644 index 0000000..49f9c8e --- /dev/null +++ b/src/views/business/subpackage/check/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue new file mode 100644 index 0000000..6ac2d08 --- /dev/null +++ b/src/views/business/subpackage/record/list.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/views/business/subpackage/subpackage-interface.ts b/src/views/business/subpackage/subpackage-interface.ts new file mode 100644 index 0000000..13daf09 --- /dev/null +++ b/src/views/business/subpackage/subpackage-interface.ts @@ -0,0 +1,42 @@ +// 分包项目申请查询参数 + 审批公用 +export interface IListQuery { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + formId: string + offset: number + limit: number +} + +export interface IListQueryApprove { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + evaluation: string // 整体评价 + outsourcerNo: string // 分包方编号 + formId: string + offset: number + limit: number +} + +// 分包方档案查询参数 +export interface IListQueryRecord { + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + outsourcerName: string // 分包方名称 + outsourcerNo: string // 分包方编号 + ids?: string[] + formId: string + offset: number + limit: number +} diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue index 5d919c2..6ad9900 100644 --- a/src/views/device/borrow/borrowHandle.vue +++ b/src/views/device/borrow/borrowHandle.vue @@ -273,10 +273,6 @@ // 模板下载 const templateDownload = () => { } -// 标签识别 -const identify = () => { -} - // 多选发生改变时 const handleSelectionChange = (e: any) => { checkoutList.value = e.map((item: { id: string }) => item.id) @@ -377,8 +373,8 @@ onMounted(async () => { await getDict() // 获取字典-审批状态 - if (window.sessionStorage.getItem('borrowhandleActive') !== 'undefined' && window.sessionStorage.getItem('borrowhandleActive') !== '') { - active.value = window.sessionStorage.getItem('borrowhandleActive')! + if (window.sessionStorage.getItem('borrowhandleActive')) { + active.value = window.sessionStorage.getItem('borrowhandleActive') as string } else { active.value = menu.value.find(item => item.name === '待借用')!.id as string // 待借用 @@ -445,7 +441,6 @@ diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index 5ec3c4d..2ab77ef 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -656,7 +656,7 @@ - + diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue index 988ba08..d92da4c 100644 --- a/src/views/device/standingBook/components/templateAdd.vue +++ b/src/views/device/standingBook/components/templateAdd.vue @@ -78,7 +78,7 @@ { text: '状态类型', value: 'managerStateName', align: 'center' }, { text: '开始日期', value: 'startDate', align: 'center' }, { text: '结束日期', value: 'endDate', align: 'center' }, - { text: '申请人', value: 'applyPerson', align: 'center' }, + { text: '申请人', value: 'applyPersonName', align: 'center' }, ], ) const stateChangedLoading = ref(false) diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue index 608d07c..479ae05 100644 --- a/src/views/device/standingBook/components/templatePage.vue +++ b/src/views/device/standingBook/components/templatePage.vue @@ -64,8 +64,8 @@ isMeasureAccount: '', // 测量工装 isStandardSupportEquipment: '', // 标准配套设备 isFixedAssets: '', // 固定资产 - validStartDate: '', // 有效开始日期 - validEndDate: '', // 有效结束日期 + validDateStart: '', // 有效开始日期 + validDateEnd: '', // 有效结束日期 abc: '', limit: 20, offset: 1, @@ -78,12 +78,12 @@ }) watch(() => validDate.value, (newVal) => { if (newVal) { - searchQuery.validStartDate = newVal[0] - searchQuery.validEndDate = newVal[1] + searchQuery.validDateStart = newVal[0] + searchQuery.validDateEnd = newVal[1] } else { - searchQuery.validStartDate = '' - searchQuery.validEndDate = '' + searchQuery.validDateStart = '' + searchQuery.validDateEnd = '' } }) const loadingTable = ref(false) // 表格loading @@ -205,8 +205,8 @@ searchQuery.mesureType = '' searchQuery.managerState = '' searchQuery.useDept = '' - searchQuery.validStartDate = '' - searchQuery.validEndDate = '' + searchQuery.validDateStart = '' + searchQuery.validDateEnd = '' searchQuery.abc = '' getList() } diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 07121f2..aa47bdc 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -250,6 +250,59 @@ }, ], }, + { + path: '/subpackage', + component: Layout, + redirect: '/subpackage/apply', // 子路由 + name: 'Subpackage', + meta: { + title: '分包管理', + icon: 'ep:key', + auth: '/business/subpackage', + }, + children: [ + { + path: 'apply', + name: 'Apply', + component: () => import('@/views/business/subpackage/apply/list.vue'), + meta: { + title: '分包项目申请', + icon: 'ep:key', + auth: '/subpackage/apply', + }, + }, + { + path: 'check', + name: 'Check', + component: () => import('@/views/business/subpackage/check/list.vue'), + meta: { + title: '分包项目验收', + icon: 'ep:key', + auth: '/subpackage/check', + }, + }, + { + path: 'record', + name: 'Record', + component: () => import('@/views/business/subpackage/record/list.vue'), + meta: { + title: '分包方档案', + icon: 'ep:key', + auth: '/subpackage/record', + }, + }, + { + path: 'approve', + name: 'Approve', + component: () => import('@/views/business/subpackage/approve/list.vue'), + meta: { + title: '分包方资格审批', + icon: 'ep:key', + auth: '/subpackage/approve', + }, + }, + ], + }, ] export default routes diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue new file mode 100644 index 0000000..efe8c62 --- /dev/null +++ b/src/views/business/subpackage/apply/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue new file mode 100644 index 0000000..ece8355 --- /dev/null +++ b/src/views/business/subpackage/approve/list.vue @@ -0,0 +1,207 @@ + + + + diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue new file mode 100644 index 0000000..49f9c8e --- /dev/null +++ b/src/views/business/subpackage/check/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue new file mode 100644 index 0000000..6ac2d08 --- /dev/null +++ b/src/views/business/subpackage/record/list.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/views/business/subpackage/subpackage-interface.ts b/src/views/business/subpackage/subpackage-interface.ts new file mode 100644 index 0000000..13daf09 --- /dev/null +++ b/src/views/business/subpackage/subpackage-interface.ts @@ -0,0 +1,42 @@ +// 分包项目申请查询参数 + 审批公用 +export interface IListQuery { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + formId: string + offset: number + limit: number +} + +export interface IListQueryApprove { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + evaluation: string // 整体评价 + outsourcerNo: string // 分包方编号 + formId: string + offset: number + limit: number +} + +// 分包方档案查询参数 +export interface IListQueryRecord { + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + outsourcerName: string // 分包方名称 + outsourcerNo: string // 分包方编号 + ids?: string[] + formId: string + offset: number + limit: number +} diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue index 5d919c2..6ad9900 100644 --- a/src/views/device/borrow/borrowHandle.vue +++ b/src/views/device/borrow/borrowHandle.vue @@ -273,10 +273,6 @@ // 模板下载 const templateDownload = () => { } -// 标签识别 -const identify = () => { -} - // 多选发生改变时 const handleSelectionChange = (e: any) => { checkoutList.value = e.map((item: { id: string }) => item.id) @@ -377,8 +373,8 @@ onMounted(async () => { await getDict() // 获取字典-审批状态 - if (window.sessionStorage.getItem('borrowhandleActive') !== 'undefined' && window.sessionStorage.getItem('borrowhandleActive') !== '') { - active.value = window.sessionStorage.getItem('borrowhandleActive')! + if (window.sessionStorage.getItem('borrowhandleActive')) { + active.value = window.sessionStorage.getItem('borrowhandleActive') as string } else { active.value = menu.value.find(item => item.name === '待借用')!.id as string // 待借用 @@ -445,7 +441,6 @@ diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index 5ec3c4d..2ab77ef 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -656,7 +656,7 @@ - + diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue index 988ba08..d92da4c 100644 --- a/src/views/device/standingBook/components/templateAdd.vue +++ b/src/views/device/standingBook/components/templateAdd.vue @@ -78,7 +78,7 @@ { text: '状态类型', value: 'managerStateName', align: 'center' }, { text: '开始日期', value: 'startDate', align: 'center' }, { text: '结束日期', value: 'endDate', align: 'center' }, - { text: '申请人', value: 'applyPerson', align: 'center' }, + { text: '申请人', value: 'applyPersonName', align: 'center' }, ], ) const stateChangedLoading = ref(false) diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue index 608d07c..479ae05 100644 --- a/src/views/device/standingBook/components/templatePage.vue +++ b/src/views/device/standingBook/components/templatePage.vue @@ -64,8 +64,8 @@ isMeasureAccount: '', // 测量工装 isStandardSupportEquipment: '', // 标准配套设备 isFixedAssets: '', // 固定资产 - validStartDate: '', // 有效开始日期 - validEndDate: '', // 有效结束日期 + validDateStart: '', // 有效开始日期 + validDateEnd: '', // 有效结束日期 abc: '', limit: 20, offset: 1, @@ -78,12 +78,12 @@ }) watch(() => validDate.value, (newVal) => { if (newVal) { - searchQuery.validStartDate = newVal[0] - searchQuery.validEndDate = newVal[1] + searchQuery.validDateStart = newVal[0] + searchQuery.validDateEnd = newVal[1] } else { - searchQuery.validStartDate = '' - searchQuery.validEndDate = '' + searchQuery.validDateStart = '' + searchQuery.validDateEnd = '' } }) const loadingTable = ref(false) // 表格loading @@ -205,8 +205,8 @@ searchQuery.mesureType = '' searchQuery.managerState = '' searchQuery.useDept = '' - searchQuery.validStartDate = '' - searchQuery.validEndDate = '' + searchQuery.validDateStart = '' + searchQuery.validDateEnd = '' searchQuery.abc = '' getList() } diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts index be8ee06..bd55019 100644 --- a/src/views/device/standingBook/standingBook-interface.ts +++ b/src/views/device/standingBook/standingBook-interface.ts @@ -18,8 +18,8 @@ mesureType?: string // 检定方式 false modelNo?: string // 型号 false useDept?: string // 使用部门 fals - validStartDate?: string // 有效日期 false - validEndDate?: string // 有效日期 false + validDateStart?: string // 有效日期 false + validDateEnd?: string // 有效日期 false limit?: number offset?: number } diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 07121f2..aa47bdc 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -250,6 +250,59 @@ }, ], }, + { + path: '/subpackage', + component: Layout, + redirect: '/subpackage/apply', // 子路由 + name: 'Subpackage', + meta: { + title: '分包管理', + icon: 'ep:key', + auth: '/business/subpackage', + }, + children: [ + { + path: 'apply', + name: 'Apply', + component: () => import('@/views/business/subpackage/apply/list.vue'), + meta: { + title: '分包项目申请', + icon: 'ep:key', + auth: '/subpackage/apply', + }, + }, + { + path: 'check', + name: 'Check', + component: () => import('@/views/business/subpackage/check/list.vue'), + meta: { + title: '分包项目验收', + icon: 'ep:key', + auth: '/subpackage/check', + }, + }, + { + path: 'record', + name: 'Record', + component: () => import('@/views/business/subpackage/record/list.vue'), + meta: { + title: '分包方档案', + icon: 'ep:key', + auth: '/subpackage/record', + }, + }, + { + path: 'approve', + name: 'Approve', + component: () => import('@/views/business/subpackage/approve/list.vue'), + meta: { + title: '分包方资格审批', + icon: 'ep:key', + auth: '/subpackage/approve', + }, + }, + ], + }, ] export default routes diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue new file mode 100644 index 0000000..efe8c62 --- /dev/null +++ b/src/views/business/subpackage/apply/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue new file mode 100644 index 0000000..ece8355 --- /dev/null +++ b/src/views/business/subpackage/approve/list.vue @@ -0,0 +1,207 @@ + + + + diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue new file mode 100644 index 0000000..49f9c8e --- /dev/null +++ b/src/views/business/subpackage/check/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue new file mode 100644 index 0000000..6ac2d08 --- /dev/null +++ b/src/views/business/subpackage/record/list.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/views/business/subpackage/subpackage-interface.ts b/src/views/business/subpackage/subpackage-interface.ts new file mode 100644 index 0000000..13daf09 --- /dev/null +++ b/src/views/business/subpackage/subpackage-interface.ts @@ -0,0 +1,42 @@ +// 分包项目申请查询参数 + 审批公用 +export interface IListQuery { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + formId: string + offset: number + limit: number +} + +export interface IListQueryApprove { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + evaluation: string // 整体评价 + outsourcerNo: string // 分包方编号 + formId: string + offset: number + limit: number +} + +// 分包方档案查询参数 +export interface IListQueryRecord { + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + outsourcerName: string // 分包方名称 + outsourcerNo: string // 分包方编号 + ids?: string[] + formId: string + offset: number + limit: number +} diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue index 5d919c2..6ad9900 100644 --- a/src/views/device/borrow/borrowHandle.vue +++ b/src/views/device/borrow/borrowHandle.vue @@ -273,10 +273,6 @@ // 模板下载 const templateDownload = () => { } -// 标签识别 -const identify = () => { -} - // 多选发生改变时 const handleSelectionChange = (e: any) => { checkoutList.value = e.map((item: { id: string }) => item.id) @@ -377,8 +373,8 @@ onMounted(async () => { await getDict() // 获取字典-审批状态 - if (window.sessionStorage.getItem('borrowhandleActive') !== 'undefined' && window.sessionStorage.getItem('borrowhandleActive') !== '') { - active.value = window.sessionStorage.getItem('borrowhandleActive')! + if (window.sessionStorage.getItem('borrowhandleActive')) { + active.value = window.sessionStorage.getItem('borrowhandleActive') as string } else { active.value = menu.value.find(item => item.name === '待借用')!.id as string // 待借用 @@ -445,7 +441,6 @@ diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index 5ec3c4d..2ab77ef 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -656,7 +656,7 @@ - + diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue index 988ba08..d92da4c 100644 --- a/src/views/device/standingBook/components/templateAdd.vue +++ b/src/views/device/standingBook/components/templateAdd.vue @@ -78,7 +78,7 @@ { text: '状态类型', value: 'managerStateName', align: 'center' }, { text: '开始日期', value: 'startDate', align: 'center' }, { text: '结束日期', value: 'endDate', align: 'center' }, - { text: '申请人', value: 'applyPerson', align: 'center' }, + { text: '申请人', value: 'applyPersonName', align: 'center' }, ], ) const stateChangedLoading = ref(false) diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue index 608d07c..479ae05 100644 --- a/src/views/device/standingBook/components/templatePage.vue +++ b/src/views/device/standingBook/components/templatePage.vue @@ -64,8 +64,8 @@ isMeasureAccount: '', // 测量工装 isStandardSupportEquipment: '', // 标准配套设备 isFixedAssets: '', // 固定资产 - validStartDate: '', // 有效开始日期 - validEndDate: '', // 有效结束日期 + validDateStart: '', // 有效开始日期 + validDateEnd: '', // 有效结束日期 abc: '', limit: 20, offset: 1, @@ -78,12 +78,12 @@ }) watch(() => validDate.value, (newVal) => { if (newVal) { - searchQuery.validStartDate = newVal[0] - searchQuery.validEndDate = newVal[1] + searchQuery.validDateStart = newVal[0] + searchQuery.validDateEnd = newVal[1] } else { - searchQuery.validStartDate = '' - searchQuery.validEndDate = '' + searchQuery.validDateStart = '' + searchQuery.validDateEnd = '' } }) const loadingTable = ref(false) // 表格loading @@ -205,8 +205,8 @@ searchQuery.mesureType = '' searchQuery.managerState = '' searchQuery.useDept = '' - searchQuery.validStartDate = '' - searchQuery.validEndDate = '' + searchQuery.validDateStart = '' + searchQuery.validDateEnd = '' searchQuery.abc = '' getList() } diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts index be8ee06..bd55019 100644 --- a/src/views/device/standingBook/standingBook-interface.ts +++ b/src/views/device/standingBook/standingBook-interface.ts @@ -18,8 +18,8 @@ mesureType?: string // 检定方式 false modelNo?: string // 型号 false useDept?: string // 使用部门 fals - validStartDate?: string // 有效日期 false - validEndDate?: string // 有效日期 false + validDateStart?: string // 有效日期 false + validDateEnd?: string // 有效日期 false limit?: number offset?: number } diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue index e6bb9a1..119af38 100644 --- a/src/views/device/stateManage/components/templateAdd.vue +++ b/src/views/device/stateManage/components/templateAdd.vue @@ -855,7 +855,7 @@ - + import('@/views/business/subpackage/apply/list.vue'), + meta: { + title: '分包项目申请', + icon: 'ep:key', + auth: '/subpackage/apply', + }, + }, + { + path: 'check', + name: 'Check', + component: () => import('@/views/business/subpackage/check/list.vue'), + meta: { + title: '分包项目验收', + icon: 'ep:key', + auth: '/subpackage/check', + }, + }, + { + path: 'record', + name: 'Record', + component: () => import('@/views/business/subpackage/record/list.vue'), + meta: { + title: '分包方档案', + icon: 'ep:key', + auth: '/subpackage/record', + }, + }, + { + path: 'approve', + name: 'Approve', + component: () => import('@/views/business/subpackage/approve/list.vue'), + meta: { + title: '分包方资格审批', + icon: 'ep:key', + auth: '/subpackage/approve', + }, + }, + ], + }, ] export default routes diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue new file mode 100644 index 0000000..efe8c62 --- /dev/null +++ b/src/views/business/subpackage/apply/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue new file mode 100644 index 0000000..ece8355 --- /dev/null +++ b/src/views/business/subpackage/approve/list.vue @@ -0,0 +1,207 @@ + + + + diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue new file mode 100644 index 0000000..49f9c8e --- /dev/null +++ b/src/views/business/subpackage/check/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue new file mode 100644 index 0000000..6ac2d08 --- /dev/null +++ b/src/views/business/subpackage/record/list.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/views/business/subpackage/subpackage-interface.ts b/src/views/business/subpackage/subpackage-interface.ts new file mode 100644 index 0000000..13daf09 --- /dev/null +++ b/src/views/business/subpackage/subpackage-interface.ts @@ -0,0 +1,42 @@ +// 分包项目申请查询参数 + 审批公用 +export interface IListQuery { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + formId: string + offset: number + limit: number +} + +export interface IListQueryApprove { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + evaluation: string // 整体评价 + outsourcerNo: string // 分包方编号 + formId: string + offset: number + limit: number +} + +// 分包方档案查询参数 +export interface IListQueryRecord { + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + outsourcerName: string // 分包方名称 + outsourcerNo: string // 分包方编号 + ids?: string[] + formId: string + offset: number + limit: number +} diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue index 5d919c2..6ad9900 100644 --- a/src/views/device/borrow/borrowHandle.vue +++ b/src/views/device/borrow/borrowHandle.vue @@ -273,10 +273,6 @@ // 模板下载 const templateDownload = () => { } -// 标签识别 -const identify = () => { -} - // 多选发生改变时 const handleSelectionChange = (e: any) => { checkoutList.value = e.map((item: { id: string }) => item.id) @@ -377,8 +373,8 @@ onMounted(async () => { await getDict() // 获取字典-审批状态 - if (window.sessionStorage.getItem('borrowhandleActive') !== 'undefined' && window.sessionStorage.getItem('borrowhandleActive') !== '') { - active.value = window.sessionStorage.getItem('borrowhandleActive')! + if (window.sessionStorage.getItem('borrowhandleActive')) { + active.value = window.sessionStorage.getItem('borrowhandleActive') as string } else { active.value = menu.value.find(item => item.name === '待借用')!.id as string // 待借用 @@ -445,7 +441,6 @@ diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index 5ec3c4d..2ab77ef 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -656,7 +656,7 @@ - + diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue index 988ba08..d92da4c 100644 --- a/src/views/device/standingBook/components/templateAdd.vue +++ b/src/views/device/standingBook/components/templateAdd.vue @@ -78,7 +78,7 @@ { text: '状态类型', value: 'managerStateName', align: 'center' }, { text: '开始日期', value: 'startDate', align: 'center' }, { text: '结束日期', value: 'endDate', align: 'center' }, - { text: '申请人', value: 'applyPerson', align: 'center' }, + { text: '申请人', value: 'applyPersonName', align: 'center' }, ], ) const stateChangedLoading = ref(false) diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue index 608d07c..479ae05 100644 --- a/src/views/device/standingBook/components/templatePage.vue +++ b/src/views/device/standingBook/components/templatePage.vue @@ -64,8 +64,8 @@ isMeasureAccount: '', // 测量工装 isStandardSupportEquipment: '', // 标准配套设备 isFixedAssets: '', // 固定资产 - validStartDate: '', // 有效开始日期 - validEndDate: '', // 有效结束日期 + validDateStart: '', // 有效开始日期 + validDateEnd: '', // 有效结束日期 abc: '', limit: 20, offset: 1, @@ -78,12 +78,12 @@ }) watch(() => validDate.value, (newVal) => { if (newVal) { - searchQuery.validStartDate = newVal[0] - searchQuery.validEndDate = newVal[1] + searchQuery.validDateStart = newVal[0] + searchQuery.validDateEnd = newVal[1] } else { - searchQuery.validStartDate = '' - searchQuery.validEndDate = '' + searchQuery.validDateStart = '' + searchQuery.validDateEnd = '' } }) const loadingTable = ref(false) // 表格loading @@ -205,8 +205,8 @@ searchQuery.mesureType = '' searchQuery.managerState = '' searchQuery.useDept = '' - searchQuery.validStartDate = '' - searchQuery.validEndDate = '' + searchQuery.validDateStart = '' + searchQuery.validDateEnd = '' searchQuery.abc = '' getList() } diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts index be8ee06..bd55019 100644 --- a/src/views/device/standingBook/standingBook-interface.ts +++ b/src/views/device/standingBook/standingBook-interface.ts @@ -18,8 +18,8 @@ mesureType?: string // 检定方式 false modelNo?: string // 型号 false useDept?: string // 使用部门 fals - validStartDate?: string // 有效日期 false - validEndDate?: string // 有效日期 false + validDateStart?: string // 有效日期 false + validDateEnd?: string // 有效日期 false limit?: number offset?: number } diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue index e6bb9a1..119af38 100644 --- a/src/views/device/stateManage/components/templateAdd.vue +++ b/src/views/device/stateManage/components/templateAdd.vue @@ -855,7 +855,7 @@ - + (props.title) // 状态按钮选中 const approvalStatusVal = ref(props.type) -if (props.type == '0') { - approvalStatusVal.value = '' -} // const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱} // const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1} const $router = useRouter() @@ -124,17 +123,17 @@ }, ]) // 表格 const list = ref([]) // 表格数据 -const managerStateList = ref([]) // 状态数据 +const applyUnitList = ref([]) // 状态数据 const approvalDialog = ref() const dialogVisible = ref(false) // 添加组件的显示与隐藏 const { proxy } = getCurrentInstance() as any - +const useDeptListNoTree = ref([]) // 使用部门列表非树结构 const clearSearch = () => { searchQuery.equipmentName = '' searchQuery.applyNo = '' searchQuery.applyStatus = '' searchQuery.applyUnit = '' - searchQuery.approvalStatus = '' + searchQuery.approvalStatus = '0' searchQuery.createUser = '' searchQuery.equipmentNo = '' searchQuery.ids = [] @@ -384,6 +383,15 @@ const batchImport = () => { fileRef.value.click() } + +const getApplyUnitList = () => { + // 获取部门列表 + getDeptTreeList().then((res) => { + // 转成树结构 + applyUnitList.value = toTreeList(res.data, '0', true) + useDeptListNoTree.value = res.data + }) +} // 传给子组件的刷新事件 const refreshDta = () => { getList() @@ -392,6 +400,8 @@ onMounted(() => { getList() + // 获取申请单位 + getApplyUnitList() }) @@ -408,7 +418,7 @@ v-model="searchQuery.applyNo" placeholder="申请编号" clearable - class="w-50 m-2" + class="short-input" /> @@ -416,7 +426,7 @@ v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable - class="w-50 m-2" + class="short-input" /> @@ -424,30 +434,11 @@ v-model="searchQuery.equipmentName" placeholder="设备名称" clearable - class="w-50 m-2" + class="short-input" /> - - - - - - + diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 07121f2..aa47bdc 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -250,6 +250,59 @@ }, ], }, + { + path: '/subpackage', + component: Layout, + redirect: '/subpackage/apply', // 子路由 + name: 'Subpackage', + meta: { + title: '分包管理', + icon: 'ep:key', + auth: '/business/subpackage', + }, + children: [ + { + path: 'apply', + name: 'Apply', + component: () => import('@/views/business/subpackage/apply/list.vue'), + meta: { + title: '分包项目申请', + icon: 'ep:key', + auth: '/subpackage/apply', + }, + }, + { + path: 'check', + name: 'Check', + component: () => import('@/views/business/subpackage/check/list.vue'), + meta: { + title: '分包项目验收', + icon: 'ep:key', + auth: '/subpackage/check', + }, + }, + { + path: 'record', + name: 'Record', + component: () => import('@/views/business/subpackage/record/list.vue'), + meta: { + title: '分包方档案', + icon: 'ep:key', + auth: '/subpackage/record', + }, + }, + { + path: 'approve', + name: 'Approve', + component: () => import('@/views/business/subpackage/approve/list.vue'), + meta: { + title: '分包方资格审批', + icon: 'ep:key', + auth: '/subpackage/approve', + }, + }, + ], + }, ] export default routes diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue new file mode 100644 index 0000000..efe8c62 --- /dev/null +++ b/src/views/business/subpackage/apply/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue new file mode 100644 index 0000000..ece8355 --- /dev/null +++ b/src/views/business/subpackage/approve/list.vue @@ -0,0 +1,207 @@ + + + + diff --git a/src/views/business/subpackage/check/list.vue b/src/views/business/subpackage/check/list.vue new file mode 100644 index 0000000..49f9c8e --- /dev/null +++ b/src/views/business/subpackage/check/list.vue @@ -0,0 +1,200 @@ + + + + diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue new file mode 100644 index 0000000..6ac2d08 --- /dev/null +++ b/src/views/business/subpackage/record/list.vue @@ -0,0 +1,143 @@ + + + + diff --git a/src/views/business/subpackage/subpackage-interface.ts b/src/views/business/subpackage/subpackage-interface.ts new file mode 100644 index 0000000..13daf09 --- /dev/null +++ b/src/views/business/subpackage/subpackage-interface.ts @@ -0,0 +1,42 @@ +// 分包项目申请查询参数 + 审批公用 +export interface IListQuery { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + formId: string + offset: number + limit: number +} + +export interface IListQueryApprove { + projectName: string // 分包项目名称 + projectNo: string // 分包项目编号 + outsourcerName: string // 分包方名称 + applicantName: string // 申请人名称 + applicantStartTime: string // 申请开始日期 + applicantEndTime: string // 申请结束日期 + approvalStatus: string // 审批状态 + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + evaluation: string // 整体评价 + outsourcerNo: string // 分包方编号 + formId: string + offset: number + limit: number +} + +// 分包方档案查询参数 +export interface IListQueryRecord { + businessSize: string // 业务规模-字典code + grade: string // 履约评级-字典code + outsourcerName: string // 分包方名称 + outsourcerNo: string // 分包方编号 + ids?: string[] + formId: string + offset: number + limit: number +} diff --git a/src/views/device/borrow/borrowHandle.vue b/src/views/device/borrow/borrowHandle.vue index 5d919c2..6ad9900 100644 --- a/src/views/device/borrow/borrowHandle.vue +++ b/src/views/device/borrow/borrowHandle.vue @@ -273,10 +273,6 @@ // 模板下载 const templateDownload = () => { } -// 标签识别 -const identify = () => { -} - // 多选发生改变时 const handleSelectionChange = (e: any) => { checkoutList.value = e.map((item: { id: string }) => item.id) @@ -377,8 +373,8 @@ onMounted(async () => { await getDict() // 获取字典-审批状态 - if (window.sessionStorage.getItem('borrowhandleActive') !== 'undefined' && window.sessionStorage.getItem('borrowhandleActive') !== '') { - active.value = window.sessionStorage.getItem('borrowhandleActive')! + if (window.sessionStorage.getItem('borrowhandleActive')) { + active.value = window.sessionStorage.getItem('borrowhandleActive') as string } else { active.value = menu.value.find(item => item.name === '待借用')!.id as string // 待借用 @@ -445,7 +441,6 @@ diff --git a/src/views/device/standingBook/components/baseInfo.vue b/src/views/device/standingBook/components/baseInfo.vue index 5ec3c4d..2ab77ef 100644 --- a/src/views/device/standingBook/components/baseInfo.vue +++ b/src/views/device/standingBook/components/baseInfo.vue @@ -656,7 +656,7 @@ - + diff --git a/src/views/device/standingBook/components/templateAdd.vue b/src/views/device/standingBook/components/templateAdd.vue index 988ba08..d92da4c 100644 --- a/src/views/device/standingBook/components/templateAdd.vue +++ b/src/views/device/standingBook/components/templateAdd.vue @@ -78,7 +78,7 @@ { text: '状态类型', value: 'managerStateName', align: 'center' }, { text: '开始日期', value: 'startDate', align: 'center' }, { text: '结束日期', value: 'endDate', align: 'center' }, - { text: '申请人', value: 'applyPerson', align: 'center' }, + { text: '申请人', value: 'applyPersonName', align: 'center' }, ], ) const stateChangedLoading = ref(false) diff --git a/src/views/device/standingBook/components/templatePage.vue b/src/views/device/standingBook/components/templatePage.vue index 608d07c..479ae05 100644 --- a/src/views/device/standingBook/components/templatePage.vue +++ b/src/views/device/standingBook/components/templatePage.vue @@ -64,8 +64,8 @@ isMeasureAccount: '', // 测量工装 isStandardSupportEquipment: '', // 标准配套设备 isFixedAssets: '', // 固定资产 - validStartDate: '', // 有效开始日期 - validEndDate: '', // 有效结束日期 + validDateStart: '', // 有效开始日期 + validDateEnd: '', // 有效结束日期 abc: '', limit: 20, offset: 1, @@ -78,12 +78,12 @@ }) watch(() => validDate.value, (newVal) => { if (newVal) { - searchQuery.validStartDate = newVal[0] - searchQuery.validEndDate = newVal[1] + searchQuery.validDateStart = newVal[0] + searchQuery.validDateEnd = newVal[1] } else { - searchQuery.validStartDate = '' - searchQuery.validEndDate = '' + searchQuery.validDateStart = '' + searchQuery.validDateEnd = '' } }) const loadingTable = ref(false) // 表格loading @@ -205,8 +205,8 @@ searchQuery.mesureType = '' searchQuery.managerState = '' searchQuery.useDept = '' - searchQuery.validStartDate = '' - searchQuery.validEndDate = '' + searchQuery.validDateStart = '' + searchQuery.validDateEnd = '' searchQuery.abc = '' getList() } diff --git a/src/views/device/standingBook/standingBook-interface.ts b/src/views/device/standingBook/standingBook-interface.ts index be8ee06..bd55019 100644 --- a/src/views/device/standingBook/standingBook-interface.ts +++ b/src/views/device/standingBook/standingBook-interface.ts @@ -18,8 +18,8 @@ mesureType?: string // 检定方式 false modelNo?: string // 型号 false useDept?: string // 使用部门 fals - validStartDate?: string // 有效日期 false - validEndDate?: string // 有效日期 false + validDateStart?: string // 有效日期 false + validDateEnd?: string // 有效日期 false limit?: number offset?: number } diff --git a/src/views/device/stateManage/components/templateAdd.vue b/src/views/device/stateManage/components/templateAdd.vue index e6bb9a1..119af38 100644 --- a/src/views/device/stateManage/components/templateAdd.vue +++ b/src/views/device/stateManage/components/templateAdd.vue @@ -855,7 +855,7 @@ - + (props.title) // 状态按钮选中 const approvalStatusVal = ref(props.type) -if (props.type == '0') { - approvalStatusVal.value = '' -} // const approvalStatusMap = ref({}) as any// 审批状态字典{1：草稿箱} // const approvalStatusReserveMap = ref({}) as any// 审批状态字典{草稿箱: 1} const $router = useRouter() @@ -124,17 +123,17 @@ }, ]) // 表格 const list = ref([]) // 表格数据 -const managerStateList = ref([]) // 状态数据 +const applyUnitList = ref([]) // 状态数据 const approvalDialog = ref() const dialogVisible = ref(false) // 添加组件的显示与隐藏 const { proxy } = getCurrentInstance() as any - +const useDeptListNoTree = ref([]) // 使用部门列表非树结构 const clearSearch = () => { searchQuery.equipmentName = '' searchQuery.applyNo = '' searchQuery.applyStatus = '' searchQuery.applyUnit = '' - searchQuery.approvalStatus = '' + searchQuery.approvalStatus = '0' searchQuery.createUser = '' searchQuery.equipmentNo = '' searchQuery.ids = [] @@ -384,6 +383,15 @@ const batchImport = () => { fileRef.value.click() } + +const getApplyUnitList = () => { + // 获取部门列表 + getDeptTreeList().then((res) => { + // 转成树结构 + applyUnitList.value = toTreeList(res.data, '0', true) + useDeptListNoTree.value = res.data + }) +} // 传给子组件的刷新事件 const refreshDta = () => { getList() @@ -392,6 +400,8 @@ onMounted(() => { getList() + // 获取申请单位 + getApplyUnitList() }) @@ -408,7 +418,7 @@ v-model="searchQuery.applyNo" placeholder="申请编号" clearable - class="w-50 m-2" + class="short-input" /> @@ -416,7 +426,7 @@ v-model="searchQuery.equipmentNo" placeholder="设备编号" clearable - class="w-50 m-2" + class="short-input" /> @@ -424,30 +434,11 @@ v-model="searchQuery.equipmentName" placeholder="设备名称" clearable - class="w-50 m-2" + class="short-input" /> - - - - - - + diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue index accd71c..10508da 100644 --- a/src/views/finance/businessSettlement/list.vue +++ b/src/views/finance/businessSettlement/list.vue @@ -162,18 +162,9 @@