chenrui 3 månader sedan
förälder
incheckning
c9923ab929

+ 11 - 2
src/views/reportData/tireSubsidyReport/incrementalSubsidyList.vue

@@ -83,6 +83,15 @@
           :pagination="{pageSizeOptions: ['20','50','100','200','500']}"
           :defaultLoadData="false"
           bordered>
+          <!-- 季度增量补贴 -->
+          <template slot="subsidyAmount" slot-scope="text, record">
+            <span v-if="record.subsidyAmount||record.subsidyAmount==0">
+              <span v-if="record.subsidyAmount>=0">{{ record.subsidyAmount }}</span>
+              <span style="color:#ED1C24;" v-else>{{ record.subsidyAmount }}</span>
+            </span>
+            <span v-else>--</span>
+          </template>
+          <!-- 统计 -->
           <template slot="footer">
             <a-row :gutter="15">
               <a-col :md="4" :sm="24">合计订货数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty: '--' }}</a-col>
@@ -194,8 +203,8 @@ export default {
         { title: '总部退货数量', dataIndex: 'returnQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '合计订货数量', dataIndex: 'totalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '季度目标', dataIndex: 'subsidyTarget', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '季度增量补贴', dataIndex: 'subsidyValue', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '增量补贴金额', dataIndex: 'subsidyAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '季度增量补贴', dataIndex: 'subsidyValue', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '增量补贴金额', dataIndex: 'subsidyAmount', width: '10%', align: 'right', scopedSlots: { customRender: 'subsidyAmount' } }
       ]
       return arr
     }

+ 20 - 3
src/views/reportData/tireSubsidyReport/incrementalSubsidyYearList.vue

@@ -93,6 +93,23 @@
           :pagination="{pageSizeOptions: ['20','50','100','200','500']}"
           :defaultLoadData="false"
           bordered>
+          <!-- 季度增量补贴 -->
+          <template slot="subsidyAmount" slot-scope="text, record">
+            <span v-if="record.subsidyAmount||record.subsidyAmount==0">
+              <span v-if="record.subsidyAmount>=0">{{ record.subsidyAmount }}</span>
+              <span style="color:#ED1C24;" v-else>{{ record.subsidyAmount }}</span>
+            </span>
+            <span v-else>--</span>
+          </template>
+          <!-- 剩余增量补贴金额 -->
+          <template slot="settleAmountWait" slot-scope="text, record">
+            <span v-if="record.settleAmountWait||record.settleAmountWait==0">
+              <span style="color:#ED1C24;" v-if="record.subsidyAmount>0">{{ record.subsidyAmount }}</span>
+              <span v-else>{{ record.subsidyAmount }}</span>
+            </span>
+            <span v-else>--</span>
+          </template>
+          <!-- 统计 -->
           <template slot="footer">
             <a-row :gutter="15">
               <a-col :md="4" :sm="24">增量已贴金额:{{ (totalData && (totalData.settleAmountFinish || totalData.settleAmountFinish==0)) ? toThousands(totalData.settleAmountFinish): '--' }}</a-col>
@@ -207,10 +224,10 @@ export default {
         { title: '总部退货数量', dataIndex: 'returnQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '合计订货数量', dataIndex: 'totalQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '年度目标', dataIndex: 'subsidyTarget', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '年度增量补贴', dataIndex: 'subsidyValue', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '增量补贴金额', dataIndex: 'subsidyAmount', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '年度增量补贴', dataIndex: 'subsidyValue', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '增量补贴金额', dataIndex: 'subsidyAmount', width: '10%', align: 'right', scopedSlots: { customRender: 'subsidyAmount' } },
         { title: '增量已补金额', dataIndex: 'settleAmountFinish', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '剩余增量补贴金额', dataIndex: 'settleAmountWait', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '剩余增量补贴金额', dataIndex: 'settleAmountWait', width: '10%', align: 'right', scopedSlots: { customRender: 'settleAmountWait' } }
       ]
       return arr
     }

+ 2 - 1
src/views/reportData/tireSubsidyReport/serviceFreightDetailList.vue

@@ -124,7 +124,8 @@
           :style="{ height: tableHeight+70+'px' }"
           :columns="columns"
           :data="loadData"
-          :scroll="{ y: tableHeight-120}"
+          :pageSize="30"
+          :scroll="{ y: tableHeight-50}"
           :defaultLoadData="false"
           bordered>
           <template slot="footer">