فهرست منبع

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

lilei 3 ماه پیش
والد
کامیت
0d90e27477

+ 1 - 1
src/views/reportData/tireSubsidyReport/incrementalSubsidyList.vue

@@ -278,8 +278,8 @@ export default {
       this.queryParam.dealer.districtSn = undefined
       this.queryParam.subareaArea.subareaSn = ''
       this.queryParam.subareaArea.subareaAreaSn = ''
+      this.queryParam.belongDealerSn = undefined // 客户sn
       this.queryParam.dealerName = undefined
-      this.queryParam.dealeSn = undefined
       this.$refs.subarea.clearData()
       this.$refs.custList.resetForm()
       this.totalData = null

+ 2 - 2
src/views/reportData/tireSubsidyReport/incrementalSubsidyYearList.vue

@@ -111,8 +111,8 @@
           <!-- 统计 -->
           <template slot="footer">
             <a-row :gutter="15">
-              <a-col :md="4" :sm="24">总部合计数量:{{ (totalData && (totalData.headTotalQty || totalData.headTotalQty==0)) ? toThousands(totalData.headTotalQty): '--' }}</a-col>
-              <a-col :md="4" :sm="24">合计订货数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? toThousands(totalData.totalQty): '--' }}</a-col>
+              <a-col :md="4" :sm="24">总部合计数量:{{ (totalData && (totalData.headTotalQty || totalData.headTotalQty==0)) ? totalData.headTotalQty: '--' }}</a-col>
+              <a-col :md="4" :sm="24">合计订货数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty: '--' }}</a-col>
               <a-col :md="4" :sm="24">增量已贴金额:{{ (totalData && (totalData.settleAmountFinish || totalData.settleAmountFinish==0)) ? toThousands(totalData.settleAmountFinish): '--' }}</a-col>
               <a-col :md="4" :sm="24">剩余增量补贴金额:{{ (totalData && (totalData.settleAmountWait || totalData.settleAmountWait==0)) ? toThousands(totalData.settleAmountWait): '--' }}</a-col>
             </a-row>

+ 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
     }
   },
@@ -358,11 +360,13 @@ export default {
     exportList () {
       const _this = this
       const params = JSON.parse(JSON.stringify(_this.queryParam))
+      _this.$store.state.app.curActionPermission = 'M_tireSubsidyExport'
       _this.exportLoading = true
       _this.spinning = true
       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
     }
   },
@@ -288,12 +290,14 @@ export default {
       const params = JSON.parse(JSON.stringify(_this.queryParam))
       params.bizYear = params.queryDate.split('-')[0]
       params.bizMonth = params.queryDate.split('-')[1]
+      _this.$store.state.app.curActionPermission = 'M_tireSubsidyExport'
       delete params.queryDate
       _this.exportLoading = true
       _this.spinning = true
       hdExportExcel(subsidyMonthExport, params, '轮胎服务费运费报表(' + this.queryParam.queryDate + '月份)-', function () {
         _this.exportLoading = false
         _this.spinning = false
+        _this.$store.state.app.curActionPermission = ''
       })
     },
     // 初始化

+ 11 - 11
src/views/setting/tireSubsidySetting/addSubsidyList.vue

@@ -212,22 +212,22 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '5%', align: 'center' },
-        { title: '创建时间', dataIndex: 'createDate', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '创建时间', dataIndex: 'createDate', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '区域', dataIndex: 'subareaArea.subareaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '14%', align: 'center', scopedSlots: { customRender: 'customName' }, ellipsis: true },
-        { title: '开始' + (_this.pageType === 'SUBSIDY_QUARTER_FEE' ? '季度' : '年份'), dataIndex: 'ruleStartDate', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '结束' + (_this.pageType === 'SUBSIDY_QUARTER_FEE' ? '季度' : '年份'), dataIndex: 'ruleEndDate', width: '14%', align: 'center', scopedSlots: { customRender: 'endDate' } },
+        { title: '客户名称', dataIndex: 'dealerEntity.dealerName', width: '15%', align: 'center', scopedSlots: { customRender: 'customName' }, ellipsis: true },
+        { title: '开始' + (_this.pageType === 'SUBSIDY_QUARTER_FEE' ? '季度' : '年份'), dataIndex: 'ruleStartDate', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '结束' + (_this.pageType === 'SUBSIDY_QUARTER_FEE' ? '季度' : '年份'), dataIndex: 'ruleEndDate', width: '13%', align: 'center', scopedSlots: { customRender: 'endDate' } },
         { title: '增量补贴(' + (_this.pageType === 'SUBSIDY_QUARTER_FEE' ? '季度)' : '年度)'),
           children: [
-            { title: '1阶目标(条)', dataIndex: 'ruleTarget1', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-            { title: '1阶补贴(元)', dataIndex: 'ruleValue1', width: '13%', align: 'right', customRender: text => { return (text || text == 0) ? _this.toThousands(text) : '--' } },
-            { title: '2阶目标(条)', dataIndex: 'ruleTarget2', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-            { title: '2阶补贴(元)', dataIndex: 'ruleValue2', width: '13%', align: 'right', customRender: text => { return (text || text == 0) ? _this.toThousands(text) : '--' } },
-            { title: '3阶目标(条)', dataIndex: 'ruleTarget3', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-            { title: '3阶补贴(元)', dataIndex: 'ruleValue3', width: '13%', align: 'right', customRender: text => { return (text || text == 0) ? _this.toThousands(text) : '--' } }
+            { title: '1阶目标(条)', dataIndex: 'ruleTarget1', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+            { title: '1阶补贴(元)', dataIndex: 'ruleValue1', width: '12%', align: 'right', customRender: text => { return (text || text == 0) ? _this.toThousands(text) : '--' } },
+            { title: '2阶目标(条)', dataIndex: 'ruleTarget2', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+            { title: '2阶补贴(元)', dataIndex: 'ruleValue2', width: '12%', align: 'right', customRender: text => { return (text || text == 0) ? _this.toThousands(text) : '--' } },
+            { title: '3阶目标(条)', dataIndex: 'ruleTarget3', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+            { title: '3阶补贴(元)', dataIndex: 'ruleValue3', width: '12%', align: 'right', customRender: text => { return (text || text == 0) ? _this.toThousands(text) : '--' } }
           ] },
-        { title: '状态', dataIndex: 'statusDictValue', width: '11%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '状态', dataIndex: 'statusDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '11%', align: 'center' }
       ]
       return arr

+ 1 - 1
src/views/setting/tireSubsidySetting/index.vue

@@ -23,7 +23,7 @@ import costCollectionList from './costCollectionList.vue'
 import addSubsidyList from './addSubsidyList.vue'
 
 export default {
-  name: 'TireFeeReportIndex',
+  name: 'TireSubsidySetting',
   mixins: [commonMixin],
   components: { costCollectionList, addSubsidyList },
   data () {