chenrui 10 месяцев назад
Родитель
Сommit
cbaf605d76

+ 3 - 3
src/views/reportData/tireFeeReport/monthQueryList.vue

@@ -85,7 +85,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                v-if="$hasPermissions('B_tireReportExport')"
+                v-if="$hasPermissions('B_tireFeeExport')"
                 id="monthQueryList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
@@ -171,12 +171,12 @@ export default {
         queryType: 'month', // 轮胎月度费用报表
         beginDate: this.getMonthDetailDay().firstDay, // 开始时间
         endDate: this.getMonthDetailDay().lastDay, // 结束时间
-       
+
         dealerLevel: undefined, // 客户等级
         customSn: undefined, // 客户sn
         parentDealerSn: undefined, // 轮胎省仓sn
         dealerEntity: {
-          dealerName: undefined,// 客户名称
+          dealerName: undefined, // 客户名称
           provinceSn: undefined, // 省
           citySn: undefined, // 市
           districtSn: undefined // 区

+ 5 - 5
src/views/reportData/tireFeeReport/quarterQueryList.vue

@@ -62,7 +62,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                v-if="$hasPermissions('B_tireReportExport')"
+                v-if="$hasPermissions('B_tireFeeExport')"
                 id="quarterQueryList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
@@ -95,10 +95,10 @@
             <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.rebatePointsSys || totalData.rebatePointsSys==0)) ? (totalData.rebatePointsSys*100).toFixed(2)+'%': '--' }}</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-col :md="4" :sm="24">平台返利金额:{{ (totalData && (totalData.rebateAmountSys || totalData.rebateAmountSys==0)) ? toThousands(totalData.rebateAmountSys): '--' }}</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
@@ -148,7 +148,7 @@ export default {
         },
         customSn: undefined, // 客户sn
         dealerEntity: {
-          dealerName: undefined,// 客户名称
+          dealerName: undefined, // 客户名称
           provinceSn: undefined, // 省
           citySn: undefined, // 市
           districtSn: undefined // 区

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

@@ -72,7 +72,7 @@
                 @click="handleExport"
                 :disabled="disabled"
                 :loading="exportLoading"
-                v-if="$hasPermissions('B_tireReportExport')"
+                v-if="$hasPermissions('B_tireFeeExport')"
                 id="yearQueryList-export">导出</a-button>
               <a @click="advanced=!advanced" style="margin-left: 5px">
                 {{ advanced ? '收起' : '展开' }}
@@ -103,13 +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.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>
+            <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.rebatePointsSys || totalData.rebatePointsSys==0)) ? (totalData.rebatePointsSys*100).toFixed(2)+'%': '--' }}</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.rebateAmountSys || totalData.rebateAmountSys==0)) ? toThousands(totalData.rebateAmountSys): '--' }}</a-col>
+            </a-row>
           </template>
         </s-table>
       </a-spin>
@@ -156,7 +156,7 @@ export default {
           subareaAreaSn: '' // 分区
         },
         dealerEntity: {
-          dealerName: undefined ,// 客户名称
+          dealerName: undefined, // 客户名称
           provinceSn: undefined, // 省
           citySn: undefined, // 市
           districtSn: undefined // 区