فهرست منبع

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

合并报表修改
lilei 2 سال پیش
والد
کامیت
ddb1159b89

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

+ 33 - 14
src/views/common/dingDepartUser.js

@@ -62,10 +62,12 @@ const DingDepartUser = {
       this.$emit('input', value);
     },
     // 格式化数据
-    formatData(data,type){
+    formatData(data){
+      console.log(data)
       const ret = []
       data.map(item => {
-        if(type == 'bm'){
+        // 部门
+        if(item.deptId){
           const node = {
             title: item.name,
             id:item.deptId,
@@ -74,19 +76,21 @@ const DingDepartUser = {
             autoAddUser: item.autoAddUser,
             createDeptGroup: item.createDeptGroup,
             disableCheckbox: true,
-            checkable: false
+            checkable: false,
+            children: []
           }
-          if(item.deptUserList){
-            node.children = this.formatData(item.deptUserList,'yg')
-          }
-          if(item.deptList){
-            node.children = this.formatData(item.deptList,'bm')
+          if(item.deptUserList && item.deptList){
+            node.children = this.formatData(item.deptList.concat(item.deptUserList?item.deptUserList:[]))
+          }else if(item.deptUserList && !item.deptList){
+            node.children = this.formatData(item.deptUserList)
+          }else if(!item.deptUserList && item.deptList){
+            node.children = this.formatData(item.deptList)
           }
           ret.push(node)
         }else{
           ret.push({
             title: item.name,
-            id: item.userid,
+            id: item.deptOrder,
             value: item.userid,
             pId: item.parentId,
             avatar: item.avatar,
@@ -98,24 +102,39 @@ const DingDepartUser = {
             isLeaf: true
           })
         }
+         
       })
       return ret
     },
     // 获取部门人员
     async genTreeNode() {
        let ret = await getDingTalkAllDeptUser().then(res => res.data)
-       console.log(ret)
        const res1 = ret.deptList||[]
        const res2 = ret.deptUserList||[]
-       this.treeData = this.treeData.concat(this.formatData(res1,'bm')).concat(this.formatData(res2,'yg'));
+       this.treeData = this.treeData = this.formatData(res1.concat(res2));
+       console.log(this.treeData,'----')
     },
     // 更新人员数据
     updateDeptUser(){
+      const _this = this
       refashDingTalkAllDeptUser().then(res => {
-        this.$message.info(res.message)
         if(res.status == 200){
-          this.treeData = []
-          this.genTreeNode()
+          // this.treeData = []
+          // this.genTreeNode()
+          const h = this.$createElement;
+          this.$info({
+            title: '提示',
+            centered: true,
+            content: h('div', {}, [
+              h('p', '数据正在刷新中...'),
+              h('p', '请10分钟后(按F5刷新页面)再进行操作!'),
+            ]),
+            onOk() {
+              _this.$emit("close")
+            },
+          });
+        }else{
+          this.$message.error(res.message)
         }
         this.$emit("loaded")
       })

+ 3 - 2
src/views/expenseManagement/expenseReimbursement/chooseDepartUserModal.vue

@@ -4,7 +4,7 @@
     class="departUser-modal"
     :footer="null"
     :maskClosable="false"
-    :title="title+'费用明细'"
+    :title="title+'选择审批人员'"
     v-model="isShow"
     @cancel="isShow=false"
     width="60%">
@@ -22,6 +22,7 @@
               <dingDepartUser
                 ref="departUserApp"
                 @loaded="uploading=false"
+                @close="isShow=false"
                 id="departUser-approvers"
                 :disabled="uploading"
                 v-model="form.approvers"
@@ -92,7 +93,7 @@ export default {
     updateUser () {
       this.uploading = true
       this.$refs.departUserApp.updateDeptUser()
-      this.$refs.departUserCc.updateDeptUser()
+      // this.$refs.departUserCc.updateDeptUser()
     },
     changeApprovers (value) {
       this.form.approvers = value

+ 30 - 8
src/views/reportData/actualSalesReport/list.vue

@@ -104,6 +104,7 @@
             <a-col span="22">
               <a-row>
                 <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? totalData.jpLqqAmount : '--' }}</a-col>
+                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? totalData.jpBsxLqqAmount : '--' }}</a-col>
                 <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? totalData.jpYgpAmount : '--' }}</a-col>
                 <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? totalData.jpLbAmount : '--' }}</a-col>
                 <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? totalData.jpScpAmount : '--' }}</a-col>
@@ -111,9 +112,10 @@
                 <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? totalData.gpLqqAmount : '--' }}</a-col>
                 <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? totalData.gpYgpAmount : '--' }}</a-col>
                 <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? totalData.gpScpAmount : '--' }}</a-col>
+                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? totalData.wsDhxqAmount : '--' }}</a-col>
+                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? totalData.wsDpAmount : '--' }}</a-col>
                 <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? totalData.hjAmount : '--' }}</a-col>
                 <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
-                <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? totalData.wsAmount : '--' }}</a-col>
                 <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
                 <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? totalData.tbupAmount : '--' }}</a-col>
                 <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
@@ -229,6 +231,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 +295,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 +329,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',

+ 48 - 12
src/views/reportData/returnGoodsPresentation/list.vue

@@ -109,6 +109,7 @@
             <a-col span="22">
               <a-row>
                 <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? totalData.jpLqqAmount : '--' }}</a-col>
+                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? totalData.jpBsxLqqAmount : '--' }}</a-col>
                 <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? totalData.jpYgpAmount : '--' }}</a-col>
                 <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? totalData.jpLbAmount : '--' }}</a-col>
                 <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? totalData.jpScpAmount : '--' }}</a-col>
@@ -116,10 +117,12 @@
                 <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? totalData.gpLqqAmount : '--' }}</a-col>
                 <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? totalData.gpYgpAmount : '--' }}</a-col>
                 <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? totalData.gpScpAmount : '--' }}</a-col>
+                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? totalData.wsDhxqAmount : '--' }}</a-col>
+                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? totalData.wsDpAmount : '--' }}</a-col>
                 <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? totalData.hjAmount : '--' }}</a-col>
                 <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
-                <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? totalData.wsAmount : '--' }}</a-col>
-                <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
+                <a-col span="4">TBU刹车片:{{ (totalData && (totalData.tbuScpAmount || totalData.tbuScpAmount==0)) ? totalData.tbuScpAmount : '--' }}</a-col>
+                <a-col span="4">TBU刹车油:{{ (totalData && (totalData.tbuScyAmount || totalData.tbuScyAmount==0)) ? totalData.tbuScyAmount : '--' }}</a-col>
                 <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? totalData.tbupAmount : '--' }}</a-col>
                 <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
@@ -226,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',
@@ -283,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',
@@ -297,19 +327,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',

+ 48 - 12
src/views/reportData/returnSlipReport/list.vue

@@ -109,6 +109,7 @@
             <a-col span="22">
               <a-row>
                 <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? totalData.jpLqqAmount : '--' }}</a-col>
+                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? totalData.jpBsxLqqAmount : '--' }}</a-col>
                 <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? totalData.jpYgpAmount : '--' }}</a-col>
                 <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? totalData.jpLbAmount : '--' }}</a-col>
                 <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? totalData.jpScpAmount : '--' }}</a-col>
@@ -116,10 +117,12 @@
                 <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? totalData.gpLqqAmount : '--' }}</a-col>
                 <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? totalData.gpYgpAmount : '--' }}</a-col>
                 <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? totalData.gpScpAmount : '--' }}</a-col>
+                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? totalData.wsDhxqAmount : '--' }}</a-col>
+                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? totalData.wsDpAmount : '--' }}</a-col>
                 <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? totalData.hjAmount : '--' }}</a-col>
                 <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
-                <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? totalData.wsAmount : '--' }}</a-col>
-                <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
+                <a-col span="4">TBU刹车片:{{ (totalData && (totalData.tbuScpAmount || totalData.tbuScpAmount==0)) ? totalData.tbuScpAmount : '--' }}</a-col>
+                <a-col span="4">TBU刹车油:{{ (totalData && (totalData.tbuScyAmount || totalData.tbuScyAmount==0)) ? totalData.tbuScyAmount : '--' }}</a-col>
                 <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? totalData.tbupAmount : '--' }}</a-col>
                 <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
@@ -234,6 +237,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 +301,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 +335,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 {

+ 48 - 12
src/views/reportData/salesPresentation/list.vue

@@ -109,6 +109,7 @@
             <a-col span="22">
               <a-row>
                 <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? totalData.jpLqqAmount : '--' }}</a-col>
+                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? totalData.jpBsxLqqAmount : '--' }}</a-col>
                 <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? totalData.jpYgpAmount : '--' }}</a-col>
                 <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? totalData.jpLbAmount : '--' }}</a-col>
                 <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? totalData.jpScpAmount : '--' }}</a-col>
@@ -116,10 +117,12 @@
                 <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? totalData.gpLqqAmount : '--' }}</a-col>
                 <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? totalData.gpYgpAmount : '--' }}</a-col>
                 <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? totalData.gpScpAmount : '--' }}</a-col>
+                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? totalData.wsDhxqAmount : '--' }}</a-col>
+                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? totalData.wsDpAmount : '--' }}</a-col>
                 <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? totalData.hjAmount : '--' }}</a-col>
                 <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
-                <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? totalData.wsAmount : '--' }}</a-col>
-                <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
+                <a-col span="4">TBU刹车片:{{ (totalData && (totalData.tbuScpAmount || totalData.tbuScpAmount==0)) ? totalData.tbuScpAmount : '--' }}</a-col>
+                <a-col span="4">TBU刹车油:{{ (totalData && (totalData.tbuScyAmount || totalData.tbuScyAmount==0)) ? totalData.tbuScyAmount : '--' }}</a-col>
                 <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? totalData.tbupAmount : '--' }}</a-col>
                 <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
@@ -227,6 +230,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 +294,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 +328,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',

+ 30 - 8
src/views/reportData/salesReturnReport/list.vue

@@ -104,6 +104,7 @@
             <a-col span="22">
               <a-row>
                 <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? totalData.jpLqqAmount : '--' }}</a-col>
+                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? totalData.jpBsxLqqAmount : '--' }}</a-col>
                 <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? totalData.jpYgpAmount : '--' }}</a-col>
                 <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? totalData.jpLbAmount : '--' }}</a-col>
                 <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? totalData.jpScpAmount : '--' }}</a-col>
@@ -111,9 +112,10 @@
                 <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? totalData.gpLqqAmount : '--' }}</a-col>
                 <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? totalData.gpYgpAmount : '--' }}</a-col>
                 <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? totalData.gpScpAmount : '--' }}</a-col>
+                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? totalData.wsDhxqAmount : '--' }}</a-col>
+                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? totalData.wsDpAmount : '--' }}</a-col>
                 <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? totalData.hjAmount : '--' }}</a-col>
                 <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
-                <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? totalData.wsAmount : '--' }}</a-col>
                 <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
                 <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? totalData.tbupAmount : '--' }}</a-col>
                 <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
@@ -229,6 +231,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 +295,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 +329,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',

+ 48 - 12
src/views/reportData/salesSlipReport/list.vue

@@ -109,6 +109,7 @@
             <a-col span="22">
               <a-row>
                 <a-col span="4">箭牌滤清器:{{ (totalData && (totalData.jpLqqAmount || totalData.jpLqqAmount==0)) ? totalData.jpLqqAmount : '--' }}</a-col>
+                <a-col span="4">箭牌变速箱滤清器:{{ (totalData && (totalData.jpBsxLqqAmount || totalData.jpBsxLqqAmount==0)) ? totalData.jpBsxLqqAmount : '--' }}</a-col>
                 <a-col span="4">箭牌雨刮片:{{ (totalData && (totalData.jpYgpAmount || totalData.jpYgpAmount==0)) ? totalData.jpYgpAmount : '--' }}</a-col>
                 <a-col span="4">箭牌喇叭:{{ (totalData && (totalData.jpLbAmount || totalData.jpLbAmount==0)) ? totalData.jpLbAmount : '--' }}</a-col>
                 <a-col span="4">箭牌刹车片:{{ (totalData && (totalData.jpScpAmount || totalData.jpScpAmount==0)) ? totalData.jpScpAmount : '--' }}</a-col>
@@ -116,10 +117,12 @@
                 <a-col span="4">冠牌滤清器:{{ (totalData && (totalData.gpLqqAmount || totalData.gpLqqAmount==0)) ? totalData.gpLqqAmount : '--' }}</a-col>
                 <a-col span="4">冠牌雨刮片:{{ (totalData && (totalData.gpYgpAmount || totalData.gpYgpAmount==0)) ? totalData.gpYgpAmount : '--' }}</a-col>
                 <a-col span="4">冠牌刹车片:{{ (totalData && (totalData.gpScpAmount || totalData.gpScpAmount==0)) ? totalData.gpScpAmount : '--' }}</a-col>
+                <a-col span="4">稳升点火线圈:{{ (totalData && (totalData.wsDhxqAmount || totalData.wsDhxqAmount==0)) ? totalData.wsDhxqAmount : '--' }}</a-col>
+                <a-col span="4">稳升灯泡:{{ (totalData && (totalData.wsDpAmount || totalData.wsDpAmount==0)) ? totalData.wsDpAmount : '--' }}</a-col>
                 <a-col span="4">汇箭:{{ (totalData && (totalData.hjAmount || totalData.hjAmount==0)) ? totalData.hjAmount : '--' }}</a-col>
                 <a-col span="4">德路斯:{{ (totalData && (totalData.dlsAmount || totalData.dlsAmount==0)) ? totalData.dlsAmount : '--' }}</a-col>
-                <a-col span="4">稳升:{{ (totalData && (totalData.wsAmount || totalData.wsAmount==0)) ? totalData.wsAmount : '--' }}</a-col>
-                <a-col span="4">TBU:{{ (totalData && (totalData.tbuAmount || totalData.tbuAmount==0)) ? totalData.tbuAmount : '--' }}</a-col>
+                <a-col span="4">TBU刹车片:{{ (totalData && (totalData.tbuScpAmount || totalData.tbuScpAmount==0)) ? totalData.tbuScpAmount : '--' }}</a-col>
+                <a-col span="4">TBU刹车油:{{ (totalData && (totalData.tbuScyAmount || totalData.tbuScyAmount==0)) ? totalData.tbuScyAmount : '--' }}</a-col>
                 <a-col span="4">TBU-P:{{ (totalData && (totalData.tbupAmount || totalData.tbupAmount==0)) ? totalData.tbupAmount : '--' }}</a-col>
                 <a-col span="4">布瑞斯:{{ (totalData && (totalData.brsAmount || totalData.brsAmount==0)) ? totalData.brsAmount : '--' }}</a-col>
                 <a-col span="4">NGK:{{ (totalData && (totalData.ngkAmount || totalData.ngkAmount==0)) ? totalData.ngkAmount : '--' }}</a-col>
@@ -236,6 +239,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 +303,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 +337,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',