diff --git a/src/views/contract/config/procurementContract.js b/src/views/contract/config/procurementContract.js index a8be0bf..6e7713f 100644 --- a/src/views/contract/config/procurementContract.js +++ b/src/views/contract/config/procurementContract.js @@ -126,7 +126,7 @@ export const tableColumns = [ width: [190, 210], }, { - title: "数量", + title: "采购数量", dataIndex: "accountNumber", dataIndexType: "media", align: "center", @@ -181,6 +181,14 @@ export const tableColumns = [ isCheck: false, width: [130, 150], }, + { + title: "刊例价单位", + dataIndex: "printPriceUnit", + dataIndexType: "media", + align: "center", + isCheck: false, + width: [130, 150], + }, { title: "折扣", dataIndex: "discount", @@ -197,6 +205,14 @@ export const tableColumns = [ isCheck: false, width: [190, 210], }, + { + title: "媒体费单位", + dataIndex: "mediaFeeUnit", + dataIndexType: "media", + align: "center", + isCheck: false, + width: [190, 210], + }, { title: "制作费", dataIndex: "productFee", diff --git a/src/views/contract/config/salesContract.js b/src/views/contract/config/salesContract.js index 786f9d6..8834f48 100644 --- a/src/views/contract/config/salesContract.js +++ b/src/views/contract/config/salesContract.js @@ -170,6 +170,14 @@ export const tableColumns = [ isCheck: false, width: [130, 150], }, + { + title: "刊例价单位", + dataIndex: "printPriceUnit", + dataIndexType: "media", + align: "center", + isCheck: false, + width: [130, 150], + }, { title: "折扣", dataIndex: "discount", @@ -179,7 +187,7 @@ export const tableColumns = [ width: [78, 102], }, { - title: "媒体费", + title: "订单发布费", dataIndex: "mediaFee", dataIndexType: "media", align: "right", @@ -187,7 +195,7 @@ export const tableColumns = [ width: [190, 210], }, { - title: "制作费", + title: "订单制作费", dataIndex: "productFee", dataIndexType: "media", align: "right", @@ -241,7 +249,7 @@ export const tableColumns = [ dataIndexType: "media", align: "right", isCheck: false, - width: [102, 135], + width: [108, 135], }, { title: "其他返点2", @@ -249,7 +257,7 @@ export const tableColumns = [ dataIndexType: "media", align: "right", isCheck: false, - width: [102, 135], + width: [108, 135], }, { title: "其他返点金额1", diff --git a/src/views/contract/procurementContract.vue b/src/views/contract/procurementContract.vue index 002acfc..10230b4 100644 --- a/src/views/contract/procurementContract.vue +++ b/src/views/contract/procurementContract.vue @@ -602,16 +602,16 @@ export default { sums[1] = '合计' sums[5] = totalEle sums[10] = mediaNumEle - sums[17] = mediaFeeEle - sums[18] = productFeeEle - sums[21] = contractMoneySumEle + sums[18] = mediaFeeEle + sums[20] = productFeeEle + sums[23] = contractMoneySumEle } else { sums[0] = '合计' sums[4] = totalEle sums[9] = mediaNumEle - sums[16] = mediaFeeEle - sums[17] = productFeeEle - sums[20] = contractMoneySumEle + sums[17] = mediaFeeEle + sums[19] = productFeeEle + sums[22] = contractMoneySumEle } return sums; diff --git a/src/views/contract/salesContract.vue b/src/views/contract/salesContract.vue index 7853ae1..a3b037f 100644 --- a/src/views/contract/salesContract.vue +++ b/src/views/contract/salesContract.vue @@ -759,22 +759,22 @@ export default { sums[1] = '合计' sums[2] = totalEle sums[9] = mediaNumEle - sums[16] = mediaFeeEle - sums[17] = productFeeEle - sums[18] = contractMoneySumEle - sums[21] = competReverMoneySumEle - sums[23] = otherReverMoneySumEle - sums[25] = otherReverMoneySumEle2 + sums[17] = mediaFeeEle + sums[18] = productFeeEle + sums[19] = contractMoneySumEle + sums[22] = competReverMoneySumEle + sums[25] = otherReverMoneySumEle + sums[26] = otherReverMoneySumEle2 } else { sums[0] = '合计' sums[1] = totalEle sums[8] = mediaNumEle - sums[15] = mediaFeeEle - sums[16] = productFeeEle - sums[17] = contractMoneySumEle - sums[20] = competReverMoneySumEle - sums[22] = otherReverMoneySumEle - sums[24] = otherReverMoneySumEle2 + sums[16] = mediaFeeEle + sums[17] = productFeeEle + sums[18] = contractMoneySumEle + sums[21] = competReverMoneySumEle + sums[24] = otherReverMoneySumEle + sums[25] = otherReverMoneySumEle2 } return sums;