chenrui 3 kuukautta sitten
vanhempi
commit
472c30fd2e

+ 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>

+ 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 () {