diff --git a/src/views/components/index/TopCenterCard.vue b/src/views/components/index/TopCenterCard.vue index 8df266c..adb10c3 100644 --- a/src/views/components/index/TopCenterCard.vue +++ b/src/views/components/index/TopCenterCard.vue @@ -26,7 +26,7 @@
本 年
-
{{ formatValue(yingshouObj.lastReceivablesDate) }}
+
{{ formatValue(yingshouObj.LastReceivablesDate) }}
上一年
@@ -181,6 +181,7 @@ import { getAction } from '@/api/manage' // 获取总支出 async zongzhichu() { const res = await getAction(`/contract/bigscreen/expenditureSum`) + console.log('总支出', res) this.zongzhichuObj = res.data }, // 获取毛利润 diff --git a/src/views/contract/config/salesContract.js b/src/views/contract/config/salesContract.js index c25ac75..786f9d6 100644 --- a/src/views/contract/config/salesContract.js +++ b/src/views/contract/config/salesContract.js @@ -12,9 +12,9 @@ export const typeUrls = { export const searchItems = [ { label: "", prop: "keyword", placeholder: "媒体位置/乙方名称/订单编号/项目名称/甲方名称", isExtend: false }, { label: "客户名称", prop: "clientId", placeholder: "请选择", type: 'selector', isExtend: true, available: false }, - { label: "媒体类型", prop: "mediaId", placeholder: "请选择", type: 'selector', isExtend: true, available: false}, + { label: "媒体类型", prop: "mediaId", placeholder: "请选择", type: 'selector', isExtend: true, available: false }, { label: "甲方", prop: "firstId", placeholder: "请选择", isExtend: true, available: false }, - { label: "城市", prop: "cityId", placeholder: "请选择", type: 'multiSelector', isExtend: true, available: false}, + { label: "城市", prop: "cityId", placeholder: "请选择", type: 'multiSelector', isExtend: true, available: false }, { label: "是否逾期", prop: "isOverdue", placeholder: "请选择", type: 'selector', isExtend: true, available: false }, { label: "是否比稿", prop: "isCompet", placeholder: "请选择", type: 'selector', isExtend: true, available: false }, { label: "时间范围", prop: "timesRange", placeholder: "请选择", isExtend: true, available: false }, @@ -236,7 +236,7 @@ export const tableColumns = [ width: [190, 210], }, { - title: "其他返点", + title: "其他返点1", dataIndex: "otherReverPoit", dataIndexType: "media", align: "right", @@ -244,13 +244,29 @@ export const tableColumns = [ width: [102, 135], }, { - title: "其他返点金额", + title: "其他返点2", + dataIndex: "otherReverPoit2", + dataIndexType: "media", + align: "right", + isCheck: false, + width: [102, 135], + }, + { + title: "其他返点金额1", dataIndex: "otherReverMoney", dataIndexType: "media", align: "right", isCheck: false, width: [190, 210], }, + { + title: "其他返点金额2", + dataIndex: "otherReverMoney2", + dataIndexType: "media", + align: "right", + isCheck: false, + width: [190, 210], + }, // { // title: "合同盖章时间", // dataIndex: "contrantSealTime", diff --git a/src/views/contract/detail/AESalesContract.vue b/src/views/contract/detail/AESalesContract.vue index 3fc1b68..54c4f72 100644 --- a/src/views/contract/detail/AESalesContract.vue +++ b/src/views/contract/detail/AESalesContract.vue @@ -138,7 +138,7 @@ - + + @@ -463,7 +480,7 @@ export default { const sums = []; columns.forEach((column, index) => { let total = "N/A"; - if (![8, 11, 12, 15, 17].includes(index)) { + if (![8, 11, 12, 15, 17, 19].includes(index)) { return; } const values = data.map((item) => Number(item[column.property])); diff --git a/src/views/contract/detail/AEprocurementContract.vue b/src/views/contract/detail/AEprocurementContract.vue index 08fe4d3..78b7df0 100644 --- a/src/views/contract/detail/AEprocurementContract.vue +++ b/src/views/contract/detail/AEprocurementContract.vue @@ -1,62 +1,37 @@