diff --git a/src/api/oa/erp/finInvoiceDetail/index.ts b/src/api/oa/erp/finInvoiceDetail/index.ts new file mode 100644 index 0000000..2f48c0e --- /dev/null +++ b/src/api/oa/erp/finInvoiceDetail/index.ts @@ -0,0 +1,76 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { FinInvoiceDetailVO, FinInvoiceDetailForm, FinInvoiceDetailQuery } from '@/api/oa/erp/finInvoiceDetail/types'; + +/** + * 查询开票明细列表 + * @param query + * @returns {*} + */ + +export const listFinInvoiceDetail = (query?: FinInvoiceDetailQuery): AxiosPromise => { + return request({ + url: '/oa/erp/finInvoiceDetail/list', + method: 'get', + params: query + }); +}; + +/** + * 查询开票明细详细 + * @param invoiceDetailId + */ +export const getFinInvoiceDetail = (invoiceDetailId: string | number): AxiosPromise => { + return request({ + url: '/oa/erp/finInvoiceDetail/' + invoiceDetailId, + method: 'get' + }); +}; + +/** + * 新增开票明细 + * @param data + */ +export const addFinInvoiceDetail = (data: FinInvoiceDetailForm) => { + return request({ + url: '/oa/erp/finInvoiceDetail', + method: 'post', + data: data + }); +}; + +/** + * 修改开票明细 + * @param data + */ +export const updateFinInvoiceDetail = (data: FinInvoiceDetailForm) => { + return request({ + url: '/oa/erp/finInvoiceDetail', + method: 'put', + data: data + }); +}; + +/** + * 删除开票明细 + * @param invoiceDetailId + */ +export const delFinInvoiceDetail = (invoiceDetailId: string | number | Array) => { + return request({ + url: '/oa/erp/finInvoiceDetail/' + invoiceDetailId, + method: 'delete' + }); +}; + +/** + * 下拉框查询开票明细列表 + * @param query + * @returns {*} + */ +export function getErpFinInvoiceDetailList (query) { + return request({ + url: '/oa/erp/finInvoiceDetail/getErpFinInvoiceDetailList', + method: 'get', + params: query + }); +}; diff --git a/src/api/oa/erp/finInvoiceDetail/types.ts b/src/api/oa/erp/finInvoiceDetail/types.ts new file mode 100644 index 0000000..b49da0f --- /dev/null +++ b/src/api/oa/erp/finInvoiceDetail/types.ts @@ -0,0 +1,161 @@ +export interface FinInvoiceDetailVO { + /** + * 开票明细ID + */ + invoiceDetailId: string | number; + + /** + * 开票ID + */ + invoiceId: string | number; + + /** + * 开票内容 + */ + billingItems: string; + + /** + * 规格型号 + */ + specificationModel: string; + + /** + * 单位 + */ + unitName: string; + + /** + * 数量 + */ + quantity: number; + + /** + * 单价 + */ + unitPrice: number; + + /** + * 金额,自动计算 + */ + totalPrice: number; + + /** + * 税率/征收率,默认13% + */ + taxRate: number; + + /** + * 税额,自动计算 + */ + taxPrice: number; + +} + +export interface FinInvoiceDetailForm extends BaseEntity { + /** + * 开票明细ID + */ + invoiceDetailId?: string | number; + + /** + * 开票ID + */ + invoiceId?: string | number; + + /** + * 开票内容 + */ + billingItems?: string; + + /** + * 规格型号 + */ + specificationModel?: string; + + /** + * 单位 + */ + unitName?: string; + + /** + * 数量 + */ + quantity?: number; + + /** + * 单价 + */ + unitPrice?: number; + + /** + * 金额,自动计算 + */ + totalPrice?: number; + + /** + * 税率/征收率,默认13% + */ + taxRate?: number; + + /** + * 税额,自动计算 + */ + taxPrice?: number; + +} + +export interface FinInvoiceDetailQuery extends PageQuery { + + /** + * 开票ID + */ + invoiceId?: string | number; + + /** + * 开票内容 + */ + billingItems?: string; + + /** + * 规格型号 + */ + specificationModel?: string; + + /** + * 单位 + */ + unitName?: string; + + /** + * 数量 + */ + quantity?: number; + + /** + * 单价 + */ + unitPrice?: number; + + /** + * 金额,自动计算 + */ + totalPrice?: number; + + /** + * 税率/征收率,默认13% + */ + taxRate?: number; + + /** + * 税额,自动计算 + */ + taxPrice?: number; + + /** + * 日期范围参数 + */ + params?: any; +} + + + diff --git a/src/api/oa/erp/finInvoiceInfo/index.ts b/src/api/oa/erp/finInvoiceInfo/index.ts new file mode 100644 index 0000000..44d1236 --- /dev/null +++ b/src/api/oa/erp/finInvoiceInfo/index.ts @@ -0,0 +1,109 @@ +import request from '@/utils/request'; +import { AxiosPromise } from 'axios'; +import { FinInvoiceInfoVO, FinInvoiceInfoForm, FinInvoiceInfoQuery } from '@/api/oa/erp/finInvoiceInfo/types'; +import { ContractPaymentMethodVO } from '@/api/oa/erp/contractPaymentMethod/types'; +/** + * 查询开票信息列表 + * @param query + * @returns {*} + */ + +export const listFinInvoiceInfo = (query?: FinInvoiceInfoQuery): AxiosPromise => { + return request({ + url: '/oa/erp/finInvoiceInfo/list', + method: 'get', + params: query + }); +}; + +/** + * 查询基本信息(用户和部门信息) + */ +export const getBaseInfo = (): AxiosPromise => { + return request({ + url: '/oa/erp/finInvoiceInfo/getBaseInfo', + method: 'get' + }); +}; + +/** + * 查询开票信息详细 + * @param invoiceId + */ +export const getFinInvoiceInfo = (invoiceId: string | number): AxiosPromise => { + return request({ + url: '/oa/erp/finInvoiceInfo/' + invoiceId, + method: 'get' + }); +}; + +/** + * 新增开票信息 + * @param data + */ +export const addFinInvoiceInfo = (data: FinInvoiceInfoForm) => { + return request({ + url: '/oa/erp/finInvoiceInfo', + method: 'post', + data: data + }); +}; + +/** + * 修改开票信息 + * @param data + */ +export const updateFinInvoiceInfo = (data: FinInvoiceInfoForm) => { + return request({ + url: '/oa/erp/finInvoiceInfo', + method: 'put', + data: data + }); +}; + +/** + * 删除开票信息 + * @param invoiceId + */ +export const delFinInvoiceInfo = (invoiceId: string | number | Array) => { + return request({ + url: '/oa/erp/finInvoiceInfo/' + invoiceId, + method: 'delete' + }); +}; + +/** + * 下拉框查询开票信息列表 + * @param query + * @returns {*} + */ +export function getErpFinInvoiceInfoList (query) { + return request({ + url: '/oa/erp/finInvoiceInfo/getErpFinInvoiceInfoList', + method: 'get', + params: query + }); +}; + +/** + * 查询开票信息详细 + * @param invoiceId + */ +export const getContractPaymentMethodList = (contractId: string | number): AxiosPromise => { + return request({ + url: '/oa/erp/finInvoiceInfo/getContractPaymentMethodList/' + contractId, + method: 'get' + }); +}; + +/** + * 新增开票信息 + * @param data + */ +export const updateInvoiceAttach = (data: FinInvoiceInfoForm) => { + return request({ + url: '/oa/erp/finInvoiceInfo/updateInvoiceAttach', + method: 'post', + data: data + }); +}; diff --git a/src/api/oa/erp/finInvoiceInfo/types.ts b/src/api/oa/erp/finInvoiceInfo/types.ts new file mode 100644 index 0000000..0741ba3 --- /dev/null +++ b/src/api/oa/erp/finInvoiceInfo/types.ts @@ -0,0 +1,522 @@ +import { FinInvoiceDetailVO } from '../finInvoiceDetail/types'; + +export interface FinInvoiceInfoVO { + /** + * 开票ID + */ + invoiceId: string | number; + + /** + * 开票申请编号 + */ + invoiceCode: string; + + /** + * 提前开票标识(1是,0否) + */ + earlyFlag: string; + + /** + * 发票类型(1增值税专用发票 2普通发票) + */ + invoiceType: string; + + /** + * 本次开具金额(自动计算) + */ + issueAmount: number; + + /** + * 本次开具比例(自动计算) + */ + issuancePercentage: number; + + /** + * 冲红标识(1是,0否) + */ + redInkFlag: string; + + /** + * 项目ID + */ + projectId: string | number; + + /** + * 冗余,项目号 + */ + projectCode: string; + + /** + * 冗余,项目名称 + */ + projectName: string; + + /** + * 冗余,验收日期,冗余(从erp_project_acceptance获取字段acceptance_date) + */ + acceptanceDate: string; + + /** + * 发货日期,发货单中是分批发记录的 + */ + deliveryDate: string; + + /** + * 冗余,收货日期,冗余(从erp_project_receiving表中获取arrival_date) + */ + arrivalDate: string; + + /** + * 版本,新版本+1 + */ + invoiceVersion: number; + + /** + * 项目类型(1、实施类,2备件类) + */ + invoiceCategory: string; + + /** + * 合同ID + */ + contractId: string | number; + + /** + * 冗余,合同总价 + */ + totalPrice: number; + + /** + * 冗余,客户ID + */ + customerId: string | number; + + /** + * 冗余,客户名称 + */ + customerName: string; + + /** + * 冗余,合同付款条款 + */ + paymentMethod: string; + + /** + * 累计回款金额 + */ + returnedMoney: number; + + /** + * 累计回款比例 + */ + returnedRate: number; + + /** + * 是否全部投料(1是 0否) + */ + feedingFlag: string; + + /** + * 成本是否归集完整(1是 0否) + */ + costCompleteFlag: string; + + /** + * 是否建立销售订单(1是 0否) + */ + saleOrderCreateFlag: string; + + /** + * 流程状态 + */ + flowStatus: string; + + /** + * 开票状态(1暂存 2审批中 3可用) + */ + invoiceStatus: string; + + /** + * 发票备注 + */ + remark: string; + + /** + * 提前开票原因 + */ + earlyReason: string; + + /** + * 发起人ID + */ + requestBy: number; + + /** + * 发起部门ID + */ + requestDept: number; + + /** + * 发起人名称,关联nickname + */ + requestByName: string; + + /** + * 发起部门名称 + */ + requestDeptName: string; + + /** + * 发起日期 + */ + issueDate?: string; +} + +export interface FinInvoiceInfoForm extends BaseEntity { + /** + * 开票ID + */ + invoiceId?: string | number; + + /** + * 开票申请编号 + */ + invoiceCode?: string; + + /** + * 提前开票标识(1是,0否) + */ + earlyFlag?: string; + + /** + * 发票类型(1增值税专用发票 2普通发票) + */ + invoiceType?: string; + + /** + * 本次开具金额(自动计算) + */ + issueAmount?: number; + + /** + * 本次开具比例(自动计算) + */ + issuancePercentage?: number; + + /** + * 冲红标识(1是,0否) + */ + redInkFlag?: string; + + /** + * 项目ID + */ + projectId?: string | number; + + /** + * 冗余,项目号 + */ + projectCode?: string; + + /** + * 冗余,项目名称 + */ + projectName?: string; + + /** + * 冗余,验收日期,冗余(从erp_project_acceptance获取字段acceptance_date) + */ + acceptanceDate?: string; + + /** + * 发货日期,发货单中是分批发记录的 + */ + deliveryDate?: string; + + /** + * 冗余,收货日期,冗余(从erp_project_receiving表中获取arrival_date) + */ + arrivalDate?: string; + + /** + * 版本,新版本+1 + */ + invoiceVersion?: number; + + /** + * 项目类型(1、实施类,2备件类) + */ + invoiceCategory?: string; + + /** + * 合同ID + */ + contractId?: string | number; + + /** + * 冗余,合同总价 + */ + totalPrice?: number; + + /** + * 冗余,客户ID + */ + customerId?: string | number; + + /** + * 冗余,客户名称 + */ + customerName?: string; + + /** + * 冗余,合同付款条款 + */ + paymentMethod?: string; + + /** + * 累计回款金额 + */ + returnedMoney?: number; + + /** + * 累计回款比例 + */ + returnedRate?: number; + + /** + * 是否全部投料(1是 0否) + */ + feedingFlag?: string; + + /** + * 成本是否归集完整(1是 0否) + */ + costCompleteFlag?: string; + + /** + * 是否建立销售订单(1是 0否) + */ + saleOrderCreateFlag?: string; + + /** + * 流程状态 + */ + flowStatus?: string; + + /** + * 开票状态(1暂存 2审批中 3可用) + */ + invoiceStatus?: string; + + /** + * 发票备注 + */ + remark?: string; + + /** + * 提前开票原因 + */ + earlyReason?: string; + + /** + * 发起人ID + */ + requestBy?: number; + + /** + * 发起部门ID + */ + requestDept?: number; + + /** + * 发起人名称,关联nickname + */ + requestByName?: string; + + /** + * 发起部门名称 + */ + requestDeptName?: string; + + /** + * 发起日期 + */ + issueDate?: string; + + /** + * 开票明细列表 + */ + erpFinInvoiceDetailList?: Array; + + /** + * 待删除开票明细ID列表 + */ + toDeletedInvoiceDetailIdList?: Array; +} + +export interface FinInvoiceInfoQuery extends PageQuery { + /** + * 开票申请编号 + */ + invoiceCode?: string; + + /** + * 提前开票标识(1是,0否) + */ + earlyFlag?: string; + + /** + * 发票类型(1增值税专用发票 2普通发票) + */ + invoiceType?: string; + + /** + * 本次开具金额(自动计算) + */ + issueAmount?: number; + + /** + * 本次开具比例(自动计算) + */ + issuancePercentage?: number; + + /** + * 冲红标识(1是,0否) + */ + redInkFlag?: string; + + /** + * 项目ID + */ + projectId?: string | number; + + /** + * 冗余,项目号 + */ + projectCode?: string; + + /** + * 冗余,项目名称 + */ + projectName?: string; + + /** + * 冗余,验收日期,冗余(从erp_project_acceptance获取字段acceptance_date) + */ + acceptanceDate?: string; + + /** + * 发货日期,发货单中是分批发记录的 + */ + deliveryDate?: string; + + /** + * 冗余,收货日期,冗余(从erp_project_receiving表中获取arrival_date) + */ + arrivalDate?: string; + + /** + * 版本,新版本+1 + */ + invoiceVersion?: number; + + /** + * 项目类型(1、实施类,2备件类) + */ + invoiceCategory?: string; + + /** + * 合同ID + */ + contractId?: string | number; + + /** + * 冗余,合同总价 + */ + totalPrice?: number; + + /** + * 冗余,客户ID + */ + customerId?: string | number; + + /** + * 冗余,客户名称 + */ + customerName?: string; + + /** + * 冗余,合同付款条款 + */ + paymentMethod?: string; + + /** + * 累计回款金额 + */ + returnedMoney?: number; + + /** + * 累计回款比例 + */ + returnedRate?: number; + + /** + * 是否全部投料(1是 0否) + */ + feedingFlag?: string; + + /** + * 成本是否归集完整(1是 0否) + */ + costCompleteFlag?: string; + + /** + * 是否建立销售订单(1是 0否) + */ + saleOrderCreateFlag?: string; + + /** + * 流程状态 + */ + flowStatus?: string; + + /** + * 开票状态(1暂存 2审批中 3可用) + */ + invoiceStatus?: string; + + /** + * 提前开票原因 + */ + earlyReason?: string; + + /** + * 发起人ID + */ + requestBy?: number; + + /** + * 发起部门ID + */ + requestDept?: number; + + /** + * 发起人名称,关联nickname + */ + requestByName?: string; + + /** + * 发起部门名称 + */ + requestDeptName?: string; + + /** + * 发起日期 + */ + issueDate?: string; + + /** + * 日期范围参数 + */ + params?: any; +} diff --git a/src/api/oa/erp/projectInfo/index.ts b/src/api/oa/erp/projectInfo/index.ts index 28652bd..eca8b02 100644 --- a/src/api/oa/erp/projectInfo/index.ts +++ b/src/api/oa/erp/projectInfo/index.ts @@ -93,9 +93,9 @@ export function getErpProjectInfoList(query) { * @param query * @returns {*} */ -export function getErpProjectInfoJoinList(query) { +export function getErpProjectWithProjectList(query) { return request({ - url: '/oa/erp/projectInfo/getErpProjectInfoJoinList', + url: '/oa/erp/projectInfo/getErpProjectWithProjectList', method: 'get', params: query }); diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts index f529e16..1770b65 100644 --- a/src/api/system/user/index.ts +++ b/src/api/system/user/index.ts @@ -232,6 +232,18 @@ export const listUserByDeptAndRole = (query: any): AxiosPromise => { }); }; +/** + * 查询用户列表,join dept + * @param query + */ +export const getUserJoinDeptList = (query: UserQuery): AxiosPromise => { + return request({ + url: '/system/user/getUserJoinDeptList', + method: 'get', + params: query + }); +}; + export default { listUser, getUser, @@ -250,5 +262,6 @@ export default { deptTreeSelect, listUserByDeptId, getUserList, - listUserByDeptAndRole + listUserByDeptAndRole, + getUserJoinDeptList }; diff --git a/src/views/oa/components/ContractSelectDialog.vue b/src/views/oa/components/ContractSelectDialog.vue index 43c3a17..e4ac313 100644 --- a/src/views/oa/components/ContractSelectDialog.vue +++ b/src/views/oa/components/ContractSelectDialog.vue @@ -32,6 +32,7 @@ +