Browse Source

报表接口对接

lilei 2 năm trước cách đây
mục cha
commit
fb7724ebdc

+ 10 - 1
src/api/salesBillReport.js

@@ -24,7 +24,7 @@ export const salesBillReportGroupByBuyerList = (params) => {
   })
 }
 
-//  开单销售单报表/开单销售报表   合计
+//  开单销售单报表合计
 export const salesBillReportCount = (params) => {
   return axios({
     url: '/report/salesBillReport/totalSaleAmount',
@@ -33,6 +33,15 @@ export const salesBillReportCount = (params) => {
   })
 }
 
+//  开单销售报表合计
+export const salesBillReportCountByBuyer = (params) => {
+  return axios({
+    url: '/report/salesBillReport/totalGroupByBuyer',
+    data: params,
+    method: 'post'
+  })
+}
+
 // 实售销售报表
 export const salesBillRealAmountQueryPageList = (params) => {
   const url = `/report/salesBillReport/realAmountQueryPageGroupByBuyer/${params.pageNo}/${params.pageSize}`

+ 27 - 7
src/views/reportData/actualSalesReport/list.vue

@@ -229,6 +229,13 @@ export default {
                   width: 80,
                   customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
                 },
+                {
+                  title: '变速箱滤清器',
+                  dataIndex: 'jpBsxLqqAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
                 {
                   title: '雨刮片',
                   dataIndex: 'jpYgpAmount',
@@ -286,6 +293,26 @@ export default {
                 }
               ]
             },
+            {
+              title: '稳升',
+              align: 'center',
+              children: [
+                {
+                  title: '点火线圈',
+                  dataIndex: 'wsDhxqAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '灯泡',
+                  dataIndex: 'wsDpAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                }
+              ]
+            },
             {
               title: '汇箭',
               dataIndex: 'hjAmount',
@@ -300,13 +327,6 @@ export default {
               width: 80,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             },
-            {
-              title: '稳升',
-              dataIndex: 'wsAmount',
-              align: 'center',
-              width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
-            },
             {
               title: 'TBU',
               dataIndex: 'tbuAmount',

+ 43 - 10
src/views/reportData/returnGoodsPresentation/list.vue

@@ -226,6 +226,13 @@ export default {
                   width: 80,
                   customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
                 },
+                {
+                  title: '变速箱滤清器',
+                  dataIndex: 'jpBsxLqqAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
                 {
                   title: '雨刮片',
                   dataIndex: 'jpYgpAmount',
@@ -283,6 +290,26 @@ export default {
                 }
               ]
             },
+            {
+              title: '稳升',
+              align: 'center',
+              children: [
+                {
+                  title: '点火线圈',
+                  dataIndex: 'wsDhxqAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '灯泡',
+                  dataIndex: 'wsDpAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                }
+              ]
+            },
             {
               title: '汇箭',
               dataIndex: 'hjAmount',
@@ -297,19 +324,25 @@ export default {
               width: 80,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             },
-            {
-              title: '稳升',
-              dataIndex: 'wsAmount',
-              align: 'center',
-              width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
-            },
             {
               title: 'TBU',
-              dataIndex: 'tbuAmount',
               align: 'center',
-              width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              children: [
+                {
+                  title: '刹车片',
+                  dataIndex: 'tbuScpAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '刹车油',
+                  dataIndex: 'tbuScyAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                }
+              ]
             },
             {
               title: 'TBU-P',

+ 43 - 10
src/views/reportData/returnSlipReport/list.vue

@@ -234,6 +234,13 @@ export default {
                   width: 80,
                   customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
                 },
+                {
+                  title: '变速箱滤清器',
+                  dataIndex: 'jpBsxLqqAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
                 {
                   title: '雨刮片',
                   dataIndex: 'jpYgpAmount',
@@ -291,6 +298,26 @@ export default {
                 }
               ]
             },
+            {
+              title: '稳升',
+              align: 'center',
+              children: [
+                {
+                  title: '点火线圈',
+                  dataIndex: 'wsDhxqAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '灯泡',
+                  dataIndex: 'wsDpAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                }
+              ]
+            },
             {
               title: '汇箭',
               dataIndex: 'hjAmount',
@@ -305,19 +332,25 @@ export default {
               width: 80,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             },
-            {
-              title: '稳升',
-              dataIndex: 'wsAmount',
-              align: 'center',
-              width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
-            },
             {
               title: 'TBU',
-              dataIndex: 'tbuAmount',
               align: 'center',
-              width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              children: [
+                {
+                  title: '刹车片',
+                  dataIndex: 'tbuScpAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '刹车油',
+                  dataIndex: 'tbuScyAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                }
+              ]
             },
             {
               title: 'TBU-P',

+ 2 - 2
src/views/reportData/salesAmountReport/list.vue

@@ -146,7 +146,7 @@ import subarea from '@/views/common/subarea.js'
 import reportModal from '@/views/common/reportModal.vue'
 import { getArea } from '@/api/data'
 import { hdExportExcel } from '@/libs/exportExcel'
-import { salesBillReportGroupByBuyerList, salesBillReportCount } from '@/api/salesBillReport'
+import { salesBillReportGroupByBuyerList, salesBillReportCountByBuyer } from '@/api/salesBillReport'
 import { salesAmountExport } from '@/api/reportData'
 export default {
   name: 'SalesAmountReportList',
@@ -413,7 +413,7 @@ export default {
     },
     // 总计
     getCount (params) {
-      salesBillReportCount(params).then(res => {
+      salesBillReportCountByBuyer(params).then(res => {
         if (res.status == 200 && res.data) {
           this.totalData = res.data
         } else {

+ 43 - 10
src/views/reportData/salesPresentation/list.vue

@@ -227,6 +227,13 @@ export default {
                   width: 80,
                   customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
                 },
+                {
+                  title: '变速箱滤清器',
+                  dataIndex: 'jpBsxLqqAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
                 {
                   title: '雨刮片',
                   dataIndex: 'jpYgpAmount',
@@ -284,6 +291,26 @@ export default {
                 }
               ]
             },
+            {
+              title: '稳升',
+              align: 'center',
+              children: [
+                {
+                  title: '点火线圈',
+                  dataIndex: 'wsDhxqAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '灯泡',
+                  dataIndex: 'wsDpAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                }
+              ]
+            },
             {
               title: '汇箭',
               dataIndex: 'hjAmount',
@@ -298,19 +325,25 @@ export default {
               width: 80,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             },
-            {
-              title: '稳升',
-              dataIndex: 'wsAmount',
-              align: 'center',
-              width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
-            },
             {
               title: 'TBU',
-              dataIndex: 'tbuAmount',
               align: 'center',
-              width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              children: [
+                {
+                  title: '刹车片',
+                  dataIndex: 'tbuScpAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '刹车油',
+                  dataIndex: 'tbuScyAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                }
+              ]
             },
             {
               title: 'TBU-P',

+ 27 - 7
src/views/reportData/salesReturnReport/list.vue

@@ -229,6 +229,13 @@ export default {
                   width: 80,
                   customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
                 },
+                {
+                  title: '变速箱滤清器',
+                  dataIndex: 'jpBsxLqqAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
                 {
                   title: '雨刮片',
                   dataIndex: 'jpYgpAmount',
@@ -286,6 +293,26 @@ export default {
                 }
               ]
             },
+            {
+              title: '稳升',
+              align: 'center',
+              children: [
+                {
+                  title: '点火线圈',
+                  dataIndex: 'wsDhxqAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '灯泡',
+                  dataIndex: 'wsDpAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                }
+              ]
+            },
             {
               title: '汇箭',
               dataIndex: 'hjAmount',
@@ -300,13 +327,6 @@ export default {
               width: 80,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             },
-            {
-              title: '稳升',
-              dataIndex: 'wsAmount',
-              align: 'center',
-              width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
-            },
             {
               title: 'TBU',
               dataIndex: 'tbuAmount',

+ 43 - 10
src/views/reportData/salesSlipReport/list.vue

@@ -236,6 +236,13 @@ export default {
                   width: 80,
                   customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
                 },
+                {
+                  title: '变速箱滤清器',
+                  dataIndex: 'jpBsxLqqAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
                 {
                   title: '雨刮片',
                   dataIndex: 'jpYgpAmount',
@@ -293,6 +300,26 @@ export default {
                 }
               ]
             },
+            {
+              title: '稳升',
+              align: 'center',
+              children: [
+                {
+                  title: '点火线圈',
+                  dataIndex: 'wsDhxqAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '灯泡',
+                  dataIndex: 'wsDpAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                }
+              ]
+            },
             {
               title: '汇箭',
               dataIndex: 'hjAmount',
@@ -307,19 +334,25 @@ export default {
               width: 80,
               customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
             },
-            {
-              title: '稳升',
-              dataIndex: 'wsAmount',
-              align: 'center',
-              width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
-            },
             {
               title: 'TBU',
-              dataIndex: 'tbuAmount',
               align: 'center',
-              width: 80,
-              customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+              children: [
+                {
+                  title: '刹车片',
+                  dataIndex: 'tbuScpAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                },
+                {
+                  title: '刹车油',
+                  dataIndex: 'tbuScyAmount',
+                  align: 'center',
+                  width: 80,
+                  customRender: function (text) { return (text || text == 0) ? ('¥' + text) : '--' }
+                }
+              ]
             },
             {
               title: 'TBU-P',

+ 1 - 1
vue.config.js

@@ -107,7 +107,7 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.0.183:8602/ocs-admin',
+        target: 'http://192.168.0.215/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  Á·Ï°
         // target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
         ws: false,