Selaa lähdekoodia

Merge branch 'develop_yh41' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh41

chenrui 1 vuosi sitten
vanhempi
commit
5e9b1334d1
1 muutettua tiedostoa jossa 13 lisäystä ja 6 poistoa
  1. 13 6
      src/views/reportData/promotionSalesOrderReport/list.vue

+ 13 - 6
src/views/reportData/promotionSalesOrderReport/list.vue

@@ -156,19 +156,26 @@
                     v-if="$hasPermissions('M_promotionSalesOrderReportList_salesPrice')">未参与活动销售额:{{ (totalData.notpromotionSale || totalData.notpromotionSale==0) ? toThousands(totalData.notpromotionSale) : '--' }}</a-col>
                   <a-col
                     span="4"
-                    v-if="$hasPermissions('M_promotionSalesOrderReportList_costPrice')">调拨物料成本费用:{{ (totalData.allocateCost || totalData.allocateCost==0) ? toThousands(totalData.allocateCost) : '--' }}</a-col>
+                    v-if="$hasPermissions('M_promotionSalesOrderReportList_costPrice')">产品赠品成本费用:{{ (totalData.allocateGiftCost || totalData.allocateGiftCost==0) ? toThousands(totalData.allocateGiftCost) : '--' }}</a-col>
                   <a-col
                     span="4"
-                    v-if="$hasPermissions('M_promotionSalesOrderReportList_salesPrice')">调拨物料销售费用:{{ (totalData.allocateSaleAmount || totalData.allocateSaleAmount==0) ? toThousands(totalData.allocateSaleAmount) : '--' }}</a-col>
+                    v-if="$hasPermissions('M_promotionSalesOrderReportList_salesPrice')">产品赠品销售费用:{{ (totalData.allocateGiftAmount || totalData.allocateGiftAmount==0) ? toThousands(totalData.allocateGiftAmount) : '--' }}</a-col>
                   <a-col
                     span="4"
-                    v-if="$hasPermissions('M_promotionSalesOrderReportList_costPrice')">促销成本费用+物料成本费用合计:{{ (totalData.promoCostFeeAndAllocateCost || totalData.promoCostFeeAndAllocateCost==0)? toThousands(totalData.promoCostFeeAndAllocateCost) : '--' }}</a-col>
+                    v-if="$hasPermissions('M_promotionSalesOrderReportList_costPrice')">物料赠品成本费用:{{ (totalData.allocateCost || totalData.allocateCost==0) ? toThousands(totalData.allocateCost) : '--' }}</a-col>
+                  <a-col
+                    span="4"
+                    v-if="$hasPermissions('M_promotionSalesOrderReportList_salesPrice')">物料赠品销售费用:{{ (totalData.allocateSaleAmount || totalData.allocateSaleAmount==0) ? toThousands(totalData.allocateSaleAmount) : '--' }}</a-col>
+
+                  <a-col
+                    span="4"
+                    v-if="$hasPermissions('M_promotionSalesOrderReportList_costPrice')">成本费用合计(促销+产品+物料):{{ (totalData.promoCostFeeAndAllocateCost || totalData.promoCostFeeAndAllocateCost==0)? toThousands(totalData.promoCostFeeAndAllocateCost) : '--' }}</a-col>
                   <a-col
                     span="4"
                     v-if="$hasPermissions('M_promotionSalesOrderReportList_costPrice')">成本合计占比:{{ totalData.totalCostRate ? (totalData.totalCostRate*100).toFixed(2)+'%' : '--' }}</a-col>
                   <a-col
                     span="4"
-                    v-if="$hasPermissions('M_promotionSalesOrderReportList_salesPrice')">促销销售费用+物料销售费用合计:{{ (totalData.promoSaleFeeAndAllocateAmount || totalData.promoSaleFeeAndAllocateAmount==0) ? toThousands(totalData.promoSaleFeeAndAllocateAmount) : '--' }}</a-col>
+                    v-if="$hasPermissions('M_promotionSalesOrderReportList_salesPrice')">销售费用合计(促销+产品+物料):{{ (totalData.promoSaleFeeAndAllocateAmount || totalData.promoSaleFeeAndAllocateAmount==0) ? toThousands(totalData.promoSaleFeeAndAllocateAmount) : '--' }}</a-col>
                   <a-col
                     span="4"
                     v-if="$hasPermissions('M_promotionSalesOrderReportList_salesPrice')">销售合计占比:{{ totalData.totalSaleRate ? (totalData.totalSaleRate*100).toFixed(2)+'%' : '--' }}</a-col>
@@ -287,9 +294,9 @@ export default {
         { title: '产品赠品销售费用', dataIndex: 'allocateGiftAmount', show: isSellFlag, width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
         { title: '物料赠品成本费用', dataIndex: 'allocateCost', show: isCostFlag, width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
         { title: '物料赠品销售费用', dataIndex: 'allocateSaleAmount', show: isSellFlag, width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
-        { title: '促销成本费用+产品/物料成本费用', dataIndex: 'promoCostFeeAndAllocateCost', show: isCostFlag, width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
+        { title: '成本费用合计(促销+产品+物料)', dataIndex: 'promoCostFeeAndAllocateCost', show: isCostFlag, width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
         { title: '成本合计占比', dataIndex: 'totalCostRate', show: isCostFlag, width: '60px', align: 'center', customRender: text => (text ? (text * 100).toFixed(2) + '%' : '--') },
-        { title: '促销销售费用+产品/物料销售费用', dataIndex: 'promoSaleFeeAndAllocateAmount', show: isSellFlag, width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
+        { title: '销售费用合计(促销+产品+物料)', dataIndex: 'promoSaleFeeAndAllocateAmount', show: isSellFlag, width: '80px', align: 'right', customRender: text => ((text || text == 0) ? _this.toThousands(text) : '--') },
         { title: '销售合计占比', dataIndex: 'totalSaleRate', show: isSellFlag, width: '60px', align: 'center', customRender: text => (text ? (text * 100).toFixed(2) + '%' : '--') }
       ]