diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index 9a031ef..d47b284 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -28,6 +28,8 @@ const queryUserByDepartId = (param) => getAction('/sys/user/listRoleAndDepart', const queryContactByName = (param) => getAction('/company/payContactsManagement/queryByName', param) // 通过id获取支出合同信息 const getExpenditureContractById = (param) => getAction('/contract/paySpendingContract/queryById', param) +// 添加来款阶段 +const addPaymentPhase = (param) => postAction('/paymentRecord/payPaymentRecord/addPhase', param) export { getWorkingGroupById, @@ -43,5 +45,6 @@ export { archiveRevenueContract, queryUserByDepartId, queryContactByName, - getExpenditureContractById + getExpenditureContractById, + addPaymentPhase } \ No newline at end of file diff --git a/src/assets/imgs/icon/icon_edit.png b/src/assets/imgs/icon/icon_edit.png new file mode 100644 index 0000000..838c16c Binary files /dev/null and b/src/assets/imgs/icon/icon_edit.png differ diff --git a/src/assets/imgs/icon/icon_financial.png b/src/assets/imgs/icon/icon_financial.png new file mode 100644 index 0000000..a377915 Binary files /dev/null and b/src/assets/imgs/icon/icon_financial.png differ diff --git a/src/assets/less/common.less b/src/assets/less/common.less index 3b98a6c..c097928 100644 --- a/src/assets/less/common.less +++ b/src/assets/less/common.less @@ -79,6 +79,7 @@ text-align: left; color: #333333; display: flex; + align-items: center; position: relative; &-text { diff --git a/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue new file mode 100644 index 0000000..dc9973c --- /dev/null +++ b/src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue @@ -0,0 +1,242 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + + 导出 + + + + + + + + + + + + + + + + + + + + + + + + + + + 来款 + 开票 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue new file mode 100644 index 0000000..53aac2d --- /dev/null +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue @@ -0,0 +1,142 @@ + + + + + + e.target.value = (e.target.value.replace(/[^0-9.]/g, '')).trim()"> + + + + + + {e.target.value = (e.target.value + '').trim()}"/> + + + + + + + + + \ No newline at end of file diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue new file mode 100644 index 0000000..c4f481e --- /dev/null +++ b/src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue @@ -0,0 +1,199 @@ + + + + + + 第{{ item.chinaNumIndex }}阶段 + + + + + + 到账金额: + {{ item.amountReceived }} + + + + + 来款日期: + {{ item.paymentDate }} + + + + + + + 备注: + {{ item.remark }} + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue new file mode 100644 index 0000000..d920184 --- /dev/null +++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue @@ -0,0 +1,128 @@ + + + + + + e.target.value = (e.target.value.replace(/[^0-9.]/g, '')).trim()"> + + + {e.target.value = (e.target.value + '').trim()}"> + + + + + + {e.target.value = (e.target.value + '').trim()}"/> + + + + + + + + + \ No newline at end of file diff --git a/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue new file mode 100644 index 0000000..c8cc6d3 --- /dev/null +++ b/src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue @@ -0,0 +1,207 @@ + + + + + + 第{{ item.chinaNumIndex }}阶段 + + + + + + 开票金额: + {{ item.invoicingAmount }} + + + + + 开票号: + {{ item.invoicingNum }} + + + + + 开票日期: + {{ item.invoicingDate }} + + + + + + + 备注: + {{ item.remarks }} + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/financialManagement/dunning/DunningList.vue b/src/views/financialManagement/dunning/DunningList.vue new file mode 100644 index 0000000..a3072df --- /dev/null +++ b/src/views/financialManagement/dunning/DunningList.vue @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + 查询 + 重置 + + + + + + + + + + 设置定时催款 + 导出 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/financialManagement/dunning/modules/DunningSetTimeModule.vue b/src/views/financialManagement/dunning/modules/DunningSetTimeModule.vue new file mode 100644 index 0000000..bb32e95 --- /dev/null +++ b/src/views/financialManagement/dunning/modules/DunningSetTimeModule.vue @@ -0,0 +1,49 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue index 9681a28..d27b0c1 100644 --- a/src/views/packManagement/PackProjectMaintenance.vue +++ b/src/views/packManagement/PackProjectMaintenance.vue @@ -124,6 +124,10 @@ + + + + @@ -136,6 +140,8 @@ import StatusSlot from '../../components/tools/StatusSlot' import PackProjectSelectProjectModule from './modules/PackProjectSelectProjectModule' import BatchIncomePaymentModule from './modules/BatchIncomePaymentModule' import BatchInvoicingModule from './modules/BatchInvoicingModule' +import ArriveStageModule from '../financialManagement/arriveAndInvoicing/modules/ArriveStageModule' +import InvoicingStageModule from '../financialManagement/arriveAndInvoicing/modules/InvoicingStageModule' export default { name: 'PackProjectMaintenance', @@ -145,7 +151,9 @@ export default { StatusSlot, PackProjectSelectProjectModule, BatchIncomePaymentModule, - BatchInvoicingModule + BatchInvoicingModule, + ArriveStageModule, + InvoicingStageModule }, mixins: [JeroListMixin], data() { @@ -275,10 +283,16 @@ export default { dataIndex: 'action', align: 'center', fixed: 'right', - width: 160, + width: 180, scopedSlots: { customRender: 'action' } } ], + dataSource: [ + { + id: 1, + chargeProject: 'asd' + } + ], url: { list: '', exportXlsUrl: '' @@ -320,14 +334,24 @@ export default { batchInvoicing() { this.$refs.batchInvoicingModal.open() }, - incomePayment() { - + /** + * 来款 + * @param id + */ + incomePayment(id) { + console.log(id) + this.$refs.arriveStage.open() }, cancelPack() { }, - invoicing() { - + /** + * 开票 + * @param id + */ + invoicing(id) { + console.log(id) + this.$refs.invoicingStage.open() } } }