chenrui 3 hónapja
szülő
commit
337c63d6e3

+ 7 - 3
src/views/reportData/tireSubsidyReport/serviceFreightDetailList.vue

@@ -130,7 +130,7 @@
           bordered>
           <template slot="footer">
             <a-row :gutter="15">
-              <a-col :md="6" :sm="24">服务费金额:{{ (totalData && (totalData.subsidyServiceAmount || totalData.subsidyServiceAmount==0)) ? toThousands(totalData.subsidyServiceAmount): '--' }}</a-col>
+              <a-col :md="6" :sm="24" v-if="$hasPermissions('M_tireSubsidyList_salesPrice')">服务费金额:{{ (totalData && (totalData.subsidyServiceAmount || totalData.subsidyServiceAmount==0)) ? toThousands(totalData.subsidyServiceAmount): '--' }}</a-col>
               <a-col :md="6" :sm="24">运费补贴金额:{{ (totalData && (totalData.subsidyShippingAmount || totalData.subsidyShippingAmount==0)) ? toThousands(totalData.subsidyShippingAmount): '--' }}</a-col>
             </a-row>
           </template>
@@ -243,15 +243,17 @@ export default {
         { title: '记账主体', dataIndex: 'belongDealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '轮胎省仓', dataIndex: 'belongProvinceFlagDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售数量', dataIndex: 'bizQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '销售金额', dataIndex: 'bizAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '服务费比例', dataIndex: 'subsidyServiceDiff', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text * 100) + '%' : '--') } },
-        { title: '服务费金额', dataIndex: 'subsidyServiceAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '运费补贴', dataIndex: 'subsidyShippingDiff', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '运费补贴金额', dataIndex: 'subsidyShippingAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '客户名称', dataIndex: 'bizDealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         // { title: '发货经销商', dataIndex: 'transferDealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '业务类型', dataIndex: 'bizTypeDictValue', width: '100px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
       ]
+      if (_this.$hasPermissions('M_tireSubsidyList_salesPrice')) {
+        arr.splice(8, 0, { title: '销售金额', dataIndex: 'bizAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(10, 0, { title: '服务费金额', dataIndex: 'subsidyServiceAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
       return arr
     }
   },
@@ -360,9 +362,11 @@ export default {
       const params = JSON.parse(JSON.stringify(_this.queryParam))
       _this.exportLoading = true
       _this.spinning = true
+      _this.$store.state.app.curActionPermission = 'M_tireSubsidyExport_salesPrice'
       hdExportExcel(subsidyDetailExport, params, '轮胎服务费运费明细报表-', function () {
         _this.exportLoading = false
         _this.spinning = false
+        _this.$store.state.app.curActionPermission = ''
       })
     },
     // 初始化

+ 8 - 4
src/views/reportData/tireSubsidyReport/serviceFreightList.vue

@@ -90,7 +90,7 @@
           bordered>
           <template slot="footer">
             <a-row :gutter="15">
-              <a-col :md="6" :sm="24">服务费金额合计:{{ (totalData && (totalData.subsidyServiceTotal || totalData.subsidyServiceTotal==0)) ? toThousands(totalData.subsidyServiceTotal): '--' }}</a-col>
+              <a-col :md="6" :sm="24" v-if="$hasPermissions('M_tireSubsidyList_salesPrice')">服务费金额合计:{{ (totalData && (totalData.subsidyServiceTotal || totalData.subsidyServiceTotal==0)) ? toThousands(totalData.subsidyServiceTotal): '--' }}</a-col>
               <a-col :md="6" :sm="24">运费补贴金额合计:{{ (totalData && (totalData.subsidyShippingTotal || totalData.subsidyShippingTotal==0)) ? toThousands(totalData.subsidyShippingTotal): '--' }}</a-col>
             </a-row>
           </template>
@@ -190,13 +190,15 @@ export default {
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'provinceName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '记账主体', dataIndex: 'dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '服务费金额(记)', dataIndex: 'subsidyServiceSales', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '服务费金额(扣)', dataIndex: 'subsidyServiceReturn', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '服务费金额合计', dataIndex: 'subsidyServiceTotal', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '运费补贴金额(记)', dataIndex: 'subsidyShippingSales', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '运费补贴金额(扣)', dataIndex: 'subsidyShippingReturn', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '运费补贴金额合计', dataIndex: 'subsidyShippingTotal', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
+      if (_this.$hasPermissions('M_tireSubsidyList_salesPrice')) {
+        arr.splice(6, 0, { title: '服务费金额(记)', dataIndex: 'subsidyServiceSales', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(7, 0, { title: '服务费金额(扣)', dataIndex: 'subsidyServiceReturn', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '服务费金额合计', dataIndex: 'subsidyServiceTotal', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+      }
       return arr
     }
   },
@@ -291,9 +293,11 @@ export default {
       delete params.queryDate
       _this.exportLoading = true
       _this.spinning = true
+      _this.$store.state.app.curActionPermission = 'M_tireSubsidyExport_salesPrice'
       hdExportExcel(subsidyMonthExport, params, '轮胎服务费运费报表(' + this.queryParam.queryDate + '月份)-', function () {
         _this.exportLoading = false
         _this.spinning = false
+        _this.$store.state.app.curActionPermission = ''
       })
     },
     // 初始化