chenrui 10 ماه پیش
والد
کامیت
d7cc7bdc40
2فایلهای تغییر یافته به همراه19 افزوده شده و 13 حذف شده
  1. 10 7
      src/views/reportData/tireFeeReport/quarterQueryList.vue
  2. 9 6
      src/views/reportData/tireFeeReport/yearQueryList.vue

+ 10 - 7
src/views/reportData/tireFeeReport/quarterQueryList.vue

@@ -93,12 +93,15 @@
           </template>
           <template slot="footer">
             <a-row :gutter="15">
-              <a-col :md="4" :sm="24">广宣品费用:{{ (totalData && (totalData.posterAmount || totalData.posterAmount==0)) ? toThousands(totalData.posterAmount): '--' }}</a-col>
-              <a-col :md="4" :sm="24">平台返利金额:{{ (totalData && (totalData.outAmount || totalData.outAmount==0)) ? toThousands(totalData.outAmount): '--' }}</a-col>
-              <a-col :md="4" :sm="24">省仓返利金额:{{ (totalData && (totalData.rebateAmountProvince || totalData.rebateAmountProvince==0)) ? toThousands(totalData.rebateAmountProvince): '--' }}</a-col>
+              <a-col :md="4" :sm="24">轮胎省仓返利金额:{{ (totalData && (totalData.rebateAmountProvince || totalData.rebateAmountProvince==0)) ? toThousands(totalData.rebateAmountProvince): '--' }}</a-col>
+              <a-col :md="4" :sm="24">平台出库数量:{{ (totalData && (totalData.outQty || totalData.outQty==0)) ? totalData.outQty: '--' }}</a-col>
+              <a-col :md="4" :sm="24">平台返利点数:{{ (totalData && (totalData.rebatePointProvince || totalData.rebatePointProvince==0)) ? toThousands(totalData.rebatePointProvince): '--' }}</a-col>
+              <a-col :md="4" :sm="24">开单金额:{{ (totalData && (totalData.outAmount || totalData.outAmount==0)) ? toThousands(totalData.outAmount): '--' }}</a-col>
+              <a-col :md="4" :sm="24">平台返利金额:{{ (totalData && (totalData.rebateAmountProvince || totalData.rebateAmountProvince==0)) ? toThousands(totalData.rebateAmountProvince): '--' }}</a-col>
+              <a-col :md="4" :sm="24"><a-tooltip placement='top' title='开单金额合计*1.5%'>广宣品费用&nbsp;<a-icon type="question-circle" /></a-tooltip>:{{ (totalData && (totalData.posterAmount || totalData.posterAmount==0)) ? toThousands(totalData.posterAmount): '--' }}</a-col>
             </a-row>
           </template>
-        </s-table>
+        </s-table>s
       </a-spin>
     </a-card>
     <!-- 导出提示框 -->
@@ -143,12 +146,12 @@ export default {
         districtSn: undefined, // 区
         dealerLevel: undefined, // 客户级别
         subareaArea: {
-          subareaSn: undefined, // 区域
-          subareaAreaSn: undefined // 分区
+          subareaSn: '', // 区域
+          subareaAreaSn: '' // 分区
         },
         customSn: undefined, // 客户sn
         dealerEntity: {
-          dealerName: undefined // 客户名称
+          dealerName: undefined// 客户名称
         },
         provinceFlag: '1'// 是轮胎省仓
       },

+ 9 - 6
src/views/reportData/tireFeeReport/yearQueryList.vue

@@ -103,10 +103,13 @@
             {{ record.dealerEntity.provinceName }}{{ '/'+record.dealerEntity.cityName }}{{ '/'+record.dealerEntity.districtName }}
           </template>
           <template slot="footer">
-            <a-row :gutter="15">
-              <a-col :md="4" :sm="24">平台返利金额:{{ (totalData && (totalData.outAmount || totalData.outAmount==0)) ? toThousands(totalData.outAmount): '--' }}</a-col>
-              <a-col :md="4" :sm="24">省仓返利金额:{{ (totalData && (totalData.rebateAmountProvince || totalData.rebateAmountProvince==0)) ? toThousands(totalData.rebateAmountProvince): '--' }}</a-col>
-            </a-row>
+             <a-row :gutter="15">
+               <a-col :md="4" :sm="24">轮胎省仓返利金额:{{ (totalData && (totalData.rebateAmountProvince || totalData.rebateAmountProvince==0)) ? toThousands(totalData.rebateAmountProvince): '--' }}</a-col>
+               <a-col :md="4" :sm="24">平台出库数量:{{ (totalData && (totalData.outQty || totalData.outQty==0)) ? totalData.outQty: '--' }}</a-col>
+               <a-col :md="4" :sm="24">平台返利点数:{{ (totalData && (totalData.rebatePointProvince || totalData.rebatePointProvince==0)) ? toThousands(totalData.rebatePointProvince): '--' }}</a-col>
+               <a-col :md="4" :sm="24">开单金额:{{ (totalData && (totalData.outAmount || totalData.outAmount==0)) ? toThousands(totalData.outAmount): '--' }}</a-col>
+               <a-col :md="4" :sm="24">平台返利金额:{{ (totalData && (totalData.rebateAmountProvince || totalData.rebateAmountProvince==0)) ? toThousands(totalData.rebateAmountProvince): '--' }}</a-col>
+             </a-row>
           </template>
         </s-table>
       </a-spin>
@@ -152,8 +155,8 @@ export default {
         dealerLevel: undefined, // 客户等级
         customSn: undefined, // 客户sn
         subareaArea: {
-          subareaSn: undefined, // 区域
-          subareaAreaSn: undefined // 分区
+          subareaSn: '', // 区域
+          subareaAreaSn: '' // 分区
         },
         dealerEntity: {
           dealerName: undefined // 客户名称