diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 7f6e7ec..8bae72b 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -31,8 +31,8 @@ }) } -// 草稿箱删除 -export function applyDel(data: object) { +// 删除 +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/apply/delete', method: 'post', @@ -40,9 +40,8 @@ }) } -// 编辑 - -export function applyEdit(data: object) { +// 编辑(草稿箱、已取消的编辑) +export function updateApply(data: object) { return request({ url: '/business/outsourceProject/apply/draftUpdate', method: 'post', @@ -50,8 +49,8 @@ }) } -// 驳回后编辑 -export function failUpdate(data: object) { +// 未通过-驳回的编辑 +export function failUpdateApply(data: object) { return request({ url: '/business/outsourceProject/apply/failUpdate', method: 'post', @@ -59,8 +58,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function addApply(data: object) { return request({ url: '/business/outsourceProject/apply/save', method: 'post', @@ -69,7 +68,7 @@ } // 提交 -export function submit(data: object) { +export function submit(data: { formId: any; id: string; processId?: string }) { return request({ url: '/business/outsourceProject/apply/submit', method: 'post', diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 7f6e7ec..8bae72b 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -31,8 +31,8 @@ }) } -// 草稿箱删除 -export function applyDel(data: object) { +// 删除 +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/apply/delete', method: 'post', @@ -40,9 +40,8 @@ }) } -// 编辑 - -export function applyEdit(data: object) { +// 编辑(草稿箱、已取消的编辑) +export function updateApply(data: object) { return request({ url: '/business/outsourceProject/apply/draftUpdate', method: 'post', @@ -50,8 +49,8 @@ }) } -// 驳回后编辑 -export function failUpdate(data: object) { +// 未通过-驳回的编辑 +export function failUpdateApply(data: object) { return request({ url: '/business/outsourceProject/apply/failUpdate', method: 'post', @@ -59,8 +58,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function addApply(data: object) { return request({ url: '/business/outsourceProject/apply/save', method: 'post', @@ -69,7 +68,7 @@ } // 提交 -export function submit(data: object) { +export function submit(data: { formId: any; id: string; processId?: string }) { return request({ url: '/business/outsourceProject/apply/submit', method: 'post', diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 74d177b..a6c81df 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -13,14 +13,23 @@ }) } -// 审批详情 -// export function detail(data: object) { -// return request({ -// url: '/business/outsourcer/approval/operate/delete', -// method: 'post', -// data, -// }) -// } +// 删除 +export function deleteListItem(data: { id: string }) { + return request({ + url: '/business/outsourcer/delete', + method: 'post', + data, + }) +} + +// 详情 +export function detail(data: { id: string }) { + return request({ + url: '/business/outsourcer/detail', + method: 'post', + data, + }) +} // 审批删除 export function approvalDel(data: object) { @@ -31,8 +40,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function add(data: object) { return request({ url: '/business/outsourcer/save', method: 'post', @@ -40,6 +49,24 @@ }) } +// 编辑(草稿箱-已取消) +export function UpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/draftUpdate', + method: 'post', + data, + }) +} + +// 编辑(未通过-驳回) +export function failUpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/failUpdate', + method: 'post', + data, + }) +} + // 提交 export function submit(data: object) { return request({ diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 7f6e7ec..8bae72b 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -31,8 +31,8 @@ }) } -// 草稿箱删除 -export function applyDel(data: object) { +// 删除 +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/apply/delete', method: 'post', @@ -40,9 +40,8 @@ }) } -// 编辑 - -export function applyEdit(data: object) { +// 编辑(草稿箱、已取消的编辑) +export function updateApply(data: object) { return request({ url: '/business/outsourceProject/apply/draftUpdate', method: 'post', @@ -50,8 +49,8 @@ }) } -// 驳回后编辑 -export function failUpdate(data: object) { +// 未通过-驳回的编辑 +export function failUpdateApply(data: object) { return request({ url: '/business/outsourceProject/apply/failUpdate', method: 'post', @@ -59,8 +58,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function addApply(data: object) { return request({ url: '/business/outsourceProject/apply/save', method: 'post', @@ -69,7 +68,7 @@ } // 提交 -export function submit(data: object) { +export function submit(data: { formId: any; id: string; processId?: string }) { return request({ url: '/business/outsourceProject/apply/submit', method: 'post', diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 74d177b..a6c81df 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -13,14 +13,23 @@ }) } -// 审批详情 -// export function detail(data: object) { -// return request({ -// url: '/business/outsourcer/approval/operate/delete', -// method: 'post', -// data, -// }) -// } +// 删除 +export function deleteListItem(data: { id: string }) { + return request({ + url: '/business/outsourcer/delete', + method: 'post', + data, + }) +} + +// 详情 +export function detail(data: { id: string }) { + return request({ + url: '/business/outsourcer/detail', + method: 'post', + data, + }) +} // 审批删除 export function approvalDel(data: object) { @@ -31,8 +40,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function add(data: object) { return request({ url: '/business/outsourcer/save', method: 'post', @@ -40,6 +49,24 @@ }) } +// 编辑(草稿箱-已取消) +export function UpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/draftUpdate', + method: 'post', + data, + }) +} + +// 编辑(未通过-驳回) +export function failUpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/failUpdate', + method: 'post', + data, + }) +} + // 提交 export function submit(data: object) { return request({ diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index b13c622..297715c 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -22,7 +22,7 @@ } // 删除 -export function approvalDel(data: object) { +export function approvalDel(data: { id: string }) { return request({ url: '/business/outsourceProject/check/approval/operate/delete', method: 'post', @@ -31,7 +31,7 @@ } // 草稿箱删除 -export function checkdelete(data: object) { +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/check/delete', method: 'post', @@ -39,8 +39,8 @@ }) } -// 编辑 -export function draftUpdate(data: object) { +// 编辑(草稿箱和取消) +export function updateCheck(data: object) { return request({ url: '/business/outsourceProject/check/draftUpdate', method: 'post', @@ -49,25 +49,24 @@ } // 驳回后编辑 - -export function failUpdate(data: object) { +export function failUpdateCheck(data: object) { return request({ url: '/business/outsourceProject/check/failUpdate', method: 'post', data, }) } -// 保存 -export function save(data: object) { +// 新建 +export function addCheck(data: object) { return request({ url: '/business/outsourceProject/check/save', method: 'post', data, }) } -// 提交 +// 提交 export function submit(data: object) { return request({ url: '/business/outsourceProject/check/submit', diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 7f6e7ec..8bae72b 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -31,8 +31,8 @@ }) } -// 草稿箱删除 -export function applyDel(data: object) { +// 删除 +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/apply/delete', method: 'post', @@ -40,9 +40,8 @@ }) } -// 编辑 - -export function applyEdit(data: object) { +// 编辑(草稿箱、已取消的编辑) +export function updateApply(data: object) { return request({ url: '/business/outsourceProject/apply/draftUpdate', method: 'post', @@ -50,8 +49,8 @@ }) } -// 驳回后编辑 -export function failUpdate(data: object) { +// 未通过-驳回的编辑 +export function failUpdateApply(data: object) { return request({ url: '/business/outsourceProject/apply/failUpdate', method: 'post', @@ -59,8 +58,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function addApply(data: object) { return request({ url: '/business/outsourceProject/apply/save', method: 'post', @@ -69,7 +68,7 @@ } // 提交 -export function submit(data: object) { +export function submit(data: { formId: any; id: string; processId?: string }) { return request({ url: '/business/outsourceProject/apply/submit', method: 'post', diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 74d177b..a6c81df 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -13,14 +13,23 @@ }) } -// 审批详情 -// export function detail(data: object) { -// return request({ -// url: '/business/outsourcer/approval/operate/delete', -// method: 'post', -// data, -// }) -// } +// 删除 +export function deleteListItem(data: { id: string }) { + return request({ + url: '/business/outsourcer/delete', + method: 'post', + data, + }) +} + +// 详情 +export function detail(data: { id: string }) { + return request({ + url: '/business/outsourcer/detail', + method: 'post', + data, + }) +} // 审批删除 export function approvalDel(data: object) { @@ -31,8 +40,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function add(data: object) { return request({ url: '/business/outsourcer/save', method: 'post', @@ -40,6 +49,24 @@ }) } +// 编辑(草稿箱-已取消) +export function UpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/draftUpdate', + method: 'post', + data, + }) +} + +// 编辑(未通过-驳回) +export function failUpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/failUpdate', + method: 'post', + data, + }) +} + // 提交 export function submit(data: object) { return request({ diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index b13c622..297715c 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -22,7 +22,7 @@ } // 删除 -export function approvalDel(data: object) { +export function approvalDel(data: { id: string }) { return request({ url: '/business/outsourceProject/check/approval/operate/delete', method: 'post', @@ -31,7 +31,7 @@ } // 草稿箱删除 -export function checkdelete(data: object) { +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/check/delete', method: 'post', @@ -39,8 +39,8 @@ }) } -// 编辑 -export function draftUpdate(data: object) { +// 编辑(草稿箱和取消) +export function updateCheck(data: object) { return request({ url: '/business/outsourceProject/check/draftUpdate', method: 'post', @@ -49,25 +49,24 @@ } // 驳回后编辑 - -export function failUpdate(data: object) { +export function failUpdateCheck(data: object) { return request({ url: '/business/outsourceProject/check/failUpdate', method: 'post', data, }) } -// 保存 -export function save(data: object) { +// 新建 +export function addCheck(data: object) { return request({ url: '/business/outsourceProject/check/save', method: 'post', data, }) } -// 提交 +// 提交 export function submit(data: object) { return request({ url: '/business/outsourceProject/check/submit', diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts new file mode 100644 index 0000000..aba021c --- /dev/null +++ b/src/api/finance/businessSettlement/businessSettlement.ts @@ -0,0 +1,23 @@ +// 业务结算 +import request from '../../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/list', + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 7f6e7ec..8bae72b 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -31,8 +31,8 @@ }) } -// 草稿箱删除 -export function applyDel(data: object) { +// 删除 +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/apply/delete', method: 'post', @@ -40,9 +40,8 @@ }) } -// 编辑 - -export function applyEdit(data: object) { +// 编辑(草稿箱、已取消的编辑) +export function updateApply(data: object) { return request({ url: '/business/outsourceProject/apply/draftUpdate', method: 'post', @@ -50,8 +49,8 @@ }) } -// 驳回后编辑 -export function failUpdate(data: object) { +// 未通过-驳回的编辑 +export function failUpdateApply(data: object) { return request({ url: '/business/outsourceProject/apply/failUpdate', method: 'post', @@ -59,8 +58,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function addApply(data: object) { return request({ url: '/business/outsourceProject/apply/save', method: 'post', @@ -69,7 +68,7 @@ } // 提交 -export function submit(data: object) { +export function submit(data: { formId: any; id: string; processId?: string }) { return request({ url: '/business/outsourceProject/apply/submit', method: 'post', diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 74d177b..a6c81df 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -13,14 +13,23 @@ }) } -// 审批详情 -// export function detail(data: object) { -// return request({ -// url: '/business/outsourcer/approval/operate/delete', -// method: 'post', -// data, -// }) -// } +// 删除 +export function deleteListItem(data: { id: string }) { + return request({ + url: '/business/outsourcer/delete', + method: 'post', + data, + }) +} + +// 详情 +export function detail(data: { id: string }) { + return request({ + url: '/business/outsourcer/detail', + method: 'post', + data, + }) +} // 审批删除 export function approvalDel(data: object) { @@ -31,8 +40,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function add(data: object) { return request({ url: '/business/outsourcer/save', method: 'post', @@ -40,6 +49,24 @@ }) } +// 编辑(草稿箱-已取消) +export function UpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/draftUpdate', + method: 'post', + data, + }) +} + +// 编辑(未通过-驳回) +export function failUpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/failUpdate', + method: 'post', + data, + }) +} + // 提交 export function submit(data: object) { return request({ diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index b13c622..297715c 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -22,7 +22,7 @@ } // 删除 -export function approvalDel(data: object) { +export function approvalDel(data: { id: string }) { return request({ url: '/business/outsourceProject/check/approval/operate/delete', method: 'post', @@ -31,7 +31,7 @@ } // 草稿箱删除 -export function checkdelete(data: object) { +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/check/delete', method: 'post', @@ -39,8 +39,8 @@ }) } -// 编辑 -export function draftUpdate(data: object) { +// 编辑(草稿箱和取消) +export function updateCheck(data: object) { return request({ url: '/business/outsourceProject/check/draftUpdate', method: 'post', @@ -49,25 +49,24 @@ } // 驳回后编辑 - -export function failUpdate(data: object) { +export function failUpdateCheck(data: object) { return request({ url: '/business/outsourceProject/check/failUpdate', method: 'post', data, }) } -// 保存 -export function save(data: object) { +// 新建 +export function addCheck(data: object) { return request({ url: '/business/outsourceProject/check/save', method: 'post', data, }) } -// 提交 +// 提交 export function submit(data: object) { return request({ url: '/business/outsourceProject/check/submit', diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts new file mode 100644 index 0000000..aba021c --- /dev/null +++ b/src/api/finance/businessSettlement/businessSettlement.ts @@ -0,0 +1,23 @@ +// 业务结算 +import request from '../../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/list', + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts index 2cafc4a..588b99b 100644 --- a/src/api/system/tool.ts +++ b/src/api/system/tool.ts @@ -132,6 +132,15 @@ method: 'get', }) } + +export function getPdfStream(fileName: string) { + return request({ + url: `/minio/file/download/stream?fileName=${fileName}`, + method: 'post', + responseType: 'blob', + }) +} + // 文件配置管理列表 export function getFileListPage(data: listParamsType) { return request({ diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 7f6e7ec..8bae72b 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -31,8 +31,8 @@ }) } -// 草稿箱删除 -export function applyDel(data: object) { +// 删除 +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/apply/delete', method: 'post', @@ -40,9 +40,8 @@ }) } -// 编辑 - -export function applyEdit(data: object) { +// 编辑(草稿箱、已取消的编辑) +export function updateApply(data: object) { return request({ url: '/business/outsourceProject/apply/draftUpdate', method: 'post', @@ -50,8 +49,8 @@ }) } -// 驳回后编辑 -export function failUpdate(data: object) { +// 未通过-驳回的编辑 +export function failUpdateApply(data: object) { return request({ url: '/business/outsourceProject/apply/failUpdate', method: 'post', @@ -59,8 +58,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function addApply(data: object) { return request({ url: '/business/outsourceProject/apply/save', method: 'post', @@ -69,7 +68,7 @@ } // 提交 -export function submit(data: object) { +export function submit(data: { formId: any; id: string; processId?: string }) { return request({ url: '/business/outsourceProject/apply/submit', method: 'post', diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 74d177b..a6c81df 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -13,14 +13,23 @@ }) } -// 审批详情 -// export function detail(data: object) { -// return request({ -// url: '/business/outsourcer/approval/operate/delete', -// method: 'post', -// data, -// }) -// } +// 删除 +export function deleteListItem(data: { id: string }) { + return request({ + url: '/business/outsourcer/delete', + method: 'post', + data, + }) +} + +// 详情 +export function detail(data: { id: string }) { + return request({ + url: '/business/outsourcer/detail', + method: 'post', + data, + }) +} // 审批删除 export function approvalDel(data: object) { @@ -31,8 +40,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function add(data: object) { return request({ url: '/business/outsourcer/save', method: 'post', @@ -40,6 +49,24 @@ }) } +// 编辑(草稿箱-已取消) +export function UpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/draftUpdate', + method: 'post', + data, + }) +} + +// 编辑(未通过-驳回) +export function failUpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/failUpdate', + method: 'post', + data, + }) +} + // 提交 export function submit(data: object) { return request({ diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index b13c622..297715c 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -22,7 +22,7 @@ } // 删除 -export function approvalDel(data: object) { +export function approvalDel(data: { id: string }) { return request({ url: '/business/outsourceProject/check/approval/operate/delete', method: 'post', @@ -31,7 +31,7 @@ } // 草稿箱删除 -export function checkdelete(data: object) { +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/check/delete', method: 'post', @@ -39,8 +39,8 @@ }) } -// 编辑 -export function draftUpdate(data: object) { +// 编辑(草稿箱和取消) +export function updateCheck(data: object) { return request({ url: '/business/outsourceProject/check/draftUpdate', method: 'post', @@ -49,25 +49,24 @@ } // 驳回后编辑 - -export function failUpdate(data: object) { +export function failUpdateCheck(data: object) { return request({ url: '/business/outsourceProject/check/failUpdate', method: 'post', data, }) } -// 保存 -export function save(data: object) { +// 新建 +export function addCheck(data: object) { return request({ url: '/business/outsourceProject/check/save', method: 'post', data, }) } -// 提交 +// 提交 export function submit(data: object) { return request({ url: '/business/outsourceProject/check/submit', diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts new file mode 100644 index 0000000..aba021c --- /dev/null +++ b/src/api/finance/businessSettlement/businessSettlement.ts @@ -0,0 +1,23 @@ +// 业务结算 +import request from '../../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/list', + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts index 2cafc4a..588b99b 100644 --- a/src/api/system/tool.ts +++ b/src/api/system/tool.ts @@ -132,6 +132,15 @@ method: 'get', }) } + +export function getPdfStream(fileName: string) { + return request({ + url: `/minio/file/download/stream?fileName=${fileName}`, + method: 'post', + responseType: 'blob', + }) +} + // 文件配置管理列表 export function getFileListPage(data: listParamsType) { return request({ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 0ebcd45..38f65ec 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -417,11 +417,11 @@ }, }, { - path: 'subpackage/apply/detail/:id?', + path: 'subpackage/apply/:type/:id?', name: 'subpackageApplyDetail', component: () => import('@/views/business/subpackage/apply/edit.vue'), meta: { - title: '分包项目申请', + title: '分包项目申请详情', icon: 'ep:key', sidebar: false, breadcrumb: true, @@ -439,11 +439,11 @@ }, }, { - path: 'subpackage/check/detail/:id?', + path: 'subpackage/check/:type/:id?', name: 'subpackageCheckDetail', component: () => import('@/views/business/subpackage/check/edit.vue'), meta: { - title: '分包项目验收', + title: '分包项目验收详情', icon: 'ep:key', sidebar: false, breadcrumb: true, @@ -483,11 +483,11 @@ }, }, { - path: 'subpackage/qualificationApprove/detail/:id?', + path: 'subpackage/qualificationApprove/:type/:id?', name: 'subpackageQualificationApproveDetail', component: () => import('@/views/business/subpackage/approve/edit.vue'), meta: { - title: '分包方资格审批', + title: '分包方资格审批详情', icon: 'ep:key', sidebar: false, breadcrumb: true, diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 7f6e7ec..8bae72b 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -31,8 +31,8 @@ }) } -// 草稿箱删除 -export function applyDel(data: object) { +// 删除 +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/apply/delete', method: 'post', @@ -40,9 +40,8 @@ }) } -// 编辑 - -export function applyEdit(data: object) { +// 编辑(草稿箱、已取消的编辑) +export function updateApply(data: object) { return request({ url: '/business/outsourceProject/apply/draftUpdate', method: 'post', @@ -50,8 +49,8 @@ }) } -// 驳回后编辑 -export function failUpdate(data: object) { +// 未通过-驳回的编辑 +export function failUpdateApply(data: object) { return request({ url: '/business/outsourceProject/apply/failUpdate', method: 'post', @@ -59,8 +58,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function addApply(data: object) { return request({ url: '/business/outsourceProject/apply/save', method: 'post', @@ -69,7 +68,7 @@ } // 提交 -export function submit(data: object) { +export function submit(data: { formId: any; id: string; processId?: string }) { return request({ url: '/business/outsourceProject/apply/submit', method: 'post', diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 74d177b..a6c81df 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -13,14 +13,23 @@ }) } -// 审批详情 -// export function detail(data: object) { -// return request({ -// url: '/business/outsourcer/approval/operate/delete', -// method: 'post', -// data, -// }) -// } +// 删除 +export function deleteListItem(data: { id: string }) { + return request({ + url: '/business/outsourcer/delete', + method: 'post', + data, + }) +} + +// 详情 +export function detail(data: { id: string }) { + return request({ + url: '/business/outsourcer/detail', + method: 'post', + data, + }) +} // 审批删除 export function approvalDel(data: object) { @@ -31,8 +40,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function add(data: object) { return request({ url: '/business/outsourcer/save', method: 'post', @@ -40,6 +49,24 @@ }) } +// 编辑(草稿箱-已取消) +export function UpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/draftUpdate', + method: 'post', + data, + }) +} + +// 编辑(未通过-驳回) +export function failUpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/failUpdate', + method: 'post', + data, + }) +} + // 提交 export function submit(data: object) { return request({ diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index b13c622..297715c 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -22,7 +22,7 @@ } // 删除 -export function approvalDel(data: object) { +export function approvalDel(data: { id: string }) { return request({ url: '/business/outsourceProject/check/approval/operate/delete', method: 'post', @@ -31,7 +31,7 @@ } // 草稿箱删除 -export function checkdelete(data: object) { +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/check/delete', method: 'post', @@ -39,8 +39,8 @@ }) } -// 编辑 -export function draftUpdate(data: object) { +// 编辑(草稿箱和取消) +export function updateCheck(data: object) { return request({ url: '/business/outsourceProject/check/draftUpdate', method: 'post', @@ -49,25 +49,24 @@ } // 驳回后编辑 - -export function failUpdate(data: object) { +export function failUpdateCheck(data: object) { return request({ url: '/business/outsourceProject/check/failUpdate', method: 'post', data, }) } -// 保存 -export function save(data: object) { +// 新建 +export function addCheck(data: object) { return request({ url: '/business/outsourceProject/check/save', method: 'post', data, }) } -// 提交 +// 提交 export function submit(data: object) { return request({ url: '/business/outsourceProject/check/submit', diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts new file mode 100644 index 0000000..aba021c --- /dev/null +++ b/src/api/finance/businessSettlement/businessSettlement.ts @@ -0,0 +1,23 @@ +// 业务结算 +import request from '../../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/list', + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts index 2cafc4a..588b99b 100644 --- a/src/api/system/tool.ts +++ b/src/api/system/tool.ts @@ -132,6 +132,15 @@ method: 'get', }) } + +export function getPdfStream(fileName: string) { + return request({ + url: `/minio/file/download/stream?fileName=${fileName}`, + method: 'post', + responseType: 'blob', + }) +} + // 文件配置管理列表 export function getFileListPage(data: listParamsType) { return request({ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 0ebcd45..38f65ec 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -417,11 +417,11 @@ }, }, { - path: 'subpackage/apply/detail/:id?', + path: 'subpackage/apply/:type/:id?', name: 'subpackageApplyDetail', component: () => import('@/views/business/subpackage/apply/edit.vue'), meta: { - title: '分包项目申请', + title: '分包项目申请详情', icon: 'ep:key', sidebar: false, breadcrumb: true, @@ -439,11 +439,11 @@ }, }, { - path: 'subpackage/check/detail/:id?', + path: 'subpackage/check/:type/:id?', name: 'subpackageCheckDetail', component: () => import('@/views/business/subpackage/check/edit.vue'), meta: { - title: '分包项目验收', + title: '分包项目验收详情', icon: 'ep:key', sidebar: false, breadcrumb: true, @@ -483,11 +483,11 @@ }, }, { - path: 'subpackage/qualificationApprove/detail/:id?', + path: 'subpackage/qualificationApprove/:type/:id?', name: 'subpackageQualificationApproveDetail', component: () => import('@/views/business/subpackage/approve/edit.vue'), meta: { - title: '分包方资格审批', + title: '分包方资格审批详情', icon: 'ep:key', sidebar: false, breadcrumb: true, diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue index daf18c6..69693b5 100644 --- a/src/views/business/schedule/certPrint/certList.vue +++ b/src/views/business/schedule/certPrint/certList.vue @@ -16,7 +16,7 @@ import type { dictType } from '@/global' import ButtonBox from '@/components/buttonBox/buttonBox.vue' import type { IMenu } from '@/components/buttonBox/buttonBox' -import { getPhotoUrl } from '@/api/system/tool' +import { getPdfStream, getPhotoUrl } from '@/api/system/tool' import { download } from '@/utils/download' const { proxy } = getCurrentInstance() as any const $router = useRouter() @@ -238,6 +238,13 @@ loading.close() } +const doPrint = (val: any) => { + var ordonnance = document.getElementById(val)!.contentWindow + setTimeout(() => { + ordonnance.print() + }, 100) +} + // 打印 const bindLabel = (row: ICerPrintList) => { // 判断状态第一次可以直接打印,之后的打印需要审批 @@ -251,14 +258,28 @@ type: 'warning', }, ).then(() => { - getPhotoUrl(row.printFileName as string).then((res) => { - const url = res.data - console.log(url) + // getPhotoUrl(row.printFileName as string).then((res) => { + // const url = res.data + // console.log(url) - pdfUrl.value = res.data - // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js' - proxy.$refs.pdf.print() - // download(url, row.printFileName as string) + // pdfUrl.value = res.data + // // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js' + // proxy.$refs.pdf.print() + // // download(url, row.printFileName as string) + // }) + getPdfStream(row.printFileName as string).then((res) => { + const blob = new Blob([res.data], { type: 'application/pdf' }) + var date = (new Date()).getTime() + var ifr = document.createElement('iframe') + ifr.style.frameborder = 'no' + ifr.style.display = 'none' + ifr.style.pageBreakBefore = 'always' + ifr.setAttribute('id', `printPdf${date}`) + ifr.setAttribute('name', `printPdf${date}`) + ifr.src = window.URL.createObjectURL(blob) + document.body.appendChild(ifr) + doPrint(`printPdf${date}`) + window.URL.revokeObjectURL(ifr.src) // 释放URL 对象 }) }) } diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 7f6e7ec..8bae72b 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -31,8 +31,8 @@ }) } -// 草稿箱删除 -export function applyDel(data: object) { +// 删除 +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/apply/delete', method: 'post', @@ -40,9 +40,8 @@ }) } -// 编辑 - -export function applyEdit(data: object) { +// 编辑(草稿箱、已取消的编辑) +export function updateApply(data: object) { return request({ url: '/business/outsourceProject/apply/draftUpdate', method: 'post', @@ -50,8 +49,8 @@ }) } -// 驳回后编辑 -export function failUpdate(data: object) { +// 未通过-驳回的编辑 +export function failUpdateApply(data: object) { return request({ url: '/business/outsourceProject/apply/failUpdate', method: 'post', @@ -59,8 +58,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function addApply(data: object) { return request({ url: '/business/outsourceProject/apply/save', method: 'post', @@ -69,7 +68,7 @@ } // 提交 -export function submit(data: object) { +export function submit(data: { formId: any; id: string; processId?: string }) { return request({ url: '/business/outsourceProject/apply/submit', method: 'post', diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 74d177b..a6c81df 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -13,14 +13,23 @@ }) } -// 审批详情 -// export function detail(data: object) { -// return request({ -// url: '/business/outsourcer/approval/operate/delete', -// method: 'post', -// data, -// }) -// } +// 删除 +export function deleteListItem(data: { id: string }) { + return request({ + url: '/business/outsourcer/delete', + method: 'post', + data, + }) +} + +// 详情 +export function detail(data: { id: string }) { + return request({ + url: '/business/outsourcer/detail', + method: 'post', + data, + }) +} // 审批删除 export function approvalDel(data: object) { @@ -31,8 +40,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function add(data: object) { return request({ url: '/business/outsourcer/save', method: 'post', @@ -40,6 +49,24 @@ }) } +// 编辑(草稿箱-已取消) +export function UpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/draftUpdate', + method: 'post', + data, + }) +} + +// 编辑(未通过-驳回) +export function failUpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/failUpdate', + method: 'post', + data, + }) +} + // 提交 export function submit(data: object) { return request({ diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index b13c622..297715c 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -22,7 +22,7 @@ } // 删除 -export function approvalDel(data: object) { +export function approvalDel(data: { id: string }) { return request({ url: '/business/outsourceProject/check/approval/operate/delete', method: 'post', @@ -31,7 +31,7 @@ } // 草稿箱删除 -export function checkdelete(data: object) { +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/check/delete', method: 'post', @@ -39,8 +39,8 @@ }) } -// 编辑 -export function draftUpdate(data: object) { +// 编辑(草稿箱和取消) +export function updateCheck(data: object) { return request({ url: '/business/outsourceProject/check/draftUpdate', method: 'post', @@ -49,25 +49,24 @@ } // 驳回后编辑 - -export function failUpdate(data: object) { +export function failUpdateCheck(data: object) { return request({ url: '/business/outsourceProject/check/failUpdate', method: 'post', data, }) } -// 保存 -export function save(data: object) { +// 新建 +export function addCheck(data: object) { return request({ url: '/business/outsourceProject/check/save', method: 'post', data, }) } -// 提交 +// 提交 export function submit(data: object) { return request({ url: '/business/outsourceProject/check/submit', diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts new file mode 100644 index 0000000..aba021c --- /dev/null +++ b/src/api/finance/businessSettlement/businessSettlement.ts @@ -0,0 +1,23 @@ +// 业务结算 +import request from '../../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/list', + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts index 2cafc4a..588b99b 100644 --- a/src/api/system/tool.ts +++ b/src/api/system/tool.ts @@ -132,6 +132,15 @@ method: 'get', }) } + +export function getPdfStream(fileName: string) { + return request({ + url: `/minio/file/download/stream?fileName=${fileName}`, + method: 'post', + responseType: 'blob', + }) +} + // 文件配置管理列表 export function getFileListPage(data: listParamsType) { return request({ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 0ebcd45..38f65ec 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -417,11 +417,11 @@ }, }, { - path: 'subpackage/apply/detail/:id?', + path: 'subpackage/apply/:type/:id?', name: 'subpackageApplyDetail', component: () => import('@/views/business/subpackage/apply/edit.vue'), meta: { - title: '分包项目申请', + title: '分包项目申请详情', icon: 'ep:key', sidebar: false, breadcrumb: true, @@ -439,11 +439,11 @@ }, }, { - path: 'subpackage/check/detail/:id?', + path: 'subpackage/check/:type/:id?', name: 'subpackageCheckDetail', component: () => import('@/views/business/subpackage/check/edit.vue'), meta: { - title: '分包项目验收', + title: '分包项目验收详情', icon: 'ep:key', sidebar: false, breadcrumb: true, @@ -483,11 +483,11 @@ }, }, { - path: 'subpackage/qualificationApprove/detail/:id?', + path: 'subpackage/qualificationApprove/:type/:id?', name: 'subpackageQualificationApproveDetail', component: () => import('@/views/business/subpackage/approve/edit.vue'), meta: { - title: '分包方资格审批', + title: '分包方资格审批详情', icon: 'ep:key', sidebar: false, breadcrumb: true, diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue index daf18c6..69693b5 100644 --- a/src/views/business/schedule/certPrint/certList.vue +++ b/src/views/business/schedule/certPrint/certList.vue @@ -16,7 +16,7 @@ import type { dictType } from '@/global' import ButtonBox from '@/components/buttonBox/buttonBox.vue' import type { IMenu } from '@/components/buttonBox/buttonBox' -import { getPhotoUrl } from '@/api/system/tool' +import { getPdfStream, getPhotoUrl } from '@/api/system/tool' import { download } from '@/utils/download' const { proxy } = getCurrentInstance() as any const $router = useRouter() @@ -238,6 +238,13 @@ loading.close() } +const doPrint = (val: any) => { + var ordonnance = document.getElementById(val)!.contentWindow + setTimeout(() => { + ordonnance.print() + }, 100) +} + // 打印 const bindLabel = (row: ICerPrintList) => { // 判断状态第一次可以直接打印,之后的打印需要审批 @@ -251,14 +258,28 @@ type: 'warning', }, ).then(() => { - getPhotoUrl(row.printFileName as string).then((res) => { - const url = res.data - console.log(url) + // getPhotoUrl(row.printFileName as string).then((res) => { + // const url = res.data + // console.log(url) - pdfUrl.value = res.data - // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js' - proxy.$refs.pdf.print() - // download(url, row.printFileName as string) + // pdfUrl.value = res.data + // // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js' + // proxy.$refs.pdf.print() + // // download(url, row.printFileName as string) + // }) + getPdfStream(row.printFileName as string).then((res) => { + const blob = new Blob([res.data], { type: 'application/pdf' }) + var date = (new Date()).getTime() + var ifr = document.createElement('iframe') + ifr.style.frameborder = 'no' + ifr.style.display = 'none' + ifr.style.pageBreakBefore = 'always' + ifr.setAttribute('id', `printPdf${date}`) + ifr.setAttribute('name', `printPdf${date}`) + ifr.src = window.URL.createObjectURL(blob) + document.body.appendChild(ifr) + doPrint(`printPdf${date}`) + window.URL.revokeObjectURL(ifr.src) // 释放URL 对象 }) }) } diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue index 5c07d92..4cf31f7 100644 --- a/src/views/business/schedule/order/selectSample.vue +++ b/src/views/business/schedule/order/selectSample.vue @@ -5,7 +5,7 @@ import { ElMessage } from 'element-plus' import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface' import type { TableColumn } from '@/components/NormalTable/table_interface' -import { getOrderSampleList } from '@/api/business/schedule/order' +import { listPageBySubpackage } from '@/api/business/subpackage/apply' const props = defineProps({ visible: { @@ -29,16 +29,13 @@ // 查询条件 const listQuery = ref({ - sampleNo: '', // 样品编号 + customerName: '', // 委托方名称 + customerNo: '', // 委托方代码 + orderCode: '', // 委托书编号 sampleName: '', // 样品名称 - // sampleModel: '', // 型号 - orderId: props.orderId || '', // 委托书id - customerId: props.customerId || '', // 委托方id - customerNo: props.customerNo || '', // 委托方代码 - // customerName: '', // 委托方名称 - // startTime: '', // 检定开始时间 - // endTime: '', // 检定结束时间 - // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期 + sampleNo: '', // 样品编号 + startTime: '', // 开始时间 + endTime: '', // 结束时间 offset: 1, limit: 20, }) @@ -72,7 +69,7 @@ listQuery.value.offset = 1 } listQuery.value.customerNo = props.customerNo - getOrderSampleList(listQuery.value).then((response) => { + listPageBySubpackage(listQuery.value).then((response) => { list.value = response.data.rows total.value = parseInt(response.data.total) loadingTable.value = false @@ -95,16 +92,13 @@ // 点击重置 const clearList = () => { listQuery.value = { - sampleNo: '', // 样品编号 + customerName: '', // 委托方名称 + customerNo: '', // 委托方代码 + orderCode: '', // 委托书编号 sampleName: '', // 样品名称 - // sampleModel: '', // 型号 - orderId: props.orderId || '', // 委托书id - customerId: props.customerId || '', // 委托方id - customerNo: props.customerNo || '', // 委托方代码 - // customerName: '', // 委托方名称 - // startTime: '', // 检定开始时间 - // endTime: '', // 检定结束时间 - // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期 + sampleNo: '', // 样品编号 + startTime: '', // 开始时间 + endTime: '', // 结束时间 offset: 1, limit: 20, } @@ -148,10 +142,9 @@ - diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 7f6e7ec..8bae72b 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -31,8 +31,8 @@ }) } -// 草稿箱删除 -export function applyDel(data: object) { +// 删除 +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/apply/delete', method: 'post', @@ -40,9 +40,8 @@ }) } -// 编辑 - -export function applyEdit(data: object) { +// 编辑(草稿箱、已取消的编辑) +export function updateApply(data: object) { return request({ url: '/business/outsourceProject/apply/draftUpdate', method: 'post', @@ -50,8 +49,8 @@ }) } -// 驳回后编辑 -export function failUpdate(data: object) { +// 未通过-驳回的编辑 +export function failUpdateApply(data: object) { return request({ url: '/business/outsourceProject/apply/failUpdate', method: 'post', @@ -59,8 +58,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function addApply(data: object) { return request({ url: '/business/outsourceProject/apply/save', method: 'post', @@ -69,7 +68,7 @@ } // 提交 -export function submit(data: object) { +export function submit(data: { formId: any; id: string; processId?: string }) { return request({ url: '/business/outsourceProject/apply/submit', method: 'post', diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 74d177b..a6c81df 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -13,14 +13,23 @@ }) } -// 审批详情 -// export function detail(data: object) { -// return request({ -// url: '/business/outsourcer/approval/operate/delete', -// method: 'post', -// data, -// }) -// } +// 删除 +export function deleteListItem(data: { id: string }) { + return request({ + url: '/business/outsourcer/delete', + method: 'post', + data, + }) +} + +// 详情 +export function detail(data: { id: string }) { + return request({ + url: '/business/outsourcer/detail', + method: 'post', + data, + }) +} // 审批删除 export function approvalDel(data: object) { @@ -31,8 +40,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function add(data: object) { return request({ url: '/business/outsourcer/save', method: 'post', @@ -40,6 +49,24 @@ }) } +// 编辑(草稿箱-已取消) +export function UpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/draftUpdate', + method: 'post', + data, + }) +} + +// 编辑(未通过-驳回) +export function failUpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/failUpdate', + method: 'post', + data, + }) +} + // 提交 export function submit(data: object) { return request({ diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index b13c622..297715c 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -22,7 +22,7 @@ } // 删除 -export function approvalDel(data: object) { +export function approvalDel(data: { id: string }) { return request({ url: '/business/outsourceProject/check/approval/operate/delete', method: 'post', @@ -31,7 +31,7 @@ } // 草稿箱删除 -export function checkdelete(data: object) { +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/check/delete', method: 'post', @@ -39,8 +39,8 @@ }) } -// 编辑 -export function draftUpdate(data: object) { +// 编辑(草稿箱和取消) +export function updateCheck(data: object) { return request({ url: '/business/outsourceProject/check/draftUpdate', method: 'post', @@ -49,25 +49,24 @@ } // 驳回后编辑 - -export function failUpdate(data: object) { +export function failUpdateCheck(data: object) { return request({ url: '/business/outsourceProject/check/failUpdate', method: 'post', data, }) } -// 保存 -export function save(data: object) { +// 新建 +export function addCheck(data: object) { return request({ url: '/business/outsourceProject/check/save', method: 'post', data, }) } -// 提交 +// 提交 export function submit(data: object) { return request({ url: '/business/outsourceProject/check/submit', diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts new file mode 100644 index 0000000..aba021c --- /dev/null +++ b/src/api/finance/businessSettlement/businessSettlement.ts @@ -0,0 +1,23 @@ +// 业务结算 +import request from '../../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/list', + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts index 2cafc4a..588b99b 100644 --- a/src/api/system/tool.ts +++ b/src/api/system/tool.ts @@ -132,6 +132,15 @@ method: 'get', }) } + +export function getPdfStream(fileName: string) { + return request({ + url: `/minio/file/download/stream?fileName=${fileName}`, + method: 'post', + responseType: 'blob', + }) +} + // 文件配置管理列表 export function getFileListPage(data: listParamsType) { return request({ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 0ebcd45..38f65ec 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -417,11 +417,11 @@ }, }, { - path: 'subpackage/apply/detail/:id?', + path: 'subpackage/apply/:type/:id?', name: 'subpackageApplyDetail', component: () => import('@/views/business/subpackage/apply/edit.vue'), meta: { - title: '分包项目申请', + title: '分包项目申请详情', icon: 'ep:key', sidebar: false, breadcrumb: true, @@ -439,11 +439,11 @@ }, }, { - path: 'subpackage/check/detail/:id?', + path: 'subpackage/check/:type/:id?', name: 'subpackageCheckDetail', component: () => import('@/views/business/subpackage/check/edit.vue'), meta: { - title: '分包项目验收', + title: '分包项目验收详情', icon: 'ep:key', sidebar: false, breadcrumb: true, @@ -483,11 +483,11 @@ }, }, { - path: 'subpackage/qualificationApprove/detail/:id?', + path: 'subpackage/qualificationApprove/:type/:id?', name: 'subpackageQualificationApproveDetail', component: () => import('@/views/business/subpackage/approve/edit.vue'), meta: { - title: '分包方资格审批', + title: '分包方资格审批详情', icon: 'ep:key', sidebar: false, breadcrumb: true, diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue index daf18c6..69693b5 100644 --- a/src/views/business/schedule/certPrint/certList.vue +++ b/src/views/business/schedule/certPrint/certList.vue @@ -16,7 +16,7 @@ import type { dictType } from '@/global' import ButtonBox from '@/components/buttonBox/buttonBox.vue' import type { IMenu } from '@/components/buttonBox/buttonBox' -import { getPhotoUrl } from '@/api/system/tool' +import { getPdfStream, getPhotoUrl } from '@/api/system/tool' import { download } from '@/utils/download' const { proxy } = getCurrentInstance() as any const $router = useRouter() @@ -238,6 +238,13 @@ loading.close() } +const doPrint = (val: any) => { + var ordonnance = document.getElementById(val)!.contentWindow + setTimeout(() => { + ordonnance.print() + }, 100) +} + // 打印 const bindLabel = (row: ICerPrintList) => { // 判断状态第一次可以直接打印,之后的打印需要审批 @@ -251,14 +258,28 @@ type: 'warning', }, ).then(() => { - getPhotoUrl(row.printFileName as string).then((res) => { - const url = res.data - console.log(url) + // getPhotoUrl(row.printFileName as string).then((res) => { + // const url = res.data + // console.log(url) - pdfUrl.value = res.data - // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js' - proxy.$refs.pdf.print() - // download(url, row.printFileName as string) + // pdfUrl.value = res.data + // // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js' + // proxy.$refs.pdf.print() + // // download(url, row.printFileName as string) + // }) + getPdfStream(row.printFileName as string).then((res) => { + const blob = new Blob([res.data], { type: 'application/pdf' }) + var date = (new Date()).getTime() + var ifr = document.createElement('iframe') + ifr.style.frameborder = 'no' + ifr.style.display = 'none' + ifr.style.pageBreakBefore = 'always' + ifr.setAttribute('id', `printPdf${date}`) + ifr.setAttribute('name', `printPdf${date}`) + ifr.src = window.URL.createObjectURL(blob) + document.body.appendChild(ifr) + doPrint(`printPdf${date}`) + window.URL.revokeObjectURL(ifr.src) // 释放URL 对象 }) }) } diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue index 5c07d92..4cf31f7 100644 --- a/src/views/business/schedule/order/selectSample.vue +++ b/src/views/business/schedule/order/selectSample.vue @@ -5,7 +5,7 @@ import { ElMessage } from 'element-plus' import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface' import type { TableColumn } from '@/components/NormalTable/table_interface' -import { getOrderSampleList } from '@/api/business/schedule/order' +import { listPageBySubpackage } from '@/api/business/subpackage/apply' const props = defineProps({ visible: { @@ -29,16 +29,13 @@ // 查询条件 const listQuery = ref({ - sampleNo: '', // 样品编号 + customerName: '', // 委托方名称 + customerNo: '', // 委托方代码 + orderCode: '', // 委托书编号 sampleName: '', // 样品名称 - // sampleModel: '', // 型号 - orderId: props.orderId || '', // 委托书id - customerId: props.customerId || '', // 委托方id - customerNo: props.customerNo || '', // 委托方代码 - // customerName: '', // 委托方名称 - // startTime: '', // 检定开始时间 - // endTime: '', // 检定结束时间 - // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期 + sampleNo: '', // 样品编号 + startTime: '', // 开始时间 + endTime: '', // 结束时间 offset: 1, limit: 20, }) @@ -72,7 +69,7 @@ listQuery.value.offset = 1 } listQuery.value.customerNo = props.customerNo - getOrderSampleList(listQuery.value).then((response) => { + listPageBySubpackage(listQuery.value).then((response) => { list.value = response.data.rows total.value = parseInt(response.data.total) loadingTable.value = false @@ -95,16 +92,13 @@ // 点击重置 const clearList = () => { listQuery.value = { - sampleNo: '', // 样品编号 + customerName: '', // 委托方名称 + customerNo: '', // 委托方代码 + orderCode: '', // 委托书编号 sampleName: '', // 样品名称 - // sampleModel: '', // 型号 - orderId: props.orderId || '', // 委托书id - customerId: props.customerId || '', // 委托方id - customerNo: props.customerNo || '', // 委托方代码 - // customerName: '', // 委托方名称 - // startTime: '', // 检定开始时间 - // endTime: '', // 检定结束时间 - // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期 + sampleNo: '', // 样品编号 + startTime: '', // 开始时间 + endTime: '', // 结束时间 offset: 1, limit: 20, } @@ -148,10 +142,9 @@ - diff --git a/src/views/business/subpackage/apply/apply-interface.ts b/src/views/business/subpackage/apply/apply-interface.ts new file mode 100644 index 0000000..f0414d3 --- /dev/null +++ b/src/views/business/subpackage/apply/apply-interface.ts @@ -0,0 +1,22 @@ +// 分包项目申请列表 +export interface IList { + id: string // 主键 + projectNo: string // 分包项目编号 + projectName: string // 分包项目名称 + applicantName: string // 申请人 + outsourcerName: string // 分包方名称 + outsourceReasonName: string // 分包原因 + createTime: string // 申请时间 + applyApprovalStatusName: string // 审批状态 + processId: string // 流程实例id + applyProcessId: string // 后端返回的流程实例id + taskId: string // 任务 +} + +// 字典 +export interface dictType { + id: string + name: string + value: string | number + label?: string // 基本信息添加的信息名称 +} diff --git a/src/api/business/subpackage/apply.ts b/src/api/business/subpackage/apply.ts index 7f6e7ec..8bae72b 100644 --- a/src/api/business/subpackage/apply.ts +++ b/src/api/business/subpackage/apply.ts @@ -31,8 +31,8 @@ }) } -// 草稿箱删除 -export function applyDel(data: object) { +// 删除 +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/apply/delete', method: 'post', @@ -40,9 +40,8 @@ }) } -// 编辑 - -export function applyEdit(data: object) { +// 编辑(草稿箱、已取消的编辑) +export function updateApply(data: object) { return request({ url: '/business/outsourceProject/apply/draftUpdate', method: 'post', @@ -50,8 +49,8 @@ }) } -// 驳回后编辑 -export function failUpdate(data: object) { +// 未通过-驳回的编辑 +export function failUpdateApply(data: object) { return request({ url: '/business/outsourceProject/apply/failUpdate', method: 'post', @@ -59,8 +58,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function addApply(data: object) { return request({ url: '/business/outsourceProject/apply/save', method: 'post', @@ -69,7 +68,7 @@ } // 提交 -export function submit(data: object) { +export function submit(data: { formId: any; id: string; processId?: string }) { return request({ url: '/business/outsourceProject/apply/submit', method: 'post', diff --git a/src/api/business/subpackage/approval.ts b/src/api/business/subpackage/approval.ts index 74d177b..a6c81df 100644 --- a/src/api/business/subpackage/approval.ts +++ b/src/api/business/subpackage/approval.ts @@ -13,14 +13,23 @@ }) } -// 审批详情 -// export function detail(data: object) { -// return request({ -// url: '/business/outsourcer/approval/operate/delete', -// method: 'post', -// data, -// }) -// } +// 删除 +export function deleteListItem(data: { id: string }) { + return request({ + url: '/business/outsourcer/delete', + method: 'post', + data, + }) +} + +// 详情 +export function detail(data: { id: string }) { + return request({ + url: '/business/outsourcer/detail', + method: 'post', + data, + }) +} // 审批删除 export function approvalDel(data: object) { @@ -31,8 +40,8 @@ }) } -// 保存 -export function save(data: object) { +// 新建 +export function add(data: object) { return request({ url: '/business/outsourcer/save', method: 'post', @@ -40,6 +49,24 @@ }) } +// 编辑(草稿箱-已取消) +export function UpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/draftUpdate', + method: 'post', + data, + }) +} + +// 编辑(未通过-驳回) +export function failUpdateApprove(data: object) { + return request({ + url: '/business/outsourcer/failUpdate', + method: 'post', + data, + }) +} + // 提交 export function submit(data: object) { return request({ diff --git a/src/api/business/subpackage/check.ts b/src/api/business/subpackage/check.ts index b13c622..297715c 100644 --- a/src/api/business/subpackage/check.ts +++ b/src/api/business/subpackage/check.ts @@ -22,7 +22,7 @@ } // 删除 -export function approvalDel(data: object) { +export function approvalDel(data: { id: string }) { return request({ url: '/business/outsourceProject/check/approval/operate/delete', method: 'post', @@ -31,7 +31,7 @@ } // 草稿箱删除 -export function checkdelete(data: object) { +export function deleteListItem(data: { id: string }) { return request({ url: '/business/outsourceProject/check/delete', method: 'post', @@ -39,8 +39,8 @@ }) } -// 编辑 -export function draftUpdate(data: object) { +// 编辑(草稿箱和取消) +export function updateCheck(data: object) { return request({ url: '/business/outsourceProject/check/draftUpdate', method: 'post', @@ -49,25 +49,24 @@ } // 驳回后编辑 - -export function failUpdate(data: object) { +export function failUpdateCheck(data: object) { return request({ url: '/business/outsourceProject/check/failUpdate', method: 'post', data, }) } -// 保存 -export function save(data: object) { +// 新建 +export function addCheck(data: object) { return request({ url: '/business/outsourceProject/check/save', method: 'post', data, }) } -// 提交 +// 提交 export function submit(data: object) { return request({ url: '/business/outsourceProject/check/submit', diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts new file mode 100644 index 0000000..aba021c --- /dev/null +++ b/src/api/finance/businessSettlement/businessSettlement.ts @@ -0,0 +1,23 @@ +// 业务结算 +import request from '../../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/list', + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + diff --git a/src/api/system/tool.ts b/src/api/system/tool.ts index 2cafc4a..588b99b 100644 --- a/src/api/system/tool.ts +++ b/src/api/system/tool.ts @@ -132,6 +132,15 @@ method: 'get', }) } + +export function getPdfStream(fileName: string) { + return request({ + url: `/minio/file/download/stream?fileName=${fileName}`, + method: 'post', + responseType: 'blob', + }) +} + // 文件配置管理列表 export function getFileListPage(data: listParamsType) { return request({ diff --git a/src/router/modules/business.ts b/src/router/modules/business.ts index 0ebcd45..38f65ec 100644 --- a/src/router/modules/business.ts +++ b/src/router/modules/business.ts @@ -417,11 +417,11 @@ }, }, { - path: 'subpackage/apply/detail/:id?', + path: 'subpackage/apply/:type/:id?', name: 'subpackageApplyDetail', component: () => import('@/views/business/subpackage/apply/edit.vue'), meta: { - title: '分包项目申请', + title: '分包项目申请详情', icon: 'ep:key', sidebar: false, breadcrumb: true, @@ -439,11 +439,11 @@ }, }, { - path: 'subpackage/check/detail/:id?', + path: 'subpackage/check/:type/:id?', name: 'subpackageCheckDetail', component: () => import('@/views/business/subpackage/check/edit.vue'), meta: { - title: '分包项目验收', + title: '分包项目验收详情', icon: 'ep:key', sidebar: false, breadcrumb: true, @@ -483,11 +483,11 @@ }, }, { - path: 'subpackage/qualificationApprove/detail/:id?', + path: 'subpackage/qualificationApprove/:type/:id?', name: 'subpackageQualificationApproveDetail', component: () => import('@/views/business/subpackage/approve/edit.vue'), meta: { - title: '分包方资格审批', + title: '分包方资格审批详情', icon: 'ep:key', sidebar: false, breadcrumb: true, diff --git a/src/views/business/schedule/certPrint/certList.vue b/src/views/business/schedule/certPrint/certList.vue index daf18c6..69693b5 100644 --- a/src/views/business/schedule/certPrint/certList.vue +++ b/src/views/business/schedule/certPrint/certList.vue @@ -16,7 +16,7 @@ import type { dictType } from '@/global' import ButtonBox from '@/components/buttonBox/buttonBox.vue' import type { IMenu } from '@/components/buttonBox/buttonBox' -import { getPhotoUrl } from '@/api/system/tool' +import { getPdfStream, getPhotoUrl } from '@/api/system/tool' import { download } from '@/utils/download' const { proxy } = getCurrentInstance() as any const $router = useRouter() @@ -238,6 +238,13 @@ loading.close() } +const doPrint = (val: any) => { + var ordonnance = document.getElementById(val)!.contentWindow + setTimeout(() => { + ordonnance.print() + }, 100) +} + // 打印 const bindLabel = (row: ICerPrintList) => { // 判断状态第一次可以直接打印,之后的打印需要审批 @@ -251,14 +258,28 @@ type: 'warning', }, ).then(() => { - getPhotoUrl(row.printFileName as string).then((res) => { - const url = res.data - console.log(url) + // getPhotoUrl(row.printFileName as string).then((res) => { + // const url = res.data + // console.log(url) - pdfUrl.value = res.data - // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js' - proxy.$refs.pdf.print() - // download(url, row.printFileName as string) + // pdfUrl.value = res.data + // // pdfjsLib.GlobalWorkerOptions.workerSrc = '/pdf.worker.js' + // proxy.$refs.pdf.print() + // // download(url, row.printFileName as string) + // }) + getPdfStream(row.printFileName as string).then((res) => { + const blob = new Blob([res.data], { type: 'application/pdf' }) + var date = (new Date()).getTime() + var ifr = document.createElement('iframe') + ifr.style.frameborder = 'no' + ifr.style.display = 'none' + ifr.style.pageBreakBefore = 'always' + ifr.setAttribute('id', `printPdf${date}`) + ifr.setAttribute('name', `printPdf${date}`) + ifr.src = window.URL.createObjectURL(blob) + document.body.appendChild(ifr) + doPrint(`printPdf${date}`) + window.URL.revokeObjectURL(ifr.src) // 释放URL 对象 }) }) } diff --git a/src/views/business/schedule/order/selectSample.vue b/src/views/business/schedule/order/selectSample.vue index 5c07d92..4cf31f7 100644 --- a/src/views/business/schedule/order/selectSample.vue +++ b/src/views/business/schedule/order/selectSample.vue @@ -5,7 +5,7 @@ import { ElMessage } from 'element-plus' import type { ISampleList, ISampleListQuery } from '@/views/customer/sample/list/sample_list_interface' import type { TableColumn } from '@/components/NormalTable/table_interface' -import { getOrderSampleList } from '@/api/business/schedule/order' +import { listPageBySubpackage } from '@/api/business/subpackage/apply' const props = defineProps({ visible: { @@ -29,16 +29,13 @@ // 查询条件 const listQuery = ref({ - sampleNo: '', // 样品编号 + customerName: '', // 委托方名称 + customerNo: '', // 委托方代码 + orderCode: '', // 委托书编号 sampleName: '', // 样品名称 - // sampleModel: '', // 型号 - orderId: props.orderId || '', // 委托书id - customerId: props.customerId || '', // 委托方id - customerNo: props.customerNo || '', // 委托方代码 - // customerName: '', // 委托方名称 - // startTime: '', // 检定开始时间 - // endTime: '', // 检定结束时间 - // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期 + sampleNo: '', // 样品编号 + startTime: '', // 开始时间 + endTime: '', // 结束时间 offset: 1, limit: 20, }) @@ -72,7 +69,7 @@ listQuery.value.offset = 1 } listQuery.value.customerNo = props.customerNo - getOrderSampleList(listQuery.value).then((response) => { + listPageBySubpackage(listQuery.value).then((response) => { list.value = response.data.rows total.value = parseInt(response.data.total) loadingTable.value = false @@ -95,16 +92,13 @@ // 点击重置 const clearList = () => { listQuery.value = { - sampleNo: '', // 样品编号 + customerName: '', // 委托方名称 + customerNo: '', // 委托方代码 + orderCode: '', // 委托书编号 sampleName: '', // 样品名称 - // sampleModel: '', // 型号 - orderId: props.orderId || '', // 委托书id - customerId: props.customerId || '', // 委托方id - customerNo: props.customerNo || '', // 委托方代码 - // customerName: '', // 委托方名称 - // startTime: '', // 检定开始时间 - // endTime: '', // 检定结束时间 - // overtimeStatus: '', // 样品超期状态 1已超期、0未超期、空字符串 已超期+未超期 + sampleNo: '', // 样品编号 + startTime: '', // 开始时间 + endTime: '', // 结束时间 offset: 1, limit: 20, } @@ -148,10 +142,9 @@ - diff --git a/src/views/business/subpackage/apply/apply-interface.ts b/src/views/business/subpackage/apply/apply-interface.ts new file mode 100644 index 0000000..f0414d3 --- /dev/null +++ b/src/views/business/subpackage/apply/apply-interface.ts @@ -0,0 +1,22 @@ +// 分包项目申请列表 +export interface IList { + id: string // 主键 + projectNo: string // 分包项目编号 + projectName: string // 分包项目名称 + applicantName: string // 申请人 + outsourcerName: string // 分包方名称 + outsourceReasonName: string // 分包原因 + createTime: string // 申请时间 + applyApprovalStatusName: string // 审批状态 + processId: string // 流程实例id + applyProcessId: string // 后端返回的流程实例id + taskId: string // 任务 +} + +// 字典 +export interface dictType { + id: string + name: string + value: string | number + label?: string // 基本信息添加的信息名称 +} diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue index 523ae7b..d24220d 100644 --- a/src/views/business/subpackage/apply/components/selectProjectApprove.vue +++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue @@ -1,9 +1,9 @@ - - diff --git a/src/views/business/subpackage/apply/apply-interface.ts b/src/views/business/subpackage/apply/apply-interface.ts new file mode 100644 index 0000000..f0414d3 --- /dev/null +++ b/src/views/business/subpackage/apply/apply-interface.ts @@ -0,0 +1,22 @@ +// 分包项目申请列表 +export interface IList { + id: string // 主键 + projectNo: string // 分包项目编号 + projectName: string // 分包项目名称 + applicantName: string // 申请人 + outsourcerName: string // 分包方名称 + outsourceReasonName: string // 分包原因 + createTime: string // 申请时间 + applyApprovalStatusName: string // 审批状态 + processId: string // 流程实例id + applyProcessId: string // 后端返回的流程实例id + taskId: string // 任务 +} + +// 字典 +export interface dictType { + id: string + name: string + value: string | number + label?: string // 基本信息添加的信息名称 +} diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue index 523ae7b..d24220d 100644 --- a/src/views/business/subpackage/apply/components/selectProjectApprove.vue +++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue @@ -1,9 +1,9 @@ - - diff --git a/src/views/business/subpackage/apply/apply-interface.ts b/src/views/business/subpackage/apply/apply-interface.ts new file mode 100644 index 0000000..f0414d3 --- /dev/null +++ b/src/views/business/subpackage/apply/apply-interface.ts @@ -0,0 +1,22 @@ +// 分包项目申请列表 +export interface IList { + id: string // 主键 + projectNo: string // 分包项目编号 + projectName: string // 分包项目名称 + applicantName: string // 申请人 + outsourcerName: string // 分包方名称 + outsourceReasonName: string // 分包原因 + createTime: string // 申请时间 + applyApprovalStatusName: string // 审批状态 + processId: string // 流程实例id + applyProcessId: string // 后端返回的流程实例id + taskId: string // 任务 +} + +// 字典 +export interface dictType { + id: string + name: string + value: string | number + label?: string // 基本信息添加的信息名称 +} diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue index 523ae7b..d24220d 100644 --- a/src/views/business/subpackage/apply/components/selectProjectApprove.vue +++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue @@ -1,9 +1,9 @@ - - diff --git a/src/views/business/subpackage/apply/apply-interface.ts b/src/views/business/subpackage/apply/apply-interface.ts new file mode 100644 index 0000000..f0414d3 --- /dev/null +++ b/src/views/business/subpackage/apply/apply-interface.ts @@ -0,0 +1,22 @@ +// 分包项目申请列表 +export interface IList { + id: string // 主键 + projectNo: string // 分包项目编号 + projectName: string // 分包项目名称 + applicantName: string // 申请人 + outsourcerName: string // 分包方名称 + outsourceReasonName: string // 分包原因 + createTime: string // 申请时间 + applyApprovalStatusName: string // 审批状态 + processId: string // 流程实例id + applyProcessId: string // 后端返回的流程实例id + taskId: string // 任务 +} + +// 字典 +export interface dictType { + id: string + name: string + value: string | number + label?: string // 基本信息添加的信息名称 +} diff --git a/src/views/business/subpackage/apply/components/selectProjectApprove.vue b/src/views/business/subpackage/apply/components/selectProjectApprove.vue index 523ae7b..d24220d 100644 --- a/src/views/business/subpackage/apply/components/selectProjectApprove.vue +++ b/src/views/business/subpackage/apply/components/selectProjectApprove.vue @@ -1,9 +1,9 @@ -