diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts new file mode 100644 index 0000000..e1bbc12 --- /dev/null +++ b/src/api/eqpt/subpackage/directory.ts @@ -0,0 +1,83 @@ +/** + * 分包名录管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontractor/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontractor/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontractor/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontractor/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontractor/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editDirectory(data: object) { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitDirectory(data: object) { + return request({ + url: '/subcontractor/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteDirectory(data: object) { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelDirectory(data: object) { + return request({ + url: '/subcontractor/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontractor/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts new file mode 100644 index 0000000..e1bbc12 --- /dev/null +++ b/src/api/eqpt/subpackage/directory.ts @@ -0,0 +1,83 @@ +/** + * 分包名录管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontractor/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontractor/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontractor/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontractor/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontractor/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editDirectory(data: object) { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitDirectory(data: object) { + return request({ + url: '/subcontractor/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteDirectory(data: object) { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelDirectory(data: object) { + return request({ + url: '/subcontractor/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontractor/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 6405f58..1b8de9c 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -964,6 +964,18 @@ activeMenu: '/directorylist', }, }, + { + path: '/directorypage/:type', + name: 'DirectoryEdit', + component: () => import('@/views/tested/subpackage/directory/components/edit.vue'), + meta: { + title: '测试、校准或检定合格分包方名录', + auth: '/tested/subpackage/directory', + sidebar: false, + breadcrumb: false, + activeMenu: '/directorylist', + }, + }, ], }, { diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts new file mode 100644 index 0000000..e1bbc12 --- /dev/null +++ b/src/api/eqpt/subpackage/directory.ts @@ -0,0 +1,83 @@ +/** + * 分包名录管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontractor/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontractor/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontractor/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontractor/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontractor/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editDirectory(data: object) { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitDirectory(data: object) { + return request({ + url: '/subcontractor/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteDirectory(data: object) { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelDirectory(data: object) { + return request({ + url: '/subcontractor/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontractor/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 6405f58..1b8de9c 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -964,6 +964,18 @@ activeMenu: '/directorylist', }, }, + { + path: '/directorypage/:type', + name: 'DirectoryEdit', + component: () => import('@/views/tested/subpackage/directory/components/edit.vue'), + meta: { + title: '测试、校准或检定合格分包方名录', + auth: '/tested/subpackage/directory', + sidebar: false, + breadcrumb: false, + activeMenu: '/directorylist', + }, + }, ], }, { diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue index db652ec..aac3426 100644 --- a/src/views/tested/document/list/index.vue +++ b/src/views/tested/document/list/index.vue @@ -106,7 +106,8 @@ ).then(() => { delDocument(row.id).then((res) => { ElMessage.success('操作成功') - close() + // close() + search() }) }) } diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts new file mode 100644 index 0000000..e1bbc12 --- /dev/null +++ b/src/api/eqpt/subpackage/directory.ts @@ -0,0 +1,83 @@ +/** + * 分包名录管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontractor/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontractor/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontractor/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontractor/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontractor/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editDirectory(data: object) { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitDirectory(data: object) { + return request({ + url: '/subcontractor/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteDirectory(data: object) { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelDirectory(data: object) { + return request({ + url: '/subcontractor/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontractor/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 6405f58..1b8de9c 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -964,6 +964,18 @@ activeMenu: '/directorylist', }, }, + { + path: '/directorypage/:type', + name: 'DirectoryEdit', + component: () => import('@/views/tested/subpackage/directory/components/edit.vue'), + meta: { + title: '测试、校准或检定合格分包方名录', + auth: '/tested/subpackage/directory', + sidebar: false, + breadcrumb: false, + activeMenu: '/directorylist', + }, + }, ], }, { diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue index db652ec..aac3426 100644 --- a/src/views/tested/document/list/index.vue +++ b/src/views/tested/document/list/index.vue @@ -106,7 +106,8 @@ ).then(() => { delDocument(row.id).then((res) => { ElMessage.success('操作成功') - close() + // close() + search() }) }) } diff --git a/src/views/tested/subpackage/directory/components/ApprovalDialog.vue b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue new file mode 100644 index 0000000..13a2122 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue @@ -0,0 +1,172 @@ + + + + + + + + + + + 同意 + + + + 拒绝 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 提交 + + + 取消 + + + + + + diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts new file mode 100644 index 0000000..e1bbc12 --- /dev/null +++ b/src/api/eqpt/subpackage/directory.ts @@ -0,0 +1,83 @@ +/** + * 分包名录管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontractor/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontractor/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontractor/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontractor/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontractor/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editDirectory(data: object) { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitDirectory(data: object) { + return request({ + url: '/subcontractor/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteDirectory(data: object) { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelDirectory(data: object) { + return request({ + url: '/subcontractor/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontractor/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 6405f58..1b8de9c 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -964,6 +964,18 @@ activeMenu: '/directorylist', }, }, + { + path: '/directorypage/:type', + name: 'DirectoryEdit', + component: () => import('@/views/tested/subpackage/directory/components/edit.vue'), + meta: { + title: '测试、校准或检定合格分包方名录', + auth: '/tested/subpackage/directory', + sidebar: false, + breadcrumb: false, + activeMenu: '/directorylist', + }, + }, ], }, { diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue index db652ec..aac3426 100644 --- a/src/views/tested/document/list/index.vue +++ b/src/views/tested/document/list/index.vue @@ -106,7 +106,8 @@ ).then(() => { delDocument(row.id).then((res) => { ElMessage.success('操作成功') - close() + // close() + search() }) }) } diff --git a/src/views/tested/subpackage/directory/components/ApprovalDialog.vue b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue new file mode 100644 index 0000000..13a2122 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue @@ -0,0 +1,172 @@ + + + + + + + + + + + 同意 + + + + 拒绝 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 提交 + + + 取消 + + + + + + diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue new file mode 100644 index 0000000..bde4861 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/capacityTable.vue @@ -0,0 +1,147 @@ + + + + + + + + 增加行 + + + 删除行 + + + + + + + + *{{ item.text }} + + + {{ scope.row[item.value] }} + + + + + + + + + + + + diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts new file mode 100644 index 0000000..e1bbc12 --- /dev/null +++ b/src/api/eqpt/subpackage/directory.ts @@ -0,0 +1,83 @@ +/** + * 分包名录管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontractor/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontractor/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontractor/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontractor/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontractor/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editDirectory(data: object) { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitDirectory(data: object) { + return request({ + url: '/subcontractor/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteDirectory(data: object) { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelDirectory(data: object) { + return request({ + url: '/subcontractor/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontractor/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 6405f58..1b8de9c 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -964,6 +964,18 @@ activeMenu: '/directorylist', }, }, + { + path: '/directorypage/:type', + name: 'DirectoryEdit', + component: () => import('@/views/tested/subpackage/directory/components/edit.vue'), + meta: { + title: '测试、校准或检定合格分包方名录', + auth: '/tested/subpackage/directory', + sidebar: false, + breadcrumb: false, + activeMenu: '/directorylist', + }, + }, ], }, { diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue index db652ec..aac3426 100644 --- a/src/views/tested/document/list/index.vue +++ b/src/views/tested/document/list/index.vue @@ -106,7 +106,8 @@ ).then(() => { delDocument(row.id).then((res) => { ElMessage.success('操作成功') - close() + // close() + search() }) }) } diff --git a/src/views/tested/subpackage/directory/components/ApprovalDialog.vue b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue new file mode 100644 index 0000000..13a2122 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue @@ -0,0 +1,172 @@ + + + + + + + + + + + 同意 + + + + 拒绝 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 提交 + + + 取消 + + + + + + diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue new file mode 100644 index 0000000..bde4861 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/capacityTable.vue @@ -0,0 +1,147 @@ + + + + + + + + 增加行 + + + 删除行 + + + + + + + + *{{ item.text }} + + + {{ scope.row[item.value] }} + + + + + + + + + + + + diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue new file mode 100644 index 0000000..45752c6 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -0,0 +1,542 @@ + + + + + + { $router.back() }" /> + + + + + 编辑 + + + 提交 + + + 保存 + + + 打印 + + + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 上传 + + + + + + + + + + + + + + + + + diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts new file mode 100644 index 0000000..e1bbc12 --- /dev/null +++ b/src/api/eqpt/subpackage/directory.ts @@ -0,0 +1,83 @@ +/** + * 分包名录管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontractor/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontractor/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontractor/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontractor/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontractor/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editDirectory(data: object) { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitDirectory(data: object) { + return request({ + url: '/subcontractor/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteDirectory(data: object) { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelDirectory(data: object) { + return request({ + url: '/subcontractor/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontractor/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 6405f58..1b8de9c 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -964,6 +964,18 @@ activeMenu: '/directorylist', }, }, + { + path: '/directorypage/:type', + name: 'DirectoryEdit', + component: () => import('@/views/tested/subpackage/directory/components/edit.vue'), + meta: { + title: '测试、校准或检定合格分包方名录', + auth: '/tested/subpackage/directory', + sidebar: false, + breadcrumb: false, + activeMenu: '/directorylist', + }, + }, ], }, { diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue index db652ec..aac3426 100644 --- a/src/views/tested/document/list/index.vue +++ b/src/views/tested/document/list/index.vue @@ -106,7 +106,8 @@ ).then(() => { delDocument(row.id).then((res) => { ElMessage.success('操作成功') - close() + // close() + search() }) }) } diff --git a/src/views/tested/subpackage/directory/components/ApprovalDialog.vue b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue new file mode 100644 index 0000000..13a2122 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue @@ -0,0 +1,172 @@ + + + + + + + + + + + 同意 + + + + 拒绝 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 提交 + + + 取消 + + + + + + diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue new file mode 100644 index 0000000..bde4861 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/capacityTable.vue @@ -0,0 +1,147 @@ + + + + + + + + 增加行 + + + 删除行 + + + + + + + + *{{ item.text }} + + + {{ scope.row[item.value] }} + + + + + + + + + + + + diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue new file mode 100644 index 0000000..45752c6 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -0,0 +1,542 @@ + + + + + + { $router.back() }" /> + + + + + 编辑 + + + 提交 + + + 保存 + + + 打印 + + + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 上传 + + + + + + + + + + + + + + + + + diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue new file mode 100644 index 0000000..98716af --- /dev/null +++ b/src/views/tested/subpackage/directory/components/list.vue @@ -0,0 +1,321 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查看 + + + 编辑 + + + 同意 + + + 拒绝 + + + 提交 + + + 取消 + + + 删除 + + + + + + + + + + + diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts new file mode 100644 index 0000000..e1bbc12 --- /dev/null +++ b/src/api/eqpt/subpackage/directory.ts @@ -0,0 +1,83 @@ +/** + * 分包名录管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontractor/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontractor/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontractor/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontractor/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontractor/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editDirectory(data: object) { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitDirectory(data: object) { + return request({ + url: '/subcontractor/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteDirectory(data: object) { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelDirectory(data: object) { + return request({ + url: '/subcontractor/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontractor/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 6405f58..1b8de9c 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -964,6 +964,18 @@ activeMenu: '/directorylist', }, }, + { + path: '/directorypage/:type', + name: 'DirectoryEdit', + component: () => import('@/views/tested/subpackage/directory/components/edit.vue'), + meta: { + title: '测试、校准或检定合格分包方名录', + auth: '/tested/subpackage/directory', + sidebar: false, + breadcrumb: false, + activeMenu: '/directorylist', + }, + }, ], }, { diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue index db652ec..aac3426 100644 --- a/src/views/tested/document/list/index.vue +++ b/src/views/tested/document/list/index.vue @@ -106,7 +106,8 @@ ).then(() => { delDocument(row.id).then((res) => { ElMessage.success('操作成功') - close() + // close() + search() }) }) } diff --git a/src/views/tested/subpackage/directory/components/ApprovalDialog.vue b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue new file mode 100644 index 0000000..13a2122 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue @@ -0,0 +1,172 @@ + + + + + + + + + + + 同意 + + + + 拒绝 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 提交 + + + 取消 + + + + + + diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue new file mode 100644 index 0000000..bde4861 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/capacityTable.vue @@ -0,0 +1,147 @@ + + + + + + + + 增加行 + + + 删除行 + + + + + + + + *{{ item.text }} + + + {{ scope.row[item.value] }} + + + + + + + + + + + + diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue new file mode 100644 index 0000000..45752c6 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -0,0 +1,542 @@ + + + + + + { $router.back() }" /> + + + + + 编辑 + + + 提交 + + + 保存 + + + 打印 + + + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 上传 + + + + + + + + + + + + + + + + + diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue new file mode 100644 index 0000000..98716af --- /dev/null +++ b/src/views/tested/subpackage/directory/components/list.vue @@ -0,0 +1,321 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查看 + + + 编辑 + + + 同意 + + + 拒绝 + + + 提交 + + + 取消 + + + 删除 + + + + + + + + + + + diff --git a/src/views/tested/subpackage/directory/components/personTable.vue b/src/views/tested/subpackage/directory/components/personTable.vue new file mode 100644 index 0000000..e9a2f4a --- /dev/null +++ b/src/views/tested/subpackage/directory/components/personTable.vue @@ -0,0 +1,154 @@ + + + + + + + + 增加行 + + + 删除行 + + + + + + + + *{{ item.text }} + + + {{ scope.row[item.value] }} + + + + + + + + + + + + diff --git a/src/api/eqpt/subpackage/directory.ts b/src/api/eqpt/subpackage/directory.ts new file mode 100644 index 0000000..e1bbc12 --- /dev/null +++ b/src/api/eqpt/subpackage/directory.ts @@ -0,0 +1,83 @@ +/** + * 分包名录管理接口 + */ +import request from '@/api/index' + +// 不同状态列表分页 +export function getListPage(params: object, statusName: string) { + if (statusName === '全部') { + return request({ + url: '/subcontractor/allPage', + method: 'post', + data: params, + }) + } + else if (statusName === '已审批') { + return request({ + url: '/subcontractor/approval/approvedListPage', + method: 'post', + data: params, + }) + } + else if (statusName === '待审批') { + return request({ + url: '/subcontractor/approval/toApprovalListPage', + method: 'post', + data: params, + }) + } + else { + return request({ + url: '/subcontractor/approval/listPage', + method: 'post', + data: params, + }) + } +} +// 详情 +export function getDetail(params: object) { + return request({ + url: '/subcontractor/detail', + method: 'get', + params, + }) +} +// 保存编辑 +export function editDirectory(data: object) { + return request({ + url: '/subcontractor/approval/saveOrUpdate', + method: 'post', + data, + }) +} +// 提交 +export function submitDirectory(data: object) { + return request({ + url: '/subcontractor/approval/submit', + method: 'post', + data, + }) +} +// 删除记录 +export function deleteDirectory(data: object) { + return request({ + url: `/subcontractor/remove?id=${data.id}`, + method: 'post', + }) +} +// 取消 +export function cancelDirectory(data: object) { + return request({ + url: '/subcontractor/approval/cancel', + method: 'post', + data, + }) +} +// 审批操作 +export function handlerApproval(type: string, data: { processId?: string; taskId?: string; comments: string }) { + return request({ + url: `/subcontractor/approval/${type}`, + method: 'post', + data, + }) +} diff --git a/src/router/modules/tested.ts b/src/router/modules/tested.ts index 6405f58..1b8de9c 100644 --- a/src/router/modules/tested.ts +++ b/src/router/modules/tested.ts @@ -964,6 +964,18 @@ activeMenu: '/directorylist', }, }, + { + path: '/directorypage/:type', + name: 'DirectoryEdit', + component: () => import('@/views/tested/subpackage/directory/components/edit.vue'), + meta: { + title: '测试、校准或检定合格分包方名录', + auth: '/tested/subpackage/directory', + sidebar: false, + breadcrumb: false, + activeMenu: '/directorylist', + }, + }, ], }, { diff --git a/src/views/tested/document/list/index.vue b/src/views/tested/document/list/index.vue index db652ec..aac3426 100644 --- a/src/views/tested/document/list/index.vue +++ b/src/views/tested/document/list/index.vue @@ -106,7 +106,8 @@ ).then(() => { delDocument(row.id).then((res) => { ElMessage.success('操作成功') - close() + // close() + search() }) }) } diff --git a/src/views/tested/subpackage/directory/components/ApprovalDialog.vue b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue new file mode 100644 index 0000000..13a2122 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/ApprovalDialog.vue @@ -0,0 +1,172 @@ + + + + + + + + + + + 同意 + + + + 拒绝 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 提交 + + + 取消 + + + + + + diff --git a/src/views/tested/subpackage/directory/components/capacityTable.vue b/src/views/tested/subpackage/directory/components/capacityTable.vue new file mode 100644 index 0000000..bde4861 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/capacityTable.vue @@ -0,0 +1,147 @@ + + + + + + + + 增加行 + + + 删除行 + + + + + + + + *{{ item.text }} + + + {{ scope.row[item.value] }} + + + + + + + + + + + + diff --git a/src/views/tested/subpackage/directory/components/edit.vue b/src/views/tested/subpackage/directory/components/edit.vue new file mode 100644 index 0000000..45752c6 --- /dev/null +++ b/src/views/tested/subpackage/directory/components/edit.vue @@ -0,0 +1,542 @@ + + + + + + { $router.back() }" /> + + + + + 编辑 + + + 提交 + + + 保存 + + + 打印 + + + + 关闭 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 上传 + + + + + + + + + + + + + + + + + diff --git a/src/views/tested/subpackage/directory/components/list.vue b/src/views/tested/subpackage/directory/components/list.vue new file mode 100644 index 0000000..98716af --- /dev/null +++ b/src/views/tested/subpackage/directory/components/list.vue @@ -0,0 +1,321 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查看 + + + 编辑 + + + 同意 + + + 拒绝 + + + 提交 + + + 取消 + + + 删除 + + + + + + + + + + + diff --git a/src/views/tested/subpackage/directory/components/personTable.vue b/src/views/tested/subpackage/directory/components/personTable.vue new file mode 100644 index 0000000..e9a2f4a --- /dev/null +++ b/src/views/tested/subpackage/directory/components/personTable.vue @@ -0,0 +1,154 @@ + + + + + + + + 增加行 + + + 删除行 + + + + + + + + *{{ item.text }} + + + {{ scope.row[item.value] }} + + + + + + + + + + + + diff --git a/src/views/tested/subpackage/directory/index.vue b/src/views/tested/subpackage/directory/index.vue index e98fbed..c280004 100644 --- a/src/views/tested/subpackage/directory/index.vue +++ b/src/views/tested/subpackage/directory/index.vue @@ -1,3 +1,79 @@ + + + - 测试、校准或检定合格分包方名录 + + + + + + {{ item.name }} + + + + + + + + +