diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 612cdc5..6e2ae82 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -12,3 +12,67 @@ data, }) } + +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/apply/detail', + method: 'post', + data, + }) +} + +// 审批删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function applyDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/delete', + method: 'post', + data, + }) +} + +// 编辑 + +export function applyEdit(data: object) { + return request({ + url: '/business/outsourceProject/apply/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/apply/failUpdate', + method: 'post', + data, + }) +} + +// 保存 +export function save(data: object) { + return request({ + url: '/business/outsourceProject/apply/save', + method: 'post', + data, + }) +} + +// 提交 +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/apply/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 612cdc5..6e2ae82 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -12,3 +12,67 @@ data, }) } + +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/apply/detail', + method: 'post', + data, + }) +} + +// 审批删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function applyDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/delete', + method: 'post', + data, + }) +} + +// 编辑 + +export function applyEdit(data: object) { + return request({ + url: '/business/outsourceProject/apply/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/apply/failUpdate', + method: 'post', + data, + }) +} + +// 保存 +export function save(data: object) { + return request({ + url: '/business/outsourceProject/apply/save', + method: 'post', + data, + }) +} + +// 提交 +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/apply/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 541b476..045b7d0 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -2,10 +2,10 @@ * 分包方资格审批接口 */ import request from '../../index' -import type { IListQuery } from '@/views/business/subpackage/subpackage-interface' +import type { IListQueryApprove } from '@/views/business/subpackage/subpackage-interface' // 列表查询 -export function getListPage(data: IListQuery) { +export function getListPage(data: IListQueryApprove) { return request({ url: `/business/outsourcer/approval/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 612cdc5..6e2ae82 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -12,3 +12,67 @@ data, }) } + +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/apply/detail', + method: 'post', + data, + }) +} + +// 审批删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function applyDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/delete', + method: 'post', + data, + }) +} + +// 编辑 + +export function applyEdit(data: object) { + return request({ + url: '/business/outsourceProject/apply/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/apply/failUpdate', + method: 'post', + data, + }) +} + +// 保存 +export function save(data: object) { + return request({ + url: '/business/outsourceProject/apply/save', + method: 'post', + data, + }) +} + +// 提交 +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/apply/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 541b476..045b7d0 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -2,10 +2,10 @@ * 分包方资格审批接口 */ import request from '../../index' -import type { IListQuery } from '@/views/business/subpackage/subpackage-interface' +import type { IListQueryApprove } from '@/views/business/subpackage/subpackage-interface' // 列表查询 -export function getListPage(data: IListQuery) { +export function getListPage(data: IListQueryApprove) { return request({ url: `/business/outsourcer/approval/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index a80c98c..b13c622 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -12,3 +12,66 @@ data, }) } +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/check/detail', + method: 'post', + data, + }) +} + +// 删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/check/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function checkdelete(data: object) { + return request({ + url: '/business/outsourceProject/check/delete', + method: 'post', + data, + }) +} + +// 编辑 +export function draftUpdate(data: object) { + return request({ + url: '/business/outsourceProject/check/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 + +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/check/failUpdate', + method: 'post', + data, + }) +} +// 保存 + +export function save(data: object) { + return request({ + url: '/business/outsourceProject/check/save', + method: 'post', + data, + }) +} +// 提交 + +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/check/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 612cdc5..6e2ae82 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -12,3 +12,67 @@ data, }) } + +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/apply/detail', + method: 'post', + data, + }) +} + +// 审批删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function applyDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/delete', + method: 'post', + data, + }) +} + +// 编辑 + +export function applyEdit(data: object) { + return request({ + url: '/business/outsourceProject/apply/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/apply/failUpdate', + method: 'post', + data, + }) +} + +// 保存 +export function save(data: object) { + return request({ + url: '/business/outsourceProject/apply/save', + method: 'post', + data, + }) +} + +// 提交 +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/apply/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 541b476..045b7d0 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -2,10 +2,10 @@ * 分包方资格审批接口 */ import request from '../../index' -import type { IListQuery } from '@/views/business/subpackage/subpackage-interface' +import type { IListQueryApprove } from '@/views/business/subpackage/subpackage-interface' // 列表查询 -export function getListPage(data: IListQuery) { +export function getListPage(data: IListQueryApprove) { return request({ url: `/business/outsourcer/approval/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index a80c98c..b13c622 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -12,3 +12,66 @@ data, }) } +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/check/detail', + method: 'post', + data, + }) +} + +// 删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/check/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function checkdelete(data: object) { + return request({ + url: '/business/outsourceProject/check/delete', + method: 'post', + data, + }) +} + +// 编辑 +export function draftUpdate(data: object) { + return request({ + url: '/business/outsourceProject/check/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 + +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/check/failUpdate', + method: 'post', + data, + }) +} +// 保存 + +export function save(data: object) { + return request({ + url: '/business/outsourceProject/check/save', + method: 'post', + data, + }) +} +// 提交 + +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/check/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts index c3bbf1a..f7d3acb 100644 --- a/src/api/business/subpackage/record.ts +++ b/src/api/business/subpackage/record.ts @@ -2,10 +2,10 @@ * 分包方档案接口 */ import request from '../../index' -import type { IListQuery } from '@/views/business/subpackage/subpackage-interface' +import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface' // 列表查询 -export function getListPage(data: IListQuery) { +export function getListPage(data: IListQueryRecord) { return request({ url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 612cdc5..6e2ae82 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -12,3 +12,67 @@ data, }) } + +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/apply/detail', + method: 'post', + data, + }) +} + +// 审批删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function applyDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/delete', + method: 'post', + data, + }) +} + +// 编辑 + +export function applyEdit(data: object) { + return request({ + url: '/business/outsourceProject/apply/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/apply/failUpdate', + method: 'post', + data, + }) +} + +// 保存 +export function save(data: object) { + return request({ + url: '/business/outsourceProject/apply/save', + method: 'post', + data, + }) +} + +// 提交 +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/apply/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 541b476..045b7d0 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -2,10 +2,10 @@ * 分包方资格审批接口 */ import request from '../../index' -import type { IListQuery } from '@/views/business/subpackage/subpackage-interface' +import type { IListQueryApprove } from '@/views/business/subpackage/subpackage-interface' // 列表查询 -export function getListPage(data: IListQuery) { +export function getListPage(data: IListQueryApprove) { return request({ url: `/business/outsourcer/approval/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index a80c98c..b13c622 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -12,3 +12,66 @@ data, }) } +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/check/detail', + method: 'post', + data, + }) +} + +// 删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/check/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function checkdelete(data: object) { + return request({ + url: '/business/outsourceProject/check/delete', + method: 'post', + data, + }) +} + +// 编辑 +export function draftUpdate(data: object) { + return request({ + url: '/business/outsourceProject/check/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 + +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/check/failUpdate', + method: 'post', + data, + }) +} +// 保存 + +export function save(data: object) { + return request({ + url: '/business/outsourceProject/check/save', + method: 'post', + data, + }) +} +// 提交 + +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/check/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts index c3bbf1a..f7d3acb 100644 --- a/src/api/business/subpackage/record.ts +++ b/src/api/business/subpackage/record.ts @@ -2,10 +2,10 @@ * 分包方档案接口 */ import request from '../../index' -import type { IListQuery } from '@/views/business/subpackage/subpackage-interface' +import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface' // 列表查询 -export function getListPage(data: IListQuery) { +export function getListPage(data: IListQueryRecord) { return request({ url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts index 3442fb8..be9379d 100644 --- a/src/views/business/schedule/certPrint/cert-interface.ts +++ b/src/views/business/schedule/certPrint/cert-interface.ts @@ -147,6 +147,21 @@ status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5) } +// 证书打印 +export interface ICerPrint { + approvalStatus: string | undefined + certificateClass: string + certificateNo: string + createUserId: string | number + customerName: string + formId: string + ids?: [] | null + orderNo: string + printStatus: string | number + sampleName: string + sampleNo: string +} + // 证书同意/拒绝 export interface ICertApprove { comments: string diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 612cdc5..6e2ae82 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -12,3 +12,67 @@ data, }) } + +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/apply/detail', + method: 'post', + data, + }) +} + +// 审批删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function applyDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/delete', + method: 'post', + data, + }) +} + +// 编辑 + +export function applyEdit(data: object) { + return request({ + url: '/business/outsourceProject/apply/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/apply/failUpdate', + method: 'post', + data, + }) +} + +// 保存 +export function save(data: object) { + return request({ + url: '/business/outsourceProject/apply/save', + method: 'post', + data, + }) +} + +// 提交 +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/apply/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 541b476..045b7d0 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -2,10 +2,10 @@ * 分包方资格审批接口 */ import request from '../../index' -import type { IListQuery } from '@/views/business/subpackage/subpackage-interface' +import type { IListQueryApprove } from '@/views/business/subpackage/subpackage-interface' // 列表查询 -export function getListPage(data: IListQuery) { +export function getListPage(data: IListQueryApprove) { return request({ url: `/business/outsourcer/approval/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index a80c98c..b13c622 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -12,3 +12,66 @@ data, }) } +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/check/detail', + method: 'post', + data, + }) +} + +// 删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/check/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function checkdelete(data: object) { + return request({ + url: '/business/outsourceProject/check/delete', + method: 'post', + data, + }) +} + +// 编辑 +export function draftUpdate(data: object) { + return request({ + url: '/business/outsourceProject/check/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 + +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/check/failUpdate', + method: 'post', + data, + }) +} +// 保存 + +export function save(data: object) { + return request({ + url: '/business/outsourceProject/check/save', + method: 'post', + data, + }) +} +// 提交 + +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/check/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts index c3bbf1a..f7d3acb 100644 --- a/src/api/business/subpackage/record.ts +++ b/src/api/business/subpackage/record.ts @@ -2,10 +2,10 @@ * 分包方档案接口 */ import request from '../../index' -import type { IListQuery } from '@/views/business/subpackage/subpackage-interface' +import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface' // 列表查询 -export function getListPage(data: IListQuery) { +export function getListPage(data: IListQueryRecord) { return request({ url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts index 3442fb8..be9379d 100644 --- a/src/views/business/schedule/certPrint/cert-interface.ts +++ b/src/views/business/schedule/certPrint/cert-interface.ts @@ -147,6 +147,21 @@ status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5) } +// 证书打印 +export interface ICerPrint { + approvalStatus: string | undefined + certificateClass: string + certificateNo: string + createUserId: string | number + customerName: string + formId: string + ids?: [] | null + orderNo: string + printStatus: string | number + sampleName: string + sampleNo: string +} + // 证书同意/拒绝 export interface ICertApprove { comments: string diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue index 173b7ea..2788a08 100644 --- a/src/views/business/schedule/certPrint/certList.vue +++ b/src/views/business/schedule/certPrint/certList.vue @@ -247,8 +247,13 @@ type: 'warning', }, ).then(() => { - exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => { - console.log(res) + const params = { + ...listQuery.value, + ids: [row.id], + } + exportCert(params).then((res) => { + const blob = new Blob([res.data]) + exportFile(blob, '证书打印列表.xlsx') }) }) } diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 612cdc5..6e2ae82 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -12,3 +12,67 @@ data, }) } + +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/apply/detail', + method: 'post', + data, + }) +} + +// 审批删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function applyDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/delete', + method: 'post', + data, + }) +} + +// 编辑 + +export function applyEdit(data: object) { + return request({ + url: '/business/outsourceProject/apply/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/apply/failUpdate', + method: 'post', + data, + }) +} + +// 保存 +export function save(data: object) { + return request({ + url: '/business/outsourceProject/apply/save', + method: 'post', + data, + }) +} + +// 提交 +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/apply/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 541b476..045b7d0 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -2,10 +2,10 @@ * 分包方资格审批接口 */ import request from '../../index' -import type { IListQuery } from '@/views/business/subpackage/subpackage-interface' +import type { IListQueryApprove } from '@/views/business/subpackage/subpackage-interface' // 列表查询 -export function getListPage(data: IListQuery) { +export function getListPage(data: IListQueryApprove) { return request({ url: `/business/outsourcer/approval/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index a80c98c..b13c622 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -12,3 +12,66 @@ data, }) } +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/check/detail', + method: 'post', + data, + }) +} + +// 删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/check/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function checkdelete(data: object) { + return request({ + url: '/business/outsourceProject/check/delete', + method: 'post', + data, + }) +} + +// 编辑 +export function draftUpdate(data: object) { + return request({ + url: '/business/outsourceProject/check/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 + +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/check/failUpdate', + method: 'post', + data, + }) +} +// 保存 + +export function save(data: object) { + return request({ + url: '/business/outsourceProject/check/save', + method: 'post', + data, + }) +} +// 提交 + +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/check/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts index c3bbf1a..f7d3acb 100644 --- a/src/api/business/subpackage/record.ts +++ b/src/api/business/subpackage/record.ts @@ -2,10 +2,10 @@ * 分包方档案接口 */ import request from '../../index' -import type { IListQuery } from '@/views/business/subpackage/subpackage-interface' +import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface' // 列表查询 -export function getListPage(data: IListQuery) { +export function getListPage(data: IListQueryRecord) { return request({ url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts index 3442fb8..be9379d 100644 --- a/src/views/business/schedule/certPrint/cert-interface.ts +++ b/src/views/business/schedule/certPrint/cert-interface.ts @@ -147,6 +147,21 @@ status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5) } +// 证书打印 +export interface ICerPrint { + approvalStatus: string | undefined + certificateClass: string + certificateNo: string + createUserId: string | number + customerName: string + formId: string + ids?: [] | null + orderNo: string + printStatus: string | number + sampleName: string + sampleNo: string +} + // 证书同意/拒绝 export interface ICertApprove { comments: string diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue index 173b7ea..2788a08 100644 --- a/src/views/business/schedule/certPrint/certList.vue +++ b/src/views/business/schedule/certPrint/certList.vue @@ -247,8 +247,13 @@ type: 'warning', }, ).then(() => { - exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => { - console.log(res) + const params = { + ...listQuery.value, + ids: [row.id], + } + exportCert(params).then((res) => { + const blob = new Blob([res.data]) + exportFile(blob, '证书打印列表.xlsx') }) }) } diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue index 6c8c903..35877f8 100644 --- a/src/views/business/subpackage/apply/list.vue +++ b/src/views/business/subpackage/apply/list.vue @@ -11,7 +11,7 @@ import type { dictType } from '@/views/device/receive/receive' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' -import { getListPage } from '@/api/business/subpackage/apply' +import { detail, getListPage } from '@/api/business/subpackage/apply' import { SCHEDULE } from '@/utils/scheduleDict' const $router = useRouter() const { proxy } = getCurrentInstance() as any @@ -59,24 +59,6 @@ } }) -// 清除条件 -const clearList = () => { - listQuery.value = { - applicantEndTime: '', // 开始时间 - applicantName: '', // 申请人名称 - applicantStartTime: '', // 结束时间 - approvalStatus: active.value, // 申请状态 - formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, // 表单id - outsourcerName: '', // 分包方名称 - projectName: '', // 分包项目名称 - projectNo: '', // 分包项目编号 - offset: 1, - limit: 20, - } - timeRange.value = ['', ''] - fetchData() -} - // 数据查询 function fetchData(isNowPage = false) { loadingTable.value = true @@ -98,7 +80,23 @@ loadingTable.value = false }) } - +// 清除条件 +const clearList = () => { + listQuery.value = { + applicantEndTime: '', // 开始时间 + applicantName: '', // 申请人名称 + applicantStartTime: '', // 结束时间 + approvalStatus: active.value, // 申请状态 + formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, // 表单id + outsourcerName: '', // 分包方名称 + projectName: '', // 分包项目名称 + projectNo: '', // 分包项目编号 + offset: 1, + limit: 20, + } + timeRange.value = ['', ''] + fetchData() +} // 搜索 const searchList = () => { fetchData(true) @@ -126,7 +124,11 @@ } // 详情或者编辑 const handleEdit = (row: IApplyList, status: string) => { - + if (status !== 'edit') { + detail({ id: row.id }).then((res) => { + console.log(res) + }) + } } // 取消 const handleCancle = (row: IApplyList) => { diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 612cdc5..6e2ae82 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -12,3 +12,67 @@ data, }) } + +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/apply/detail', + method: 'post', + data, + }) +} + +// 审批删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function applyDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/delete', + method: 'post', + data, + }) +} + +// 编辑 + +export function applyEdit(data: object) { + return request({ + url: '/business/outsourceProject/apply/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/apply/failUpdate', + method: 'post', + data, + }) +} + +// 保存 +export function save(data: object) { + return request({ + url: '/business/outsourceProject/apply/save', + method: 'post', + data, + }) +} + +// 提交 +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/apply/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 541b476..045b7d0 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -2,10 +2,10 @@ * 分包方资格审批接口 */ import request from '../../index' -import type { IListQuery } from '@/views/business/subpackage/subpackage-interface' +import type { IListQueryApprove } from '@/views/business/subpackage/subpackage-interface' // 列表查询 -export function getListPage(data: IListQuery) { +export function getListPage(data: IListQueryApprove) { return request({ url: `/business/outsourcer/approval/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index a80c98c..b13c622 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -12,3 +12,66 @@ data, }) } +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/check/detail', + method: 'post', + data, + }) +} + +// 删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/check/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function checkdelete(data: object) { + return request({ + url: '/business/outsourceProject/check/delete', + method: 'post', + data, + }) +} + +// 编辑 +export function draftUpdate(data: object) { + return request({ + url: '/business/outsourceProject/check/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 + +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/check/failUpdate', + method: 'post', + data, + }) +} +// 保存 + +export function save(data: object) { + return request({ + url: '/business/outsourceProject/check/save', + method: 'post', + data, + }) +} +// 提交 + +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/check/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts index c3bbf1a..f7d3acb 100644 --- a/src/api/business/subpackage/record.ts +++ b/src/api/business/subpackage/record.ts @@ -2,10 +2,10 @@ * 分包方档案接口 */ import request from '../../index' -import type { IListQuery } from '@/views/business/subpackage/subpackage-interface' +import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface' // 列表查询 -export function getListPage(data: IListQuery) { +export function getListPage(data: IListQueryRecord) { return request({ url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts index 3442fb8..be9379d 100644 --- a/src/views/business/schedule/certPrint/cert-interface.ts +++ b/src/views/business/schedule/certPrint/cert-interface.ts @@ -147,6 +147,21 @@ status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5) } +// 证书打印 +export interface ICerPrint { + approvalStatus: string | undefined + certificateClass: string + certificateNo: string + createUserId: string | number + customerName: string + formId: string + ids?: [] | null + orderNo: string + printStatus: string | number + sampleName: string + sampleNo: string +} + // 证书同意/拒绝 export interface ICertApprove { comments: string diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue index 173b7ea..2788a08 100644 --- a/src/views/business/schedule/certPrint/certList.vue +++ b/src/views/business/schedule/certPrint/certList.vue @@ -247,8 +247,13 @@ type: 'warning', }, ).then(() => { - exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => { - console.log(res) + const params = { + ...listQuery.value, + ids: [row.id], + } + exportCert(params).then((res) => { + const blob = new Blob([res.data]) + exportFile(blob, '证书打印列表.xlsx') }) }) } diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue index 6c8c903..35877f8 100644 --- a/src/views/business/subpackage/apply/list.vue +++ b/src/views/business/subpackage/apply/list.vue @@ -11,7 +11,7 @@ import type { dictType } from '@/views/device/receive/receive' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' -import { getListPage } from '@/api/business/subpackage/apply' +import { detail, getListPage } from '@/api/business/subpackage/apply' import { SCHEDULE } from '@/utils/scheduleDict' const $router = useRouter() const { proxy } = getCurrentInstance() as any @@ -59,24 +59,6 @@ } }) -// 清除条件 -const clearList = () => { - listQuery.value = { - applicantEndTime: '', // 开始时间 - applicantName: '', // 申请人名称 - applicantStartTime: '', // 结束时间 - approvalStatus: active.value, // 申请状态 - formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, // 表单id - outsourcerName: '', // 分包方名称 - projectName: '', // 分包项目名称 - projectNo: '', // 分包项目编号 - offset: 1, - limit: 20, - } - timeRange.value = ['', ''] - fetchData() -} - // 数据查询 function fetchData(isNowPage = false) { loadingTable.value = true @@ -98,7 +80,23 @@ loadingTable.value = false }) } - +// 清除条件 +const clearList = () => { + listQuery.value = { + applicantEndTime: '', // 开始时间 + applicantName: '', // 申请人名称 + applicantStartTime: '', // 结束时间 + approvalStatus: active.value, // 申请状态 + formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, // 表单id + outsourcerName: '', // 分包方名称 + projectName: '', // 分包项目名称 + projectNo: '', // 分包项目编号 + offset: 1, + limit: 20, + } + timeRange.value = ['', ''] + fetchData() +} // 搜索 const searchList = () => { fetchData(true) @@ -126,7 +124,11 @@ } // 详情或者编辑 const handleEdit = (row: IApplyList, status: string) => { - + if (status !== 'edit') { + detail({ id: row.id }).then((res) => { + console.log(res) + }) + } } // 取消 const handleCancle = (row: IApplyList) => { diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue index ece8355..dac9cd2 100644 --- a/src/views/business/subpackage/approve/list.vue +++ b/src/views/business/subpackage/approve/list.vue @@ -11,9 +11,13 @@ import type { dictType } from '@/views/device/receive/receive' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' +import { getListPage } from '@/api/business/subpackage/approval' + const $router = useRouter() const { proxy } = getCurrentInstance() as any const TabActiveButton = 'SubpackageApproveActive' +const timeRange = ref<[DateModelType, DateModelType]>(['', '']) + // 查询条件 const listQuery: Ref = ref({ applicantEndTime: '', // 开始时间 @@ -31,7 +35,6 @@ offset: 1, limit: 20, }) -const total = ref(0) const loadingTable = ref(false) const menu = ref([]) // 审批状态按钮组合 const active = ref('') @@ -49,10 +52,40 @@ { text: '审批状态', value: 'deliverTime', align: 'center', width: '180px' }, ]) const list = ref([]) +const total = ref(0) -// 搜索 -const searchList = () => { +// 时间变更 +watch(timeRange, (val) => { + if (val) { + listQuery.value.applicantStartTime = `${val[0]}` + listQuery.value.applicantEndTime = `${val[1]}` + } + else { + listQuery.value.applicantStartTime = '' + listQuery.value.applicantEndTime = '' + } +}) +// 数据查询 +function fetchData(isNowPage = false) { + loadingTable.value = true + if (!isNowPage) { + // 是否显示当前页，否则跳转第一页 + listQuery.value.offset = 1 + } + // 模拟数据 + loadingTable.value = false + getListPage(listQuery.value).then((response) => { + list.value = response.data.rows + let interfaceStr = '' + for (const key in response.data.rows[0]) { + const item = response.data.rows[0][key] + interfaceStr += `${key}:${typeof (item)}\n` + } + console.log(interfaceStr) + total.value = parseInt(response.data.total) + loadingTable.value = false + }) } // 清除条件 @@ -73,6 +106,13 @@ offset: 1, limit: 20, } + timeRange.value = ['', ''] + fetchData() +} + +// 搜索 +const searchList = () => { + fetchData(true) } // 新建 const add = () => { @@ -160,18 +200,9 @@ { - exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => { - console.log(res) + const params = { + ...listQuery.value, + ids: [row.id], + } + exportCert(params).then((res) => { + const blob = new Blob([res.data]) + exportFile(blob, '证书打印列表.xlsx') }) }) } diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue index 6c8c903..35877f8 100644 --- a/src/views/business/subpackage/apply/list.vue +++ b/src/views/business/subpackage/apply/list.vue @@ -11,7 +11,7 @@ import type { dictType } from '@/views/device/receive/receive' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' -import { getListPage } from '@/api/business/subpackage/apply' +import { detail, getListPage } from '@/api/business/subpackage/apply' import { SCHEDULE } from '@/utils/scheduleDict' const $router = useRouter() const { proxy } = getCurrentInstance() as any @@ -59,24 +59,6 @@ } }) -// 清除条件 -const clearList = () => { - listQuery.value = { - applicantEndTime: '', // 开始时间 - applicantName: '', // 申请人名称 - applicantStartTime: '', // 结束时间 - approvalStatus: active.value, // 申请状态 - formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, // 表单id - outsourcerName: '', // 分包方名称 - projectName: '', // 分包项目名称 - projectNo: '', // 分包项目编号 - offset: 1, - limit: 20, - } - timeRange.value = ['', ''] - fetchData() -} - // 数据查询 function fetchData(isNowPage = false) { loadingTable.value = true @@ -98,7 +80,23 @@ loadingTable.value = false }) } - +// 清除条件 +const clearList = () => { + listQuery.value = { + applicantEndTime: '', // 开始时间 + applicantName: '', // 申请人名称 + applicantStartTime: '', // 结束时间 + approvalStatus: active.value, // 申请状态 + formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, // 表单id + outsourcerName: '', // 分包方名称 + projectName: '', // 分包项目名称 + projectNo: '', // 分包项目编号 + offset: 1, + limit: 20, + } + timeRange.value = ['', ''] + fetchData() +} // 搜索 const searchList = () => { fetchData(true) @@ -126,7 +124,11 @@ } // 详情或者编辑 const handleEdit = (row: IApplyList, status: string) => { - + if (status !== 'edit') { + detail({ id: row.id }).then((res) => { + console.log(res) + }) + } } // 取消 const handleCancle = (row: IApplyList) => { diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue index ece8355..dac9cd2 100644 --- a/src/views/business/subpackage/approve/list.vue +++ b/src/views/business/subpackage/approve/list.vue @@ -11,9 +11,13 @@ import type { dictType } from '@/views/device/receive/receive' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' +import { getListPage } from '@/api/business/subpackage/approval' + const $router = useRouter() const { proxy } = getCurrentInstance() as any const TabActiveButton = 'SubpackageApproveActive' +const timeRange = ref<[DateModelType, DateModelType]>(['', '']) + // 查询条件 const listQuery: Ref = ref({ applicantEndTime: '', // 开始时间 @@ -31,7 +35,6 @@ offset: 1, limit: 20, }) -const total = ref(0) const loadingTable = ref(false) const menu = ref([]) // 审批状态按钮组合 const active = ref('') @@ -49,10 +52,40 @@ { text: '审批状态', value: 'deliverTime', align: 'center', width: '180px' }, ]) const list = ref([]) +const total = ref(0) -// 搜索 -const searchList = () => { +// 时间变更 +watch(timeRange, (val) => { + if (val) { + listQuery.value.applicantStartTime = `${val[0]}` + listQuery.value.applicantEndTime = `${val[1]}` + } + else { + listQuery.value.applicantStartTime = '' + listQuery.value.applicantEndTime = '' + } +}) +// 数据查询 +function fetchData(isNowPage = false) { + loadingTable.value = true + if (!isNowPage) { + // 是否显示当前页，否则跳转第一页 + listQuery.value.offset = 1 + } + // 模拟数据 + loadingTable.value = false + getListPage(listQuery.value).then((response) => { + list.value = response.data.rows + let interfaceStr = '' + for (const key in response.data.rows[0]) { + const item = response.data.rows[0][key] + interfaceStr += `${key}:${typeof (item)}\n` + } + console.log(interfaceStr) + total.value = parseInt(response.data.total) + loadingTable.value = false + }) } // 清除条件 @@ -73,6 +106,13 @@ offset: 1, limit: 20, } + timeRange.value = ['', ''] + fetchData() +} + +// 搜索 +const searchList = () => { + fetchData(true) } // 新建 const add = () => { @@ -160,18 +200,9 @@ ([ - { text: '分包项目编号', value: 'interchangeCode', align: 'center', width: '160px' }, - { text: '分包项目名称', value: 'customerNo', align: 'center', width: '160px' }, - { text: '验收人', value: 'customerName', align: 'center', width: '160px' }, - { text: '分包方名称', value: 'reciever', align: 'center' }, - { text: '验收结论', value: 'deliverer', align: 'center' }, - { text: '验收时间', value: 'deliverTime', align: 'center', width: '180px' }, - { text: '审批状态', value: 'deliverTime', align: 'center', width: '180px' }, + { text: '分包项目编号', value: 'projectNo', align: 'center', width: '160px' }, + { text: '分包项目名称', value: 'projectName', align: 'center', width: '160px' }, + { text: '验收人', value: 'checkerName', align: 'center', width: '160px' }, + { text: '分包方名称', value: 'outsourcerName', align: 'center', width: '160px' }, + { text: '验收结论', value: 'checkerName', align: 'center', width: '160px' }, + { text: '验收时间', value: 'checkTime', align: 'center', width: '180px' }, + { text: '审批状态', value: 'applyApprovalStatusName', align: 'center', width: '180px' }, ]) const list = ref([]) const total = ref(0) @@ -158,13 +158,12 @@ onMounted(async () => { await getDict() - if (window.sessionStorage.getItem(TabActiveButton) !== 'undefined' && window.sessionStorage.getItem(TabActiveButton) !== '' && window.sessionStorage.getItem(TabActiveButton) !== null) { + if (window.sessionStorage.getItem(TabActiveButton)) { active.value = window.sessionStorage.getItem(TabActiveButton)! } else { active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部 } - fetchData() }) diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 612cdc5..6e2ae82 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -12,3 +12,67 @@ data, }) } + +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/apply/detail', + method: 'post', + data, + }) +} + +// 审批删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function applyDel(data: object) { + return request({ + url: '/business/outsourceProject/apply/delete', + method: 'post', + data, + }) +} + +// 编辑 + +export function applyEdit(data: object) { + return request({ + url: '/business/outsourceProject/apply/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/apply/failUpdate', + method: 'post', + data, + }) +} + +// 保存 +export function save(data: object) { + return request({ + url: '/business/outsourceProject/apply/save', + method: 'post', + data, + }) +} + +// 提交 +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/apply/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 541b476..045b7d0 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -2,10 +2,10 @@ * 分包方资格审批接口 */ import request from '../../index' -import type { IListQuery } from '@/views/business/subpackage/subpackage-interface' +import type { IListQueryApprove } from '@/views/business/subpackage/subpackage-interface' // 列表查询 -export function getListPage(data: IListQuery) { +export function getListPage(data: IListQueryApprove) { return request({ url: `/business/outsourcer/approval/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index a80c98c..b13c622 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -12,3 +12,66 @@ data, }) } +// 详情 +export function detail(data: object) { + return request({ + url: '/business/outsourceProject/check/detail', + method: 'post', + data, + }) +} + +// 删除 +export function approvalDel(data: object) { + return request({ + url: '/business/outsourceProject/check/approval/operate/delete', + method: 'post', + data, + }) +} + +// 草稿箱删除 +export function checkdelete(data: object) { + return request({ + url: '/business/outsourceProject/check/delete', + method: 'post', + data, + }) +} + +// 编辑 +export function draftUpdate(data: object) { + return request({ + url: '/business/outsourceProject/check/draftUpdate', + method: 'post', + data, + }) +} + +// 驳回后编辑 + +export function failUpdate(data: object) { + return request({ + url: '/business/outsourceProject/check/failUpdate', + method: 'post', + data, + }) +} +// 保存 + +export function save(data: object) { + return request({ + url: '/business/outsourceProject/check/save', + method: 'post', + data, + }) +} +// 提交 + +export function submit(data: object) { + return request({ + url: '/business/outsourceProject/check/submit', + method: 'post', + data, + }) +} diff --git a/src/api/business/subpackage/record.ts b/src/api/business/subpackage/record.ts index c3bbf1a..f7d3acb 100644 --- a/src/api/business/subpackage/record.ts +++ b/src/api/business/subpackage/record.ts @@ -2,10 +2,10 @@ * 分包方档案接口 */ import request from '../../index' -import type { IListQuery } from '@/views/business/subpackage/subpackage-interface' +import type { IListQueryRecord } from '@/views/business/subpackage/subpackage-interface' // 列表查询 -export function getListPage(data: IListQuery) { +export function getListPage(data: IListQueryRecord) { return request({ url: `/business/outsourcer/listPage?offset=${data.offset}&limit=${data.limit}`, method: 'post', diff --git a/src/views/business/schedule/certPrint/cert-interface.ts b/src/views/business/schedule/certPrint/cert-interface.ts index 3442fb8..be9379d 100644 --- a/src/views/business/schedule/certPrint/cert-interface.ts +++ b/src/views/business/schedule/certPrint/cert-interface.ts @@ -147,6 +147,21 @@ status?: string // 状态变更(无需检测状态7,收入状态2,归还6，回退状态2.5.1,终止5) } +// 证书打印 +export interface ICerPrint { + approvalStatus: string | undefined + certificateClass: string + certificateNo: string + createUserId: string | number + customerName: string + formId: string + ids?: [] | null + orderNo: string + printStatus: string | number + sampleName: string + sampleNo: string +} + // 证书同意/拒绝 export interface ICertApprove { comments: string diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue index 173b7ea..2788a08 100644 --- a/src/views/business/schedule/certPrint/certList.vue +++ b/src/views/business/schedule/certPrint/certList.vue @@ -247,8 +247,13 @@ type: 'warning', }, ).then(() => { - exportCert({ orderId: row.orderId, reason: row.reason, sampleId: row.sampleId, status: row.status }).then((res) => { - console.log(res) + const params = { + ...listQuery.value, + ids: [row.id], + } + exportCert(params).then((res) => { + const blob = new Blob([res.data]) + exportFile(blob, '证书打印列表.xlsx') }) }) } diff --git a/src/views/business/subpackage/apply/list.vue b/src/views/business/subpackage/apply/list.vue index 6c8c903..35877f8 100644 --- a/src/views/business/subpackage/apply/list.vue +++ b/src/views/business/subpackage/apply/list.vue @@ -11,7 +11,7 @@ import type { dictType } from '@/views/device/receive/receive' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' -import { getListPage } from '@/api/business/subpackage/apply' +import { detail, getListPage } from '@/api/business/subpackage/apply' import { SCHEDULE } from '@/utils/scheduleDict' const $router = useRouter() const { proxy } = getCurrentInstance() as any @@ -59,24 +59,6 @@ } }) -// 清除条件 -const clearList = () => { - listQuery.value = { - applicantEndTime: '', // 开始时间 - applicantName: '', // 申请人名称 - applicantStartTime: '', // 结束时间 - approvalStatus: active.value, // 申请状态 - formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, // 表单id - outsourcerName: '', // 分包方名称 - projectName: '', // 分包项目名称 - projectNo: '', // 分包项目编号 - offset: 1, - limit: 20, - } - timeRange.value = ['', ''] - fetchData() -} - // 数据查询 function fetchData(isNowPage = false) { loadingTable.value = true @@ -98,7 +80,23 @@ loadingTable.value = false }) } - +// 清除条件 +const clearList = () => { + listQuery.value = { + applicantEndTime: '', // 开始时间 + applicantName: '', // 申请人名称 + applicantStartTime: '', // 结束时间 + approvalStatus: active.value, // 申请状态 + formId: SCHEDULE.BUSINESS_SUBPACKAGE_APPLY, // 表单id + outsourcerName: '', // 分包方名称 + projectName: '', // 分包项目名称 + projectNo: '', // 分包项目编号 + offset: 1, + limit: 20, + } + timeRange.value = ['', ''] + fetchData() +} // 搜索 const searchList = () => { fetchData(true) @@ -126,7 +124,11 @@ } // 详情或者编辑 const handleEdit = (row: IApplyList, status: string) => { - + if (status !== 'edit') { + detail({ id: row.id }).then((res) => { + console.log(res) + }) + } } // 取消 const handleCancle = (row: IApplyList) => { diff --git a/src/views/business/subpackage/approve/list.vue b/src/views/business/subpackage/approve/list.vue index ece8355..dac9cd2 100644 --- a/src/views/business/subpackage/approve/list.vue +++ b/src/views/business/subpackage/approve/list.vue @@ -11,9 +11,13 @@ import type { dictType } from '@/views/device/receive/receive' import type { IMenu } from '@/components/buttonBox/buttonBox' import ButtonBox from '@/components/buttonBox/buttonBox.vue' +import { getListPage } from '@/api/business/subpackage/approval' + const $router = useRouter() const { proxy } = getCurrentInstance() as any const TabActiveButton = 'SubpackageApproveActive' +const timeRange = ref<[DateModelType, DateModelType]>(['', '']) + // 查询条件 const listQuery: Ref = ref({ applicantEndTime: '', // 开始时间 @@ -31,7 +35,6 @@ offset: 1, limit: 20, }) -const total = ref(0) const loadingTable = ref(false) const menu = ref([]) // 审批状态按钮组合 const active = ref('') @@ -49,10 +52,40 @@ { text: '审批状态', value: 'deliverTime', align: 'center', width: '180px' }, ]) const list = ref([]) +const total = ref(0) -// 搜索 -const searchList = () => { +// 时间变更 +watch(timeRange, (val) => { + if (val) { + listQuery.value.applicantStartTime = `${val[0]}` + listQuery.value.applicantEndTime = `${val[1]}` + } + else { + listQuery.value.applicantStartTime = '' + listQuery.value.applicantEndTime = '' + } +}) +// 数据查询 +function fetchData(isNowPage = false) { + loadingTable.value = true + if (!isNowPage) { + // 是否显示当前页，否则跳转第一页 + listQuery.value.offset = 1 + } + // 模拟数据 + loadingTable.value = false + getListPage(listQuery.value).then((response) => { + list.value = response.data.rows + let interfaceStr = '' + for (const key in response.data.rows[0]) { + const item = response.data.rows[0][key] + interfaceStr += `${key}:${typeof (item)}\n` + } + console.log(interfaceStr) + total.value = parseInt(response.data.total) + loadingTable.value = false + }) } // 清除条件 @@ -73,6 +106,13 @@ offset: 1, limit: 20, } + timeRange.value = ['', ''] + fetchData() +} + +// 搜索 +const searchList = () => { + fetchData(true) } // 新建 const add = () => { @@ -160,18 +200,9 @@ ([ - { text: '分包项目编号', value: 'interchangeCode', align: 'center', width: '160px' }, - { text: '分包项目名称', value: 'customerNo', align: 'center', width: '160px' }, - { text: '验收人', value: 'customerName', align: 'center', width: '160px' }, - { text: '分包方名称', value: 'reciever', align: 'center' }, - { text: '验收结论', value: 'deliverer', align: 'center' }, - { text: '验收时间', value: 'deliverTime', align: 'center', width: '180px' }, - { text: '审批状态', value: 'deliverTime', align: 'center', width: '180px' }, + { text: '分包项目编号', value: 'projectNo', align: 'center', width: '160px' }, + { text: '分包项目名称', value: 'projectName', align: 'center', width: '160px' }, + { text: '验收人', value: 'checkerName', align: 'center', width: '160px' }, + { text: '分包方名称', value: 'outsourcerName', align: 'center', width: '160px' }, + { text: '验收结论', value: 'checkerName', align: 'center', width: '160px' }, + { text: '验收时间', value: 'checkTime', align: 'center', width: '180px' }, + { text: '审批状态', value: 'applyApprovalStatusName', align: 'center', width: '180px' }, ]) const list = ref([]) const total = ref(0) @@ -158,13 +158,12 @@ onMounted(async () => { await getDict() - if (window.sessionStorage.getItem(TabActiveButton) !== 'undefined' && window.sessionStorage.getItem(TabActiveButton) !== '' && window.sessionStorage.getItem(TabActiveButton) !== null) { + if (window.sessionStorage.getItem(TabActiveButton)) { active.value = window.sessionStorage.getItem(TabActiveButton)! } else { active.value = menu.value.find(item => item.name === '全部')!.id as string // 全部 } - fetchData() }) diff --git a/src/views/business/subpackage/record/list.vue b/src/views/business/subpackage/record/list.vue index e190697..06c54b6 100644 --- a/src/views/business/subpackage/record/list.vue +++ b/src/views/business/subpackage/record/list.vue @@ -7,6 +7,7 @@ import { printJSON } from '@/utils/printUtils' import { exportFile } from '@/utils/exportUtils' import type { TableColumn } from '@/components/NormalTable/table_interface' +import { getListPage } from '@/api/business/subpackage/record' const $router = useRouter() const { proxy } = getCurrentInstance() as any // 查询条件 @@ -20,7 +21,6 @@ offset: 1, limit: 20, }) -const total = ref(0) const loadingTable = ref(false) // 表头 const columns = ref([ @@ -36,10 +36,32 @@ { text: '备注', value: 'deliverTime', align: 'center', width: '180px' }, ]) const list = ref([]) +const total = ref(0) +// 数据查询 +function fetchData(isNowPage = false) { + loadingTable.value = true + if (!isNowPage) { + // 是否显示当前页，否则跳转第一页 + listQuery.value.offset = 1 + } + // 模拟数据 + loadingTable.value = false + getListPage(listQuery.value).then((response) => { + list.value = response.data.rows + let interfaceStr = '' + for (const key in response.data.rows[0]) { + const item = response.data.rows[0][key] + interfaceStr += `${key}:${typeof (item)}\n` + } + console.log(interfaceStr) + total.value = parseInt(response.data.total) + loadingTable.value = false + }) +} // 搜索 const searchList = () => { - + fetchData(true) } // 清除条件 @@ -54,6 +76,7 @@ offset: 1, limit: 20, } + fetchData() } // 导出 const exportAll = () => { @@ -77,6 +100,7 @@ } onMounted(async () => { + fetchData() })