diff --git a/src/api/finance/businessSettlement.ts b/src/api/finance/businessSettlement.ts new file mode 100644 index 0000000..5a18d24 --- /dev/null +++ b/src/api/finance/businessSettlement.ts @@ -0,0 +1,59 @@ +// 业务结算 +import request from '../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: `/finance/settlement/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 删除 +export function delBusinessSettlementList(data: any) { + return request({ + url: '/finance/settlement/delete', + method: 'post', + data, + }) +} + +// 新增 +export function addBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/add', + method: 'post', + data, + }) +} + +// 编辑 +export function updateBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/update', + method: 'post', + data, + }) +} + +// 详情 +export function getBusinessSettlementDetail(data: { id: string }) { + return request({ + url: '/finance/settlement/detail', + method: 'post', + data, + }) +} + diff --git a/src/api/finance/businessSettlement.ts b/src/api/finance/businessSettlement.ts new file mode 100644 index 0000000..5a18d24 --- /dev/null +++ b/src/api/finance/businessSettlement.ts @@ -0,0 +1,59 @@ +// 业务结算 +import request from '../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: `/finance/settlement/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 删除 +export function delBusinessSettlementList(data: any) { + return request({ + url: '/finance/settlement/delete', + method: 'post', + data, + }) +} + +// 新增 +export function addBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/add', + method: 'post', + data, + }) +} + +// 编辑 +export function updateBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/update', + method: 'post', + data, + }) +} + +// 详情 +export function getBusinessSettlementDetail(data: { id: string }) { + return request({ + url: '/finance/settlement/detail', + method: 'post', + data, + }) +} + diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts deleted file mode 100644 index b4c7efe..0000000 --- a/src/api/finance/businessSettlement/businessSettlement.ts +++ /dev/null @@ -1,59 +0,0 @@ -// 业务结算 -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, - }) -} - -// 删除 -export function delBusinessSettlementList(data: any) { - return request({ - url: '/finance/settlement/delete', - method: 'post', - data, - }) -} - -// 新增 -export function addBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/add', - method: 'post', - data, - }) -} - -// 编辑 -export function updateBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/update', - method: 'post', - data, - }) -} - -// 详情 -export function getBusinessSettlementDetail(data: { id: string }) { - return request({ - url: '/finance/settlement/detail', - method: 'post', - data, - }) -} - diff --git a/src/api/finance/businessSettlement.ts b/src/api/finance/businessSettlement.ts new file mode 100644 index 0000000..5a18d24 --- /dev/null +++ b/src/api/finance/businessSettlement.ts @@ -0,0 +1,59 @@ +// 业务结算 +import request from '../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: `/finance/settlement/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 删除 +export function delBusinessSettlementList(data: any) { + return request({ + url: '/finance/settlement/delete', + method: 'post', + data, + }) +} + +// 新增 +export function addBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/add', + method: 'post', + data, + }) +} + +// 编辑 +export function updateBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/update', + method: 'post', + data, + }) +} + +// 详情 +export function getBusinessSettlementDetail(data: { id: string }) { + return request({ + url: '/finance/settlement/detail', + method: 'post', + data, + }) +} + diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts deleted file mode 100644 index b4c7efe..0000000 --- a/src/api/finance/businessSettlement/businessSettlement.ts +++ /dev/null @@ -1,59 +0,0 @@ -// 业务结算 -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, - }) -} - -// 删除 -export function delBusinessSettlementList(data: any) { - return request({ - url: '/finance/settlement/delete', - method: 'post', - data, - }) -} - -// 新增 -export function addBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/add', - method: 'post', - data, - }) -} - -// 编辑 -export function updateBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/update', - method: 'post', - data, - }) -} - -// 详情 -export function getBusinessSettlementDetail(data: { id: string }) { - return request({ - url: '/finance/settlement/detail', - method: 'post', - data, - }) -} - diff --git a/src/api/finance/contract.ts b/src/api/finance/contract.ts new file mode 100644 index 0000000..793b23b --- /dev/null +++ b/src/api/finance/contract.ts @@ -0,0 +1,65 @@ +// 收入合同 +import request from '../index' +import type { IListQuery } from '@/views/finance/contract/contract-interface' + +// 收入合同审批列表-列表页 +export function getContractList(data: IListQuery) { + return request({ + url: `/finance/agreement/approval/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 新建 +export function addContractList(data: Object) { + return request({ + url: '/finance/agreement/save', + method: 'post', + data, + }) +} + +// 编辑-草稿箱、已取消 +export function updateContractList(data: Object) { + return request({ + url: '/finance/agreement/draftUpdate', + method: 'post', + data, + }) +} +// 未通过驳回编辑 +export function failUpdateContractList(data: Object) { + return request({ + url: '/finance/agreement/failUpdate', + method: 'post', + data, + }) +} + +// 提交 +export function submitContractList(data: { id: string; formId: string; processId: string }) { + return request({ + url: '/finance/agreement/submit', + method: 'post', + data, + }) +} + +// 删除 +export function delContractList(data: { id: string }) { + return request({ + url: '/finance/agreement/delete', + method: 'post', + data, + }) +} +// 详情 +export function getContractDetail(data: { id: string }) { + return request({ + url: '/finance/agreement/detail', + method: 'post', + data, + }) +} + diff --git a/src/api/finance/businessSettlement.ts b/src/api/finance/businessSettlement.ts new file mode 100644 index 0000000..5a18d24 --- /dev/null +++ b/src/api/finance/businessSettlement.ts @@ -0,0 +1,59 @@ +// 业务结算 +import request from '../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: `/finance/settlement/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 删除 +export function delBusinessSettlementList(data: any) { + return request({ + url: '/finance/settlement/delete', + method: 'post', + data, + }) +} + +// 新增 +export function addBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/add', + method: 'post', + data, + }) +} + +// 编辑 +export function updateBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/update', + method: 'post', + data, + }) +} + +// 详情 +export function getBusinessSettlementDetail(data: { id: string }) { + return request({ + url: '/finance/settlement/detail', + method: 'post', + data, + }) +} + diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts deleted file mode 100644 index b4c7efe..0000000 --- a/src/api/finance/businessSettlement/businessSettlement.ts +++ /dev/null @@ -1,59 +0,0 @@ -// 业务结算 -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, - }) -} - -// 删除 -export function delBusinessSettlementList(data: any) { - return request({ - url: '/finance/settlement/delete', - method: 'post', - data, - }) -} - -// 新增 -export function addBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/add', - method: 'post', - data, - }) -} - -// 编辑 -export function updateBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/update', - method: 'post', - data, - }) -} - -// 详情 -export function getBusinessSettlementDetail(data: { id: string }) { - return request({ - url: '/finance/settlement/detail', - method: 'post', - data, - }) -} - diff --git a/src/api/finance/contract.ts b/src/api/finance/contract.ts new file mode 100644 index 0000000..793b23b --- /dev/null +++ b/src/api/finance/contract.ts @@ -0,0 +1,65 @@ +// 收入合同 +import request from '../index' +import type { IListQuery } from '@/views/finance/contract/contract-interface' + +// 收入合同审批列表-列表页 +export function getContractList(data: IListQuery) { + return request({ + url: `/finance/agreement/approval/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 新建 +export function addContractList(data: Object) { + return request({ + url: '/finance/agreement/save', + method: 'post', + data, + }) +} + +// 编辑-草稿箱、已取消 +export function updateContractList(data: Object) { + return request({ + url: '/finance/agreement/draftUpdate', + method: 'post', + data, + }) +} +// 未通过驳回编辑 +export function failUpdateContractList(data: Object) { + return request({ + url: '/finance/agreement/failUpdate', + method: 'post', + data, + }) +} + +// 提交 +export function submitContractList(data: { id: string; formId: string; processId: string }) { + return request({ + url: '/finance/agreement/submit', + method: 'post', + data, + }) +} + +// 删除 +export function delContractList(data: { id: string }) { + return request({ + url: '/finance/agreement/delete', + method: 'post', + data, + }) +} +// 详情 +export function getContractDetail(data: { id: string }) { + return request({ + url: '/finance/agreement/detail', + method: 'post', + data, + }) +} + diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index b2da11d..bd7820a 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -25,6 +25,18 @@ auth: '/finance/contractManagement/income', }, }, + { + path: ':type/:id?', + name: 'contractManagementDetail', + component: () => import('@/views/finance/contract/edit.vue'), + meta: { + title: '收入合同管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/contractManagement/list', + }, + }, ], }, { diff --git a/src/api/finance/businessSettlement.ts b/src/api/finance/businessSettlement.ts new file mode 100644 index 0000000..5a18d24 --- /dev/null +++ b/src/api/finance/businessSettlement.ts @@ -0,0 +1,59 @@ +// 业务结算 +import request from '../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: `/finance/settlement/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 删除 +export function delBusinessSettlementList(data: any) { + return request({ + url: '/finance/settlement/delete', + method: 'post', + data, + }) +} + +// 新增 +export function addBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/add', + method: 'post', + data, + }) +} + +// 编辑 +export function updateBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/update', + method: 'post', + data, + }) +} + +// 详情 +export function getBusinessSettlementDetail(data: { id: string }) { + return request({ + url: '/finance/settlement/detail', + method: 'post', + data, + }) +} + diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts deleted file mode 100644 index b4c7efe..0000000 --- a/src/api/finance/businessSettlement/businessSettlement.ts +++ /dev/null @@ -1,59 +0,0 @@ -// 业务结算 -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, - }) -} - -// 删除 -export function delBusinessSettlementList(data: any) { - return request({ - url: '/finance/settlement/delete', - method: 'post', - data, - }) -} - -// 新增 -export function addBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/add', - method: 'post', - data, - }) -} - -// 编辑 -export function updateBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/update', - method: 'post', - data, - }) -} - -// 详情 -export function getBusinessSettlementDetail(data: { id: string }) { - return request({ - url: '/finance/settlement/detail', - method: 'post', - data, - }) -} - diff --git a/src/api/finance/contract.ts b/src/api/finance/contract.ts new file mode 100644 index 0000000..793b23b --- /dev/null +++ b/src/api/finance/contract.ts @@ -0,0 +1,65 @@ +// 收入合同 +import request from '../index' +import type { IListQuery } from '@/views/finance/contract/contract-interface' + +// 收入合同审批列表-列表页 +export function getContractList(data: IListQuery) { + return request({ + url: `/finance/agreement/approval/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 新建 +export function addContractList(data: Object) { + return request({ + url: '/finance/agreement/save', + method: 'post', + data, + }) +} + +// 编辑-草稿箱、已取消 +export function updateContractList(data: Object) { + return request({ + url: '/finance/agreement/draftUpdate', + method: 'post', + data, + }) +} +// 未通过驳回编辑 +export function failUpdateContractList(data: Object) { + return request({ + url: '/finance/agreement/failUpdate', + method: 'post', + data, + }) +} + +// 提交 +export function submitContractList(data: { id: string; formId: string; processId: string }) { + return request({ + url: '/finance/agreement/submit', + method: 'post', + data, + }) +} + +// 删除 +export function delContractList(data: { id: string }) { + return request({ + url: '/finance/agreement/delete', + method: 'post', + data, + }) +} +// 详情 +export function getContractDetail(data: { id: string }) { + return request({ + url: '/finance/agreement/detail', + method: 'post', + data, + }) +} + diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index b2da11d..bd7820a 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -25,6 +25,18 @@ auth: '/finance/contractManagement/income', }, }, + { + path: ':type/:id?', + name: 'contractManagementDetail', + component: () => import('@/views/finance/contract/edit.vue'), + meta: { + title: '收入合同管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/contractManagement/list', + }, + }, ], }, { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 4aa5ed1..ade7bae 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -27,4 +27,6 @@ BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批 BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理 BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批 + BUSINESS_FINANCE_CONTRACT_APPROVE = 'cwczht', // 合同审批 + } diff --git a/src/api/finance/businessSettlement.ts b/src/api/finance/businessSettlement.ts new file mode 100644 index 0000000..5a18d24 --- /dev/null +++ b/src/api/finance/businessSettlement.ts @@ -0,0 +1,59 @@ +// 业务结算 +import request from '../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: `/finance/settlement/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 删除 +export function delBusinessSettlementList(data: any) { + return request({ + url: '/finance/settlement/delete', + method: 'post', + data, + }) +} + +// 新增 +export function addBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/add', + method: 'post', + data, + }) +} + +// 编辑 +export function updateBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/update', + method: 'post', + data, + }) +} + +// 详情 +export function getBusinessSettlementDetail(data: { id: string }) { + return request({ + url: '/finance/settlement/detail', + method: 'post', + data, + }) +} + diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts deleted file mode 100644 index b4c7efe..0000000 --- a/src/api/finance/businessSettlement/businessSettlement.ts +++ /dev/null @@ -1,59 +0,0 @@ -// 业务结算 -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, - }) -} - -// 删除 -export function delBusinessSettlementList(data: any) { - return request({ - url: '/finance/settlement/delete', - method: 'post', - data, - }) -} - -// 新增 -export function addBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/add', - method: 'post', - data, - }) -} - -// 编辑 -export function updateBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/update', - method: 'post', - data, - }) -} - -// 详情 -export function getBusinessSettlementDetail(data: { id: string }) { - return request({ - url: '/finance/settlement/detail', - method: 'post', - data, - }) -} - diff --git a/src/api/finance/contract.ts b/src/api/finance/contract.ts new file mode 100644 index 0000000..793b23b --- /dev/null +++ b/src/api/finance/contract.ts @@ -0,0 +1,65 @@ +// 收入合同 +import request from '../index' +import type { IListQuery } from '@/views/finance/contract/contract-interface' + +// 收入合同审批列表-列表页 +export function getContractList(data: IListQuery) { + return request({ + url: `/finance/agreement/approval/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 新建 +export function addContractList(data: Object) { + return request({ + url: '/finance/agreement/save', + method: 'post', + data, + }) +} + +// 编辑-草稿箱、已取消 +export function updateContractList(data: Object) { + return request({ + url: '/finance/agreement/draftUpdate', + method: 'post', + data, + }) +} +// 未通过驳回编辑 +export function failUpdateContractList(data: Object) { + return request({ + url: '/finance/agreement/failUpdate', + method: 'post', + data, + }) +} + +// 提交 +export function submitContractList(data: { id: string; formId: string; processId: string }) { + return request({ + url: '/finance/agreement/submit', + method: 'post', + data, + }) +} + +// 删除 +export function delContractList(data: { id: string }) { + return request({ + url: '/finance/agreement/delete', + method: 'post', + data, + }) +} +// 详情 +export function getContractDetail(data: { id: string }) { + return request({ + url: '/finance/agreement/detail', + method: 'post', + data, + }) +} + diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index b2da11d..bd7820a 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -25,6 +25,18 @@ auth: '/finance/contractManagement/income', }, }, + { + path: ':type/:id?', + name: 'contractManagementDetail', + component: () => import('@/views/finance/contract/edit.vue'), + meta: { + title: '收入合同管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/contractManagement/list', + }, + }, ], }, { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 4aa5ed1..ade7bae 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -27,4 +27,6 @@ BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批 BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理 BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批 + BUSINESS_FINANCE_CONTRACT_APPROVE = 'cwczht', // 合同审批 + } diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue index 5501edf..3bb9312 100644 --- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue +++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue @@ -13,6 +13,10 @@ type: Boolean, default: false, }, + isMulti: { + type: Boolean, + default: false, + }, }) const emits = defineEmits(['changeVisible', 'confirmCheckout']) const isUrgentMap = ref([]) // 是否加急 @@ -220,7 +224,7 @@ :query="listQuery" :list-loading="loadingTable" is-showmulti-select - :is-multi="false" + :is-multi="props.isMulti" :page-sizes="[5]" @change="changePage" @multi-select="handleSelectionChange" diff --git a/src/api/finance/businessSettlement.ts b/src/api/finance/businessSettlement.ts new file mode 100644 index 0000000..5a18d24 --- /dev/null +++ b/src/api/finance/businessSettlement.ts @@ -0,0 +1,59 @@ +// 业务结算 +import request from '../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: `/finance/settlement/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 删除 +export function delBusinessSettlementList(data: any) { + return request({ + url: '/finance/settlement/delete', + method: 'post', + data, + }) +} + +// 新增 +export function addBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/add', + method: 'post', + data, + }) +} + +// 编辑 +export function updateBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/update', + method: 'post', + data, + }) +} + +// 详情 +export function getBusinessSettlementDetail(data: { id: string }) { + return request({ + url: '/finance/settlement/detail', + method: 'post', + data, + }) +} + diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts deleted file mode 100644 index b4c7efe..0000000 --- a/src/api/finance/businessSettlement/businessSettlement.ts +++ /dev/null @@ -1,59 +0,0 @@ -// 业务结算 -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, - }) -} - -// 删除 -export function delBusinessSettlementList(data: any) { - return request({ - url: '/finance/settlement/delete', - method: 'post', - data, - }) -} - -// 新增 -export function addBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/add', - method: 'post', - data, - }) -} - -// 编辑 -export function updateBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/update', - method: 'post', - data, - }) -} - -// 详情 -export function getBusinessSettlementDetail(data: { id: string }) { - return request({ - url: '/finance/settlement/detail', - method: 'post', - data, - }) -} - diff --git a/src/api/finance/contract.ts b/src/api/finance/contract.ts new file mode 100644 index 0000000..793b23b --- /dev/null +++ b/src/api/finance/contract.ts @@ -0,0 +1,65 @@ +// 收入合同 +import request from '../index' +import type { IListQuery } from '@/views/finance/contract/contract-interface' + +// 收入合同审批列表-列表页 +export function getContractList(data: IListQuery) { + return request({ + url: `/finance/agreement/approval/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 新建 +export function addContractList(data: Object) { + return request({ + url: '/finance/agreement/save', + method: 'post', + data, + }) +} + +// 编辑-草稿箱、已取消 +export function updateContractList(data: Object) { + return request({ + url: '/finance/agreement/draftUpdate', + method: 'post', + data, + }) +} +// 未通过驳回编辑 +export function failUpdateContractList(data: Object) { + return request({ + url: '/finance/agreement/failUpdate', + method: 'post', + data, + }) +} + +// 提交 +export function submitContractList(data: { id: string; formId: string; processId: string }) { + return request({ + url: '/finance/agreement/submit', + method: 'post', + data, + }) +} + +// 删除 +export function delContractList(data: { id: string }) { + return request({ + url: '/finance/agreement/delete', + method: 'post', + data, + }) +} +// 详情 +export function getContractDetail(data: { id: string }) { + return request({ + url: '/finance/agreement/detail', + method: 'post', + data, + }) +} + diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index b2da11d..bd7820a 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -25,6 +25,18 @@ auth: '/finance/contractManagement/income', }, }, + { + path: ':type/:id?', + name: 'contractManagementDetail', + component: () => import('@/views/finance/contract/edit.vue'), + meta: { + title: '收入合同管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/contractManagement/list', + }, + }, ], }, { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 4aa5ed1..ade7bae 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -27,4 +27,6 @@ BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批 BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理 BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批 + BUSINESS_FINANCE_CONTRACT_APPROVE = 'cwczht', // 合同审批 + } diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue index 5501edf..3bb9312 100644 --- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue +++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue @@ -13,6 +13,10 @@ type: Boolean, default: false, }, + isMulti: { + type: Boolean, + default: false, + }, }) const emits = defineEmits(['changeVisible', 'confirmCheckout']) const isUrgentMap = ref([]) // 是否加急 @@ -220,7 +224,7 @@ :query="listQuery" :list-loading="loadingTable" is-showmulti-select - :is-multi="false" + :is-multi="props.isMulti" :page-sizes="[5]" @change="changePage" @multi-select="handleSelectionChange" diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue index 9803d29..b89f35b 100644 --- a/src/views/finance/businessSettlement/edit.vue +++ b/src/views/finance/businessSettlement/edit.vue @@ -14,7 +14,7 @@ import { getOrderDetail } from '@/api/business/schedule/order' import { isNumber, validateMoney } from '@/utils/validate' import { calc } from '@/utils/useCalc' -import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement/businessSettlement' +import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement' const user = useUserStore() // 用户信息 const $route = useRoute() const pageType = ref('detail') // add/detail/edit diff --git a/src/api/finance/businessSettlement.ts b/src/api/finance/businessSettlement.ts new file mode 100644 index 0000000..5a18d24 --- /dev/null +++ b/src/api/finance/businessSettlement.ts @@ -0,0 +1,59 @@ +// 业务结算 +import request from '../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: `/finance/settlement/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 删除 +export function delBusinessSettlementList(data: any) { + return request({ + url: '/finance/settlement/delete', + method: 'post', + data, + }) +} + +// 新增 +export function addBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/add', + method: 'post', + data, + }) +} + +// 编辑 +export function updateBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/update', + method: 'post', + data, + }) +} + +// 详情 +export function getBusinessSettlementDetail(data: { id: string }) { + return request({ + url: '/finance/settlement/detail', + method: 'post', + data, + }) +} + diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts deleted file mode 100644 index b4c7efe..0000000 --- a/src/api/finance/businessSettlement/businessSettlement.ts +++ /dev/null @@ -1,59 +0,0 @@ -// 业务结算 -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, - }) -} - -// 删除 -export function delBusinessSettlementList(data: any) { - return request({ - url: '/finance/settlement/delete', - method: 'post', - data, - }) -} - -// 新增 -export function addBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/add', - method: 'post', - data, - }) -} - -// 编辑 -export function updateBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/update', - method: 'post', - data, - }) -} - -// 详情 -export function getBusinessSettlementDetail(data: { id: string }) { - return request({ - url: '/finance/settlement/detail', - method: 'post', - data, - }) -} - diff --git a/src/api/finance/contract.ts b/src/api/finance/contract.ts new file mode 100644 index 0000000..793b23b --- /dev/null +++ b/src/api/finance/contract.ts @@ -0,0 +1,65 @@ +// 收入合同 +import request from '../index' +import type { IListQuery } from '@/views/finance/contract/contract-interface' + +// 收入合同审批列表-列表页 +export function getContractList(data: IListQuery) { + return request({ + url: `/finance/agreement/approval/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 新建 +export function addContractList(data: Object) { + return request({ + url: '/finance/agreement/save', + method: 'post', + data, + }) +} + +// 编辑-草稿箱、已取消 +export function updateContractList(data: Object) { + return request({ + url: '/finance/agreement/draftUpdate', + method: 'post', + data, + }) +} +// 未通过驳回编辑 +export function failUpdateContractList(data: Object) { + return request({ + url: '/finance/agreement/failUpdate', + method: 'post', + data, + }) +} + +// 提交 +export function submitContractList(data: { id: string; formId: string; processId: string }) { + return request({ + url: '/finance/agreement/submit', + method: 'post', + data, + }) +} + +// 删除 +export function delContractList(data: { id: string }) { + return request({ + url: '/finance/agreement/delete', + method: 'post', + data, + }) +} +// 详情 +export function getContractDetail(data: { id: string }) { + return request({ + url: '/finance/agreement/detail', + method: 'post', + data, + }) +} + diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index b2da11d..bd7820a 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -25,6 +25,18 @@ auth: '/finance/contractManagement/income', }, }, + { + path: ':type/:id?', + name: 'contractManagementDetail', + component: () => import('@/views/finance/contract/edit.vue'), + meta: { + title: '收入合同管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/contractManagement/list', + }, + }, ], }, { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 4aa5ed1..ade7bae 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -27,4 +27,6 @@ BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批 BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理 BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批 + BUSINESS_FINANCE_CONTRACT_APPROVE = 'cwczht', // 合同审批 + } diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue index 5501edf..3bb9312 100644 --- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue +++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue @@ -13,6 +13,10 @@ type: Boolean, default: false, }, + isMulti: { + type: Boolean, + default: false, + }, }) const emits = defineEmits(['changeVisible', 'confirmCheckout']) const isUrgentMap = ref([]) // 是否加急 @@ -220,7 +224,7 @@ :query="listQuery" :list-loading="loadingTable" is-showmulti-select - :is-multi="false" + :is-multi="props.isMulti" :page-sizes="[5]" @change="changePage" @multi-select="handleSelectionChange" diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue index 9803d29..b89f35b 100644 --- a/src/views/finance/businessSettlement/edit.vue +++ b/src/views/finance/businessSettlement/edit.vue @@ -14,7 +14,7 @@ import { getOrderDetail } from '@/api/business/schedule/order' import { isNumber, validateMoney } from '@/utils/validate' import { calc } from '@/utils/useCalc' -import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement/businessSettlement' +import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement' const user = useUserStore() // 用户信息 const $route = useRoute() const pageType = ref('detail') // add/detail/edit diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue index 66cac60..d1e83b5 100644 --- a/src/views/finance/businessSettlement/list.vue +++ b/src/views/finance/businessSettlement/list.vue @@ -7,7 +7,7 @@ import { exportFile } from '@/utils/exportUtils' import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDictByCode } from '@/api/system/dict' -import { delBusinessSettlementList, exportBusinessSettlementList, getBusinessSettlementList } from '@/api/finance/businessSettlement/businessSettlement' +import { delBusinessSettlementList, exportBusinessSettlementList, getBusinessSettlementList } from '@/api/finance/businessSettlement' const $router = useRouter() const { proxy } = getCurrentInstance() as any const isUrgentMap = ref([]) // 是否加急 @@ -51,7 +51,7 @@ listQuery.value.offset = 1 } getBusinessSettlementList(listQuery.value).then((response) => { - list.value = response.data.map((item: IList) => { + list.value = response.data.rows.map((item: IList) => { return { ...item, isUrgentName: item.isUrgent === '1' ? '是' : '否', @@ -61,8 +61,6 @@ postedPrice: item.postedPrice ? (item.postedPrice / 100).toFixed(2) : `${item.postedPrice}`, } }) - console.log('-----', list.value) - total.value = parseInt(response.data.total) loadingTable.value = false }).catch(() => { diff --git a/src/api/finance/businessSettlement.ts b/src/api/finance/businessSettlement.ts new file mode 100644 index 0000000..5a18d24 --- /dev/null +++ b/src/api/finance/businessSettlement.ts @@ -0,0 +1,59 @@ +// 业务结算 +import request from '../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: `/finance/settlement/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 删除 +export function delBusinessSettlementList(data: any) { + return request({ + url: '/finance/settlement/delete', + method: 'post', + data, + }) +} + +// 新增 +export function addBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/add', + method: 'post', + data, + }) +} + +// 编辑 +export function updateBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/update', + method: 'post', + data, + }) +} + +// 详情 +export function getBusinessSettlementDetail(data: { id: string }) { + return request({ + url: '/finance/settlement/detail', + method: 'post', + data, + }) +} + diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts deleted file mode 100644 index b4c7efe..0000000 --- a/src/api/finance/businessSettlement/businessSettlement.ts +++ /dev/null @@ -1,59 +0,0 @@ -// 业务结算 -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, - }) -} - -// 删除 -export function delBusinessSettlementList(data: any) { - return request({ - url: '/finance/settlement/delete', - method: 'post', - data, - }) -} - -// 新增 -export function addBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/add', - method: 'post', - data, - }) -} - -// 编辑 -export function updateBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/update', - method: 'post', - data, - }) -} - -// 详情 -export function getBusinessSettlementDetail(data: { id: string }) { - return request({ - url: '/finance/settlement/detail', - method: 'post', - data, - }) -} - diff --git a/src/api/finance/contract.ts b/src/api/finance/contract.ts new file mode 100644 index 0000000..793b23b --- /dev/null +++ b/src/api/finance/contract.ts @@ -0,0 +1,65 @@ +// 收入合同 +import request from '../index' +import type { IListQuery } from '@/views/finance/contract/contract-interface' + +// 收入合同审批列表-列表页 +export function getContractList(data: IListQuery) { + return request({ + url: `/finance/agreement/approval/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 新建 +export function addContractList(data: Object) { + return request({ + url: '/finance/agreement/save', + method: 'post', + data, + }) +} + +// 编辑-草稿箱、已取消 +export function updateContractList(data: Object) { + return request({ + url: '/finance/agreement/draftUpdate', + method: 'post', + data, + }) +} +// 未通过驳回编辑 +export function failUpdateContractList(data: Object) { + return request({ + url: '/finance/agreement/failUpdate', + method: 'post', + data, + }) +} + +// 提交 +export function submitContractList(data: { id: string; formId: string; processId: string }) { + return request({ + url: '/finance/agreement/submit', + method: 'post', + data, + }) +} + +// 删除 +export function delContractList(data: { id: string }) { + return request({ + url: '/finance/agreement/delete', + method: 'post', + data, + }) +} +// 详情 +export function getContractDetail(data: { id: string }) { + return request({ + url: '/finance/agreement/detail', + method: 'post', + data, + }) +} + diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index b2da11d..bd7820a 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -25,6 +25,18 @@ auth: '/finance/contractManagement/income', }, }, + { + path: ':type/:id?', + name: 'contractManagementDetail', + component: () => import('@/views/finance/contract/edit.vue'), + meta: { + title: '收入合同管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/contractManagement/list', + }, + }, ], }, { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 4aa5ed1..ade7bae 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -27,4 +27,6 @@ BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批 BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理 BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批 + BUSINESS_FINANCE_CONTRACT_APPROVE = 'cwczht', // 合同审批 + } diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue index 5501edf..3bb9312 100644 --- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue +++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue @@ -13,6 +13,10 @@ type: Boolean, default: false, }, + isMulti: { + type: Boolean, + default: false, + }, }) const emits = defineEmits(['changeVisible', 'confirmCheckout']) const isUrgentMap = ref([]) // 是否加急 @@ -220,7 +224,7 @@ :query="listQuery" :list-loading="loadingTable" is-showmulti-select - :is-multi="false" + :is-multi="props.isMulti" :page-sizes="[5]" @change="changePage" @multi-select="handleSelectionChange" diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue index 9803d29..b89f35b 100644 --- a/src/views/finance/businessSettlement/edit.vue +++ b/src/views/finance/businessSettlement/edit.vue @@ -14,7 +14,7 @@ import { getOrderDetail } from '@/api/business/schedule/order' import { isNumber, validateMoney } from '@/utils/validate' import { calc } from '@/utils/useCalc' -import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement/businessSettlement' +import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement' const user = useUserStore() // 用户信息 const $route = useRoute() const pageType = ref('detail') // add/detail/edit diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue index 66cac60..d1e83b5 100644 --- a/src/views/finance/businessSettlement/list.vue +++ b/src/views/finance/businessSettlement/list.vue @@ -7,7 +7,7 @@ import { exportFile } from '@/utils/exportUtils' import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDictByCode } from '@/api/system/dict' -import { delBusinessSettlementList, exportBusinessSettlementList, getBusinessSettlementList } from '@/api/finance/businessSettlement/businessSettlement' +import { delBusinessSettlementList, exportBusinessSettlementList, getBusinessSettlementList } from '@/api/finance/businessSettlement' const $router = useRouter() const { proxy } = getCurrentInstance() as any const isUrgentMap = ref([]) // 是否加急 @@ -51,7 +51,7 @@ listQuery.value.offset = 1 } getBusinessSettlementList(listQuery.value).then((response) => { - list.value = response.data.map((item: IList) => { + list.value = response.data.rows.map((item: IList) => { return { ...item, isUrgentName: item.isUrgent === '1' ? '是' : '否', @@ -61,8 +61,6 @@ postedPrice: item.postedPrice ? (item.postedPrice / 100).toFixed(2) : `${item.postedPrice}`, } }) - console.log('-----', list.value) - total.value = parseInt(response.data.total) loadingTable.value = false }).catch(() => { diff --git a/src/views/finance/contract/contract-interface.ts b/src/views/finance/contract/contract-interface.ts new file mode 100644 index 0000000..8f8eb44 --- /dev/null +++ b/src/views/finance/contract/contract-interface.ts @@ -0,0 +1,76 @@ +// 列表查询参数类型 +export interface IListQuery { + agreementKind: string // 合同种类-收入合同/支出合同-字典code + agreementName: string// 合同名字 + agreementNo: string// 合同编号 + agreementType: string// 合同类型-采购合同/业务合同等-字典code + customerId: string// 单位id(客户id)(收入合同该字段为甲方单位,支出合同该字段为乙方单位) + estimateSignEndDate: string// 预计签订/实际签订结束日期 + estimateSignStartDate: string// 预计签订/实际签订开始日期 + firstParty: string// 单位名字(收入合同该字段为甲方单位,支出合同该字段为乙方单位) + formId: string// 表单id + ids: any// 导出ids + status: string// 合同完成状态-字典code + approvalStatus: string // 审批状态类型 + offset: number + limit: number +} + +// 列表查询参数类型 +export interface IList { + id: string // 主键 + agreementNo: string // 合同编号 + agreementName: string // 合同名称 + agreementTypeName: string // 合同类型 + createUserName: string // 创建人 + deptName: string // 部门 + estimateSignDate: string // 签订日期 + agreementAmount: string // 合同金额(单位分) + firstParty: string // 甲方单位 + createTime: string // 创建时间 + statusName: string // 合同完成状态 + approvalStatusName: string // 审批状态 +} + +// 字典 +export interface dictType { + id: string + name: string + value: string | number + label?: string // 基本信息添加的信息名称 +} + +// 详情表单 +export interface IForm { + agreementNo: string // 合同编号 + agreementName: string // 合同名称 + createUser: string // 创建人、申请人 + createUserName: string // 创建人名字、申请人名字 + agreementType: string // 合同类型 + agreementTypeName: string // 合同类型名称 + deptId: string // 创建人所在部门 + deptName: string // 创建人所在部门名称 + estimateSignDate: string // 预计签订日期 + agreementAmount: string // 合同金额 + agreementSource: string // 合同采购来源-字典code + agreementSourceName: string // 合同采购来源-字典value + agreementStartDate: string // 合同开始日期 + agreementEndDate: string // 合同结束日期 + customerId: string // 甲方单位id-客户id + firstParty: string // 甲方单位 + director: string // 甲方负责人 + secondParty: string // 乙方单位 + secondDirector: string // 乙方负责人 + agreementImportantContent: string // 合同重要内容 + remark: string // 备注 + minioFileName: string // 附件 + processId: string // 流程实例id +} + +export interface IPaymentList { + paymentNum: string // 收款次数 + estimatePaymentAmount: string // 预计收款金额(单位分) + estimatePaymentDate: string // 预计收款时间 + actualPaymentAmount: string // 实际收款金额(单位分) + actualPaymentDate: string // 实际收款时间 +} diff --git a/src/api/finance/businessSettlement.ts b/src/api/finance/businessSettlement.ts new file mode 100644 index 0000000..5a18d24 --- /dev/null +++ b/src/api/finance/businessSettlement.ts @@ -0,0 +1,59 @@ +// 业务结算 +import request from '../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: `/finance/settlement/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 删除 +export function delBusinessSettlementList(data: any) { + return request({ + url: '/finance/settlement/delete', + method: 'post', + data, + }) +} + +// 新增 +export function addBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/add', + method: 'post', + data, + }) +} + +// 编辑 +export function updateBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/update', + method: 'post', + data, + }) +} + +// 详情 +export function getBusinessSettlementDetail(data: { id: string }) { + return request({ + url: '/finance/settlement/detail', + method: 'post', + data, + }) +} + diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts deleted file mode 100644 index b4c7efe..0000000 --- a/src/api/finance/businessSettlement/businessSettlement.ts +++ /dev/null @@ -1,59 +0,0 @@ -// 业务结算 -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, - }) -} - -// 删除 -export function delBusinessSettlementList(data: any) { - return request({ - url: '/finance/settlement/delete', - method: 'post', - data, - }) -} - -// 新增 -export function addBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/add', - method: 'post', - data, - }) -} - -// 编辑 -export function updateBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/update', - method: 'post', - data, - }) -} - -// 详情 -export function getBusinessSettlementDetail(data: { id: string }) { - return request({ - url: '/finance/settlement/detail', - method: 'post', - data, - }) -} - diff --git a/src/api/finance/contract.ts b/src/api/finance/contract.ts new file mode 100644 index 0000000..793b23b --- /dev/null +++ b/src/api/finance/contract.ts @@ -0,0 +1,65 @@ +// 收入合同 +import request from '../index' +import type { IListQuery } from '@/views/finance/contract/contract-interface' + +// 收入合同审批列表-列表页 +export function getContractList(data: IListQuery) { + return request({ + url: `/finance/agreement/approval/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 新建 +export function addContractList(data: Object) { + return request({ + url: '/finance/agreement/save', + method: 'post', + data, + }) +} + +// 编辑-草稿箱、已取消 +export function updateContractList(data: Object) { + return request({ + url: '/finance/agreement/draftUpdate', + method: 'post', + data, + }) +} +// 未通过驳回编辑 +export function failUpdateContractList(data: Object) { + return request({ + url: '/finance/agreement/failUpdate', + method: 'post', + data, + }) +} + +// 提交 +export function submitContractList(data: { id: string; formId: string; processId: string }) { + return request({ + url: '/finance/agreement/submit', + method: 'post', + data, + }) +} + +// 删除 +export function delContractList(data: { id: string }) { + return request({ + url: '/finance/agreement/delete', + method: 'post', + data, + }) +} +// 详情 +export function getContractDetail(data: { id: string }) { + return request({ + url: '/finance/agreement/detail', + method: 'post', + data, + }) +} + diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index b2da11d..bd7820a 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -25,6 +25,18 @@ auth: '/finance/contractManagement/income', }, }, + { + path: ':type/:id?', + name: 'contractManagementDetail', + component: () => import('@/views/finance/contract/edit.vue'), + meta: { + title: '收入合同管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/contractManagement/list', + }, + }, ], }, { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 4aa5ed1..ade7bae 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -27,4 +27,6 @@ BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批 BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理 BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批 + BUSINESS_FINANCE_CONTRACT_APPROVE = 'cwczht', // 合同审批 + } diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue index 5501edf..3bb9312 100644 --- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue +++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue @@ -13,6 +13,10 @@ type: Boolean, default: false, }, + isMulti: { + type: Boolean, + default: false, + }, }) const emits = defineEmits(['changeVisible', 'confirmCheckout']) const isUrgentMap = ref([]) // 是否加急 @@ -220,7 +224,7 @@ :query="listQuery" :list-loading="loadingTable" is-showmulti-select - :is-multi="false" + :is-multi="props.isMulti" :page-sizes="[5]" @change="changePage" @multi-select="handleSelectionChange" diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue index 9803d29..b89f35b 100644 --- a/src/views/finance/businessSettlement/edit.vue +++ b/src/views/finance/businessSettlement/edit.vue @@ -14,7 +14,7 @@ import { getOrderDetail } from '@/api/business/schedule/order' import { isNumber, validateMoney } from '@/utils/validate' import { calc } from '@/utils/useCalc' -import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement/businessSettlement' +import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement' const user = useUserStore() // 用户信息 const $route = useRoute() const pageType = ref('detail') // add/detail/edit diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue index 66cac60..d1e83b5 100644 --- a/src/views/finance/businessSettlement/list.vue +++ b/src/views/finance/businessSettlement/list.vue @@ -7,7 +7,7 @@ import { exportFile } from '@/utils/exportUtils' import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDictByCode } from '@/api/system/dict' -import { delBusinessSettlementList, exportBusinessSettlementList, getBusinessSettlementList } from '@/api/finance/businessSettlement/businessSettlement' +import { delBusinessSettlementList, exportBusinessSettlementList, getBusinessSettlementList } from '@/api/finance/businessSettlement' const $router = useRouter() const { proxy } = getCurrentInstance() as any const isUrgentMap = ref([]) // 是否加急 @@ -51,7 +51,7 @@ listQuery.value.offset = 1 } getBusinessSettlementList(listQuery.value).then((response) => { - list.value = response.data.map((item: IList) => { + list.value = response.data.rows.map((item: IList) => { return { ...item, isUrgentName: item.isUrgent === '1' ? '是' : '否', @@ -61,8 +61,6 @@ postedPrice: item.postedPrice ? (item.postedPrice / 100).toFixed(2) : `${item.postedPrice}`, } }) - console.log('-----', list.value) - total.value = parseInt(response.data.total) loadingTable.value = false }).catch(() => { diff --git a/src/views/finance/contract/contract-interface.ts b/src/views/finance/contract/contract-interface.ts new file mode 100644 index 0000000..8f8eb44 --- /dev/null +++ b/src/views/finance/contract/contract-interface.ts @@ -0,0 +1,76 @@ +// 列表查询参数类型 +export interface IListQuery { + agreementKind: string // 合同种类-收入合同/支出合同-字典code + agreementName: string// 合同名字 + agreementNo: string// 合同编号 + agreementType: string// 合同类型-采购合同/业务合同等-字典code + customerId: string// 单位id(客户id)(收入合同该字段为甲方单位,支出合同该字段为乙方单位) + estimateSignEndDate: string// 预计签订/实际签订结束日期 + estimateSignStartDate: string// 预计签订/实际签订开始日期 + firstParty: string// 单位名字(收入合同该字段为甲方单位,支出合同该字段为乙方单位) + formId: string// 表单id + ids: any// 导出ids + status: string// 合同完成状态-字典code + approvalStatus: string // 审批状态类型 + offset: number + limit: number +} + +// 列表查询参数类型 +export interface IList { + id: string // 主键 + agreementNo: string // 合同编号 + agreementName: string // 合同名称 + agreementTypeName: string // 合同类型 + createUserName: string // 创建人 + deptName: string // 部门 + estimateSignDate: string // 签订日期 + agreementAmount: string // 合同金额(单位分) + firstParty: string // 甲方单位 + createTime: string // 创建时间 + statusName: string // 合同完成状态 + approvalStatusName: string // 审批状态 +} + +// 字典 +export interface dictType { + id: string + name: string + value: string | number + label?: string // 基本信息添加的信息名称 +} + +// 详情表单 +export interface IForm { + agreementNo: string // 合同编号 + agreementName: string // 合同名称 + createUser: string // 创建人、申请人 + createUserName: string // 创建人名字、申请人名字 + agreementType: string // 合同类型 + agreementTypeName: string // 合同类型名称 + deptId: string // 创建人所在部门 + deptName: string // 创建人所在部门名称 + estimateSignDate: string // 预计签订日期 + agreementAmount: string // 合同金额 + agreementSource: string // 合同采购来源-字典code + agreementSourceName: string // 合同采购来源-字典value + agreementStartDate: string // 合同开始日期 + agreementEndDate: string // 合同结束日期 + customerId: string // 甲方单位id-客户id + firstParty: string // 甲方单位 + director: string // 甲方负责人 + secondParty: string // 乙方单位 + secondDirector: string // 乙方负责人 + agreementImportantContent: string // 合同重要内容 + remark: string // 备注 + minioFileName: string // 附件 + processId: string // 流程实例id +} + +export interface IPaymentList { + paymentNum: string // 收款次数 + estimatePaymentAmount: string // 预计收款金额(单位分) + estimatePaymentDate: string // 预计收款时间 + actualPaymentAmount: string // 实际收款金额(单位分) + actualPaymentDate: string // 实际收款时间 +} diff --git a/src/views/finance/contract/edit.vue b/src/views/finance/contract/edit.vue new file mode 100644 index 0000000..443a729 --- /dev/null +++ b/src/views/finance/contract/edit.vue @@ -0,0 +1,774 @@ + + + + + + + diff --git a/src/api/finance/businessSettlement.ts b/src/api/finance/businessSettlement.ts new file mode 100644 index 0000000..5a18d24 --- /dev/null +++ b/src/api/finance/businessSettlement.ts @@ -0,0 +1,59 @@ +// 业务结算 +import request from '../index' +import type { IListQuery } from '@/views/finance/businessSettlement/businessSettlement-interface' + +// 业务结算列表 +export function getBusinessSettlementList(data: IListQuery) { + return request({ + url: `/finance/settlement/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 业务结算导出 +export function exportBusinessSettlementList(data: IListQuery) { + return request({ + url: '/finance/settlement/listExport', + method: 'post', + responseType: 'blob', + data, + }) +} + +// 删除 +export function delBusinessSettlementList(data: any) { + return request({ + url: '/finance/settlement/delete', + method: 'post', + data, + }) +} + +// 新增 +export function addBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/add', + method: 'post', + data, + }) +} + +// 编辑 +export function updateBusinessSettlement(data: Object) { + return request({ + url: '/finance/settlement/update', + method: 'post', + data, + }) +} + +// 详情 +export function getBusinessSettlementDetail(data: { id: string }) { + return request({ + url: '/finance/settlement/detail', + method: 'post', + data, + }) +} + diff --git a/src/api/finance/businessSettlement/businessSettlement.ts b/src/api/finance/businessSettlement/businessSettlement.ts deleted file mode 100644 index b4c7efe..0000000 --- a/src/api/finance/businessSettlement/businessSettlement.ts +++ /dev/null @@ -1,59 +0,0 @@ -// 业务结算 -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, - }) -} - -// 删除 -export function delBusinessSettlementList(data: any) { - return request({ - url: '/finance/settlement/delete', - method: 'post', - data, - }) -} - -// 新增 -export function addBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/add', - method: 'post', - data, - }) -} - -// 编辑 -export function updateBusinessSettlement(data: Object) { - return request({ - url: '/finance/settlement/update', - method: 'post', - data, - }) -} - -// 详情 -export function getBusinessSettlementDetail(data: { id: string }) { - return request({ - url: '/finance/settlement/detail', - method: 'post', - data, - }) -} - diff --git a/src/api/finance/contract.ts b/src/api/finance/contract.ts new file mode 100644 index 0000000..793b23b --- /dev/null +++ b/src/api/finance/contract.ts @@ -0,0 +1,65 @@ +// 收入合同 +import request from '../index' +import type { IListQuery } from '@/views/finance/contract/contract-interface' + +// 收入合同审批列表-列表页 +export function getContractList(data: IListQuery) { + return request({ + url: `/finance/agreement/approval/listPage?offset=${data.offset}&limit=${data.limit}`, + method: 'post', + data, + }) +} + +// 新建 +export function addContractList(data: Object) { + return request({ + url: '/finance/agreement/save', + method: 'post', + data, + }) +} + +// 编辑-草稿箱、已取消 +export function updateContractList(data: Object) { + return request({ + url: '/finance/agreement/draftUpdate', + method: 'post', + data, + }) +} +// 未通过驳回编辑 +export function failUpdateContractList(data: Object) { + return request({ + url: '/finance/agreement/failUpdate', + method: 'post', + data, + }) +} + +// 提交 +export function submitContractList(data: { id: string; formId: string; processId: string }) { + return request({ + url: '/finance/agreement/submit', + method: 'post', + data, + }) +} + +// 删除 +export function delContractList(data: { id: string }) { + return request({ + url: '/finance/agreement/delete', + method: 'post', + data, + }) +} +// 详情 +export function getContractDetail(data: { id: string }) { + return request({ + url: '/finance/agreement/detail', + method: 'post', + data, + }) +} + diff --git a/src/router/modules/financial.ts b/src/router/modules/financial.ts index b2da11d..bd7820a 100644 --- a/src/router/modules/financial.ts +++ b/src/router/modules/financial.ts @@ -25,6 +25,18 @@ auth: '/finance/contractManagement/income', }, }, + { + path: ':type/:id?', + name: 'contractManagementDetail', + component: () => import('@/views/finance/contract/edit.vue'), + meta: { + title: '收入合同管理详情', + icon: 'ep:key', + sidebar: false, + breadcrumb: true, + activeMenu: '/contractManagement/list', + }, + }, ], }, { diff --git a/src/utils/scheduleDict.ts b/src/utils/scheduleDict.ts index 4aa5ed1..ade7bae 100644 --- a/src/utils/scheduleDict.ts +++ b/src/utils/scheduleDict.ts @@ -27,4 +27,6 @@ BUSINESS_SUBPACKAGE_APPROVE = 'ywglfbfzg', // 分包方资格资格审批 BUSINESS_SUBPACKAGE_MANAGE = 'ywglfbzsgl', // 分包方证书管理 BUSINESS_FIELDTEST_APPROVE = 'ywglxcjc', // 现场检测审批 + BUSINESS_FINANCE_CONTRACT_APPROVE = 'cwczht', // 合同审批 + } diff --git a/src/views/business/schedule/interchangeReceipt/selectOrder.vue b/src/views/business/schedule/interchangeReceipt/selectOrder.vue index 5501edf..3bb9312 100644 --- a/src/views/business/schedule/interchangeReceipt/selectOrder.vue +++ b/src/views/business/schedule/interchangeReceipt/selectOrder.vue @@ -13,6 +13,10 @@ type: Boolean, default: false, }, + isMulti: { + type: Boolean, + default: false, + }, }) const emits = defineEmits(['changeVisible', 'confirmCheckout']) const isUrgentMap = ref([]) // 是否加急 @@ -220,7 +224,7 @@ :query="listQuery" :list-loading="loadingTable" is-showmulti-select - :is-multi="false" + :is-multi="props.isMulti" :page-sizes="[5]" @change="changePage" @multi-select="handleSelectionChange" diff --git a/src/views/finance/businessSettlement/edit.vue b/src/views/finance/businessSettlement/edit.vue index 9803d29..b89f35b 100644 --- a/src/views/finance/businessSettlement/edit.vue +++ b/src/views/finance/businessSettlement/edit.vue @@ -14,7 +14,7 @@ import { getOrderDetail } from '@/api/business/schedule/order' import { isNumber, validateMoney } from '@/utils/validate' import { calc } from '@/utils/useCalc' -import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement/businessSettlement' +import { addBusinessSettlement, getBusinessSettlementDetail, updateBusinessSettlement } from '@/api/finance/businessSettlement' const user = useUserStore() // 用户信息 const $route = useRoute() const pageType = ref('detail') // add/detail/edit diff --git a/src/views/finance/businessSettlement/list.vue b/src/views/finance/businessSettlement/list.vue index 66cac60..d1e83b5 100644 --- a/src/views/finance/businessSettlement/list.vue +++ b/src/views/finance/businessSettlement/list.vue @@ -7,7 +7,7 @@ import { exportFile } from '@/utils/exportUtils' import type { TableColumn } from '@/components/NormalTable/table_interface' import { getDictByCode } from '@/api/system/dict' -import { delBusinessSettlementList, exportBusinessSettlementList, getBusinessSettlementList } from '@/api/finance/businessSettlement/businessSettlement' +import { delBusinessSettlementList, exportBusinessSettlementList, getBusinessSettlementList } from '@/api/finance/businessSettlement' const $router = useRouter() const { proxy } = getCurrentInstance() as any const isUrgentMap = ref([]) // 是否加急 @@ -51,7 +51,7 @@ listQuery.value.offset = 1 } getBusinessSettlementList(listQuery.value).then((response) => { - list.value = response.data.map((item: IList) => { + list.value = response.data.rows.map((item: IList) => { return { ...item, isUrgentName: item.isUrgent === '1' ? '是' : '否', @@ -61,8 +61,6 @@ postedPrice: item.postedPrice ? (item.postedPrice / 100).toFixed(2) : `${item.postedPrice}`, } }) - console.log('-----', list.value) - total.value = parseInt(response.data.total) loadingTable.value = false }).catch(() => { diff --git a/src/views/finance/contract/contract-interface.ts b/src/views/finance/contract/contract-interface.ts new file mode 100644 index 0000000..8f8eb44 --- /dev/null +++ b/src/views/finance/contract/contract-interface.ts @@ -0,0 +1,76 @@ +// 列表查询参数类型 +export interface IListQuery { + agreementKind: string // 合同种类-收入合同/支出合同-字典code + agreementName: string// 合同名字 + agreementNo: string// 合同编号 + agreementType: string// 合同类型-采购合同/业务合同等-字典code + customerId: string// 单位id(客户id)(收入合同该字段为甲方单位,支出合同该字段为乙方单位) + estimateSignEndDate: string// 预计签订/实际签订结束日期 + estimateSignStartDate: string// 预计签订/实际签订开始日期 + firstParty: string// 单位名字(收入合同该字段为甲方单位,支出合同该字段为乙方单位) + formId: string// 表单id + ids: any// 导出ids + status: string// 合同完成状态-字典code + approvalStatus: string // 审批状态类型 + offset: number + limit: number +} + +// 列表查询参数类型 +export interface IList { + id: string // 主键 + agreementNo: string // 合同编号 + agreementName: string // 合同名称 + agreementTypeName: string // 合同类型 + createUserName: string // 创建人 + deptName: string // 部门 + estimateSignDate: string // 签订日期 + agreementAmount: string // 合同金额(单位分) + firstParty: string // 甲方单位 + createTime: string // 创建时间 + statusName: string // 合同完成状态 + approvalStatusName: string // 审批状态 +} + +// 字典 +export interface dictType { + id: string + name: string + value: string | number + label?: string // 基本信息添加的信息名称 +} + +// 详情表单 +export interface IForm { + agreementNo: string // 合同编号 + agreementName: string // 合同名称 + createUser: string // 创建人、申请人 + createUserName: string // 创建人名字、申请人名字 + agreementType: string // 合同类型 + agreementTypeName: string // 合同类型名称 + deptId: string // 创建人所在部门 + deptName: string // 创建人所在部门名称 + estimateSignDate: string // 预计签订日期 + agreementAmount: string // 合同金额 + agreementSource: string // 合同采购来源-字典code + agreementSourceName: string // 合同采购来源-字典value + agreementStartDate: string // 合同开始日期 + agreementEndDate: string // 合同结束日期 + customerId: string // 甲方单位id-客户id + firstParty: string // 甲方单位 + director: string // 甲方负责人 + secondParty: string // 乙方单位 + secondDirector: string // 乙方负责人 + agreementImportantContent: string // 合同重要内容 + remark: string // 备注 + minioFileName: string // 附件 + processId: string // 流程实例id +} + +export interface IPaymentList { + paymentNum: string // 收款次数 + estimatePaymentAmount: string // 预计收款金额(单位分) + estimatePaymentDate: string // 预计收款时间 + actualPaymentAmount: string // 实际收款金额(单位分) + actualPaymentDate: string // 实际收款时间 +} diff --git a/src/views/finance/contract/edit.vue b/src/views/finance/contract/edit.vue new file mode 100644 index 0000000..443a729 --- /dev/null +++ b/src/views/finance/contract/edit.vue @@ -0,0 +1,774 @@ + + + + + + + diff --git a/src/views/finance/contract/list.vue b/src/views/finance/contract/list.vue index 5c94be5..cd37d9d 100644 --- a/src/views/finance/contract/list.vue +++ b/src/views/finance/contract/list.vue @@ -1,11 +1,458 @@