Browse Source

bug修复

chenrui 3 years ago
parent
commit
cb5e9bfcd3
2 changed files with 4 additions and 49 deletions
  1. 2 12
      src/api/reportData.js
  2. 2 37
      src/views/reportData/chainSalesDetailsCountReport/list.vue

+ 2 - 12
src/api/reportData.js

@@ -363,25 +363,15 @@ export const reportCustomerSalesBillDetailExport = params => {
     responseType: 'blob'
   })
 }
-// 连锁销售明细合计报表  列表 分页
+// 连锁销售明细合计报表  列表 分页
 export const reportSalesBillDetailTotalList = (params) => {
-  const url = `/report/reportSalesBillDetailTotal/reportPage/${params.pageNo}/${params.pageSize}`
-  delete params.pageNo
-  delete params.pageSize
+  const url = `/report/reportSalesBillDetailTotal/report`
   return axios({
     url: url,
     data: params,
     method: 'post'
   })
 }
-// 连锁销售明细合计报表 合计
-export const reportSalesBillDetailTotalCount = (params) => {
-  return axios({
-    url: '/report/reportSalesBillDetailTotal/reportCount',
-    data: params,
-    method: 'post'
-  })
-}
 // 连锁销售明细合计报表  导出
 export const reportSalesBillDetailTotalExport = params => {
   return axios.request({

+ 2 - 37
src/views/reportData/chainSalesDetailsCountReport/list.vue

@@ -58,26 +58,8 @@
         :columns="columns"
         :data="loadData"
         :defaultLoadData="false"
+        :showPagination="false"
         bordered>
-        <template slot="footer">
-          <a-row>
-            <a-col span="2">合计:</a-col>
-            <a-col span="22">
-              <a-row>
-                <a-col span="4">滤清器:{{ (totalData && (totalData.lqqAmount || totalData.lqqAmount==0)) ? totalData.lqqAmount : '--' }}</a-col>
-                <a-col span="4">雨刮片:{{ (totalData && (totalData.ygpAmount || totalData.ygpAmount==0)) ? totalData.ygpAmount : '--' }}</a-col>
-                <a-col span="4">刹车片:{{ (totalData && (totalData.scpAmount || totalData.scpAmount==0)) ? totalData.scpAmount : '--' }}</a-col>
-                <a-col span="4">蓄电池:{{ (totalData && (totalData.xdcAmount || totalData.xdcAmount==0)) ? totalData.xdcAmount : '--' }}</a-col>
-                <a-col span="4">润滑油:{{ (totalData && (totalData.rhyAmount || totalData.rhyAmount==0)) ? totalData.rhyAmount : '--' }}</a-col>
-                <a-col span="4">火花塞:{{ (totalData && (totalData.hhsAmount || totalData.hhsAmount==0)) ? totalData.hhsAmount : '--' }}</a-col>
-                <a-col span="4">点火线圈:{{ (totalData && (totalData.dhxqAmount || totalData.dhxqAmount==0)) ? totalData.dhxqAmount : '--' }}</a-col>
-                <a-col span="4">LED灯:{{ (totalData && (totalData.ledAmount || totalData.ledAmount==0)) ? totalData.ledAmount : '--' }}</a-col>
-                <a-col span="4">其他:{{ (totalData && (totalData.otherAmount || totalData.otherAmount==0)) ? totalData.otherAmount : '--' }}</a-col>
-                <a-col span="4">合计:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? totalData.totalAmount : '--' }}</a-col>
-              </a-row>
-            </a-col>
-          </a-row>
-        </template>
       </s-table>
     </a-spin>
   </a-card>
@@ -87,7 +69,7 @@
 import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import { downloadExcel } from '@/libs/JGPrint.js'
-import { reportSalesBillDetailTotalList, reportSalesBillDetailTotalCount, reportSalesBillDetailTotalExport, linkageGroupList } from '@/api/reportData'
+import { reportSalesBillDetailTotalList, reportSalesBillDetailTotalExport, linkageGroupList } from '@/api/reportData'
 export default {
   components: { STable, VSelect, rangeDate },
   data () {
@@ -103,7 +85,6 @@ export default {
         endDate: ''
       },
       rules: {
-        // 'tenantId': [{ required: true, message: '请选择连锁店', trigger: 'change' }],
         'time': [{ required: true, message: '请选择审核日期', trigger: 'change' }]
       },
       disabled: false, //  查询、重置按钮是否可操作
@@ -131,12 +112,6 @@ export default {
           let data
           if (res.status == 200) {
             data = res.data
-            // 总计
-            this.getCount(params)
-            const no = (data.pageNo - 1) * data.pageSize
-            for (var i = 0; i < data.list.length; i++) {
-              data.list[i].no = no + i + 1
-            }
             this.disabled = false
           }
           this.spinning = false
@@ -154,16 +129,6 @@ export default {
       this.queryParam.beginDate = date[0] || ''
       this.queryParam.endDate = date[1] || ''
     },
-    // 合计
-    getCount (params) {
-      reportSalesBillDetailTotalCount(params).then(res => {
-        if (res.status == 200) {
-          this.totalData = res.data
-        } else {
-          this.totalData = null
-        }
-      })
-    },
     //  查询
     handleSearch () {
       this.$refs.ruleForm.validate(valid => {