From d8a3b5853ade4a545e4b81935b1947306f025ba8 Mon Sep 17 00:00:00 2001 From: zhaoxiao Date: Thu, 9 Sep 2021 17:03:06 +0800 Subject: [PATCH] =?UTF-8?q?[update]=20=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E5=88=B0=E8=B4=A6=E5=BC=80=E7=A5=A8=E6=96=B0=E5=A2=9E=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/incomePaymentsApi.js | 5 +- src/assets/imgs/icon/icon_edit.png | Bin 0 -> 1171 bytes src/assets/imgs/icon/icon_financial.png | Bin 0 -> 2083 bytes src/assets/less/common.less | 1 + .../ArriveAndInvoivingList.vue | 242 ++++++++++++++++++ .../modules/ArriveModule.vue | 142 ++++++++++ .../modules/ArriveStageModule.vue | 199 ++++++++++++++ .../modules/InvoicingModule.vue | 128 +++++++++ .../modules/InvoicingStageModule.vue | 207 +++++++++++++++ .../dunning/DunningList.vue | 205 +++++++++++++++ .../dunning/modules/DunningSetTimeModule.vue | 49 ++++ .../packManagement/PackProjectMaintenance.vue | 36 ++- 12 files changed, 1207 insertions(+), 7 deletions(-) create mode 100644 src/assets/imgs/icon/icon_edit.png create mode 100644 src/assets/imgs/icon/icon_financial.png create mode 100644 src/views/financialManagement/arriveAndInvoicing/ArriveAndInvoivingList.vue create mode 100644 src/views/financialManagement/arriveAndInvoicing/modules/ArriveModule.vue create mode 100644 src/views/financialManagement/arriveAndInvoicing/modules/ArriveStageModule.vue create mode 100644 src/views/financialManagement/arriveAndInvoicing/modules/InvoicingModule.vue create mode 100644 src/views/financialManagement/arriveAndInvoicing/modules/InvoicingStageModule.vue create mode 100644 src/views/financialManagement/dunning/DunningList.vue create mode 100644 src/views/financialManagement/dunning/modules/DunningSetTimeModule.vue 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 0000000000000000000000000000000000000000..838c16ccc5d8e868cdea1a3da459af5a282e31fd GIT binary patch literal 1171 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 N002ovPDHLkV1g_h=0*Sj literal 0 HcmV?d00001 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 @@ + + + + + \ 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 @@ + + + + + \ 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 @@ + + + + + \ 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 @@ + + + + + \ 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() } } }