diff --git a/src/api/incomePaymentsApi.js b/src/api/incomePaymentsApi.js index ec4554b..39232c6 100644 --- a/src/api/incomePaymentsApi.js +++ b/src/api/incomePaymentsApi.js @@ -21,6 +21,8 @@ const getCouncilDetailById = (param) => getAction('/payCaseCouncil/payCaseCounci const getCommitteeUnderStudyProject = (param) => getAction('/payResearchProject/payResearchProject/listForThree', param) // 工作组在研项目 const getWorkingGroupUnderStudyProject = (param) => getAction('/payResearchProject/payResearchProject/list', param) +// 缴费凭证审核记录 +// const getAuditRecords = (param) => getAction('/paymentCheck/payPaymentCheck/amountReceivedSubList', param) export { queryCommonProjectById, diff --git a/src/views/MessagePage/PaymentVoucher.vue b/src/views/MessagePage/PaymentVoucher.vue index af3530e..ba89d84 100644 --- a/src/views/MessagePage/PaymentVoucher.vue +++ b/src/views/MessagePage/PaymentVoucher.vue @@ -13,10 +13,10 @@ - 应付金额:{{ }}元 + 应付金额:{{ receivableAmount }}元 - 已付金额:{{ }}元 + 已付金额:{{ paidAmount }}元 @@ -29,7 +29,7 @@ rowKey="id" :columns="columns" :dataSource="dataSource" - :pagination="ipagination" + :pagination="false" :loading="loading" @change="handleTableChange" class="j-table-force-nowrap"> @@ -43,26 +43,24 @@ - - - - - - - - @@ -148,26 +152,30 @@ - \ No newline at end of file diff --git a/src/views/MessagePage/modules/PreviewImgModal.vue b/src/views/MessagePage/modules/PreviewImgModal.vue new file mode 100644 index 0000000..de6f348 --- /dev/null +++ b/src/views/MessagePage/modules/PreviewImgModal.vue @@ -0,0 +1,49 @@ + + + + + \ No newline at end of file diff --git a/src/views/MessagePage/modules/ProofInfoModal.vue b/src/views/MessagePage/modules/ProofInfoModal.vue new file mode 100644 index 0000000..87bf1d4 --- /dev/null +++ b/src/views/MessagePage/modules/ProofInfoModal.vue @@ -0,0 +1,142 @@ + + + + + \ No newline at end of file diff --git a/src/views/dataDownload/DataDownload.vue b/src/views/dataDownload/DataDownload.vue index 5a86189..d9cbb25 100644 --- a/src/views/dataDownload/DataDownload.vue +++ b/src/views/dataDownload/DataDownload.vue @@ -160,8 +160,8 @@ export default { font-family: PingFang SC, PingFang SC-Bold; font-weight: 700; color: #069f99; - overflow: hidden; - word-break: keep-all; - text-overflow: ellipsis; + //overflow: hidden; + //word-break: keep-all; + //text-overflow: ellipsis; } \ No newline at end of file diff --git a/src/views/dataMember/DataMember.vue b/src/views/dataMember/DataMember.vue index f418c4a..cccacdf 100644 --- a/src/views/dataMember/DataMember.vue +++ b/src/views/dataMember/DataMember.vue @@ -197,8 +197,8 @@ export default { font-family: PingFang SC, PingFang SC-Bold; font-weight: 700; color: #069f99; - overflow: hidden; - word-break: keep-all; - text-overflow: ellipsis; + //overflow: hidden; + //word-break: keep-all; + //text-overflow: ellipsis; } \ No newline at end of file diff --git a/src/views/mineProject/MineProject.vue b/src/views/mineProject/MineProject.vue index 8fedf7d..7f9ab3d 100644 --- a/src/views/mineProject/MineProject.vue +++ b/src/views/mineProject/MineProject.vue @@ -121,6 +121,7 @@ export default { title: '操作', dataIndex: 'action', align: 'center', + fixed: 'right', scopedSlots: { customRender: 'action' } } ], diff --git a/src/views/subBidCommittee/SubBidCommittee.vue b/src/views/subBidCommittee/SubBidCommittee.vue index b25d96d..38704ff 100644 --- a/src/views/subBidCommittee/SubBidCommittee.vue +++ b/src/views/subBidCommittee/SubBidCommittee.vue @@ -146,9 +146,9 @@ export default { font-family: PingFang SC, PingFang SC-Bold; font-weight: 700; color: #069f99; - overflow: hidden; - word-break: keep-all; - text-overflow: ellipsis; + //overflow: hidden; + //word-break: keep-all; + //text-overflow: ellipsis; } \ No newline at end of file diff --git a/src/views/workTeam/WorkTeam.vue b/src/views/workTeam/WorkTeam.vue index dbba7db..f19902b 100644 --- a/src/views/workTeam/WorkTeam.vue +++ b/src/views/workTeam/WorkTeam.vue @@ -102,41 +102,50 @@ export default { title: '项目名称', dataIndex: 'chargeProject', align: 'center', + width: 200, scopedSlots: { customRender: 'projectName' } }, { title: '项目负责人', dataIndex: 'principalName', align: 'center', + width: 200, scopedSlots: { customRender: 'text' } }, { title: '负责人联系电话', dataIndex: 'principalPhone', align: 'center', + width: 140, scopedSlots: { customRender: 'text' } }, { title: '负责人邮箱', dataIndex: 'principalEmail', align: 'center', + width: 200, scopedSlots: { customRender: 'text' } }, { title: '运行周期', dataIndex: 'operationCycle', align: 'center', + width: 200, scopedSlots: { customRender: 'text' } }, { title: '任务及目标', dataIndex: 'missionAndObjectives', align: 'center', + width: 200, scopedSlots: { customRender: 'text' } }, { title: '缴费凭证状态', dataIndex: 'paymentStatus_dictText', align: 'center', + width: 120, scopedSlots: { customRender: 'text' } }, { title: '操作', dataIndex: 'action', align: 'center', + width: 100, + fixed: 'right', scopedSlots: { customRender: 'action' } } ], @@ -204,8 +213,8 @@ export default { font-family: PingFang SC, PingFang SC-Bold; font-weight: 700; color: #069f99; - overflow: hidden; - word-break: keep-all; - text-overflow: ellipsis; + //overflow: hidden; + //word-break: keep-all; + //text-overflow: ellipsis; } \ No newline at end of file