chenrui 3 kuukautta sitten
vanhempi
commit
1410933203

+ 211 - 217
src/config/report/otherReport.js

@@ -1,220 +1,214 @@
-import {
-  UserLayout,
-  BasicLayout,
-  BlankLayout,
-  BigScreen,
-  PageView
-} from '@/layouts'
+import { UserLayout, BasicLayout, BlankLayout, BigScreen, PageView } from '@/layouts'
 
 export default {
-        path: '/otherReport',
-        redirect: '/reportData/salesOrderTotal',
-        component: PageView,
-        meta: {
-          title: '其它报表',
-          icon: 'project',
-          permission: 'M_otherReport'
-        },
-        children: [
-          {
-            path: '/reportData/tireSalesReport',
-            redirect: '/reportData/tireSalesReport/index',
-            name: 'tireSalesReport',
-            component: BlankLayout,
-            meta: {
-              title: '轮胎统计报表',
-              icon: 'profile',
-              permission: 'M_tireSalesReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'index',
-                name: 'tireSalesReportIndex',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/tireSalesReport/index.vue'),
-                meta: {
-                  title: '轮胎统计报表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_tireSalesReportList'
-                }
-              }
-            ]
-          },
-          // {
-          //   path: '/reportData/tireFeeReport',
-          //   redirect: '/reportData/tireFeeReport/index',
-          //   name: 'tireFeeReport',
-          //   component: BlankLayout,
-          //   meta: {
-          //     title: '轮胎费用报表',
-          //     icon: 'profile',
-          //     permission: 'M_tireFeeReportList'
-          //   },
-          //   hideChildrenInMenu: true,
-          //   children: [
-          //     {
-          //       path: 'index',
-          //       name: 'tireFeeReportIndex',
-          //       component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/tireFeeReport/index.vue'),
-          //       meta: {
-          //         title: '轮胎费用报表',
-          //         icon: 'profile',
-          //         hidden: true,
-          //         permission: 'M_tireFeeReportList'
-          //       }
-          //     }
-          //   ]
-          // },
-          {
-            path: '/reportData/tireSubsidyReport',
-            redirect: '/reportData/tireSubsidyReport/index',
-            name: 'tireSubsidyReport',
-            component: BlankLayout,
-            meta: {
-              title: '轮胎补贴报表',
-              icon: 'profile',
-              permission: 'M_tireSubsidyList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'index',
-                name: 'tireSubsidyReportIndex',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/tireSubsidyReport/index.vue'),
-                meta: {
-                  title: '轮胎补贴报表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_tireSubsidyList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/expenseAccountBearerReport',
-            redirect: '/reportData/expenseAccountBearerReport/list',
-            name: 'expenseAccountBearerReport',
-            component: BlankLayout,
-            meta: {
-              title: '费用汇总报表(按承担方)',
-              icon: 'profile',
-              permission: 'M_expenseAccountBearerReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'expenseAccountBearerReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/expenseAccountReport/bearerList.vue'),
-                meta: {
-                  title: '费用汇总报表(按承担方)',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_expenseAccountBearerReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/expenseAccountCategoryReport',
-            redirect: '/reportData/expenseAccountCategoryReport/list',
-            name: 'expenseAccountCategoryReport',
-            component: BlankLayout,
-            meta: {
-              title: '费用汇总报表(按品类)',
-              icon: 'profile',
-              permission: 'M_expenseAccountCategoryReportList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'expenseAccountCategoryReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/expenseAccountReport/categoryList.vue'),
-                meta: {
-                  title: '费用汇总报表(按品类)',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_expenseAccountCategoryReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/receivedSendStorageReport',
-            redirect: '/reportData/receivedSendStorageReport/index',
-            name: 'receivedSendStorageReport',
-            component: BlankLayout,
-            meta: {
-              title: '收发存报表',
-              icon: 'profile',
-              permission: 'M_receivedSendStorageReport'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'index',
-                name: 'receivedSendStorageReportIndex',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/receivedSendStorageReport/index.vue'),
-                meta: {
-                  title: '收发存报表',
-                  icon: 'profile',
-                  hidden: true,
-                  permission: 'M_receivedSendStorageReportList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/dataExport/exportSales',
-            redirect: '/dataExport/exportSales/list',
-            name: 'exportSales',
-            component: BlankLayout,
-            meta: {
-              title: '导出销售',
-              icon: 'gold',
-              permission: 'M_exportSales'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'exportSalesList',
-                component: () => import(/* webpackChunkName: "dataExport" */ '@/views/dataExport/exportSales/list.vue'),
-                meta: {
-                  title: '导出销售',
-                  icon: 'gold',
-                  hidden: true,
-                  permission: 'M_exportSales'
-                }
-              }
-            ]
-          },
-          {
-            path: '/dataExport/exportCheck',
-            redirect: '/dataExport/exportCheck/list',
-            name: 'exportCheck',
-            component: BlankLayout,
-            meta: {
-              title: '导出盘点',
-              icon: 'gold',
-              permission: 'M_exportCheck'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'exportCheckList',
-                component: () => import(/* webpackChunkName: "dataExport" */ '@/views/dataExport/exportCheck/list.vue'),
-                meta: {
-                  title: '导出盘点',
-                  icon: 'gold',
-                  hidden: true,
-                  permission: 'M_exportCheck'
-                }
-              }
-            ]
+  path: '/otherReport',
+  redirect: '/reportData/salesOrderTotal',
+  component: PageView,
+  meta: {
+    title: '其它报表',
+    icon: 'project',
+    permission: 'M_otherReport'
+  },
+  children: [
+    {
+      path: '/reportData/tireSalesReport',
+      redirect: '/reportData/tireSalesReport/index',
+      name: 'tireSalesReport',
+      component: BlankLayout,
+      meta: {
+        title: '轮胎统计报表',
+        icon: 'profile',
+        permission: 'M_tireSalesReportList'
+      },
+      hideChildrenInMenu: true,
+      children: [
+        {
+          path: 'index',
+          name: 'tireSalesReportIndex',
+          component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/tireSalesReport/index.vue'),
+          meta: {
+            title: '轮胎统计报表',
+            icon: 'profile',
+            hidden: true,
+            permission: 'M_tireSalesReportList'
           }
-        ]
-      }
+        }
+      ]
+    },
+    // {
+    //   path: '/reportData/tireFeeReport',
+    //   redirect: '/reportData/tireFeeReport/index',
+    //   name: 'tireFeeReport',
+    //   component: BlankLayout,
+    //   meta: {
+    //     title: '轮胎费用报表',
+    //     icon: 'profile',
+    //     permission: 'M_tireFeeReportList'
+    //   },
+    //   hideChildrenInMenu: true,
+    //   children: [
+    //     {
+    //       path: 'index',
+    //       name: 'tireFeeReportIndex',
+    //       component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/tireFeeReport/index.vue'),
+    //       meta: {
+    //         title: '轮胎费用报表',
+    //         icon: 'profile',
+    //         hidden: true,
+    //         permission: 'M_tireFeeReportList'
+    //       }
+    //     }
+    //   ]
+    // },
+    {
+      path: '/reportData/tireSubsidyReport',
+      redirect: '/reportData/tireSubsidyReport/index',
+      name: 'tireSubsidyReport',
+      component: BlankLayout,
+      meta: {
+        title: '轮胎补贴报表',
+        icon: 'profile',
+        permission: 'M_tireSubsidyList'
+      },
+      hideChildrenInMenu: true,
+      children: [
+        {
+          path: 'index',
+          name: 'tireSubsidyReportIndex',
+          component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/tireSubsidyReport/index.vue'),
+          meta: {
+            title: '轮胎补贴报表',
+            icon: 'profile',
+            hidden: true,
+            permission: 'M_tireSubsidyList'
+          }
+        }
+      ]
+    },
+    {
+      path: '/reportData/expenseAccountBearerReport',
+      redirect: '/reportData/expenseAccountBearerReport/list',
+      name: 'expenseAccountBearerReport',
+      component: BlankLayout,
+      meta: {
+        title: '费用汇总报表(按承担方)',
+        icon: 'profile',
+        permission: 'M_expenseAccountBearerReportList'
+      },
+      hideChildrenInMenu: true,
+      children: [
+        {
+          path: 'list',
+          name: 'expenseAccountBearerReportList',
+          component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/expenseAccountReport/bearerList.vue'),
+          meta: {
+            title: '费用汇总报表(按承担方)',
+            icon: 'profile',
+            hidden: true,
+            permission: 'M_expenseAccountBearerReportList'
+          }
+        }
+      ]
+    },
+    {
+      path: '/reportData/expenseAccountCategoryReport',
+      redirect: '/reportData/expenseAccountCategoryReport/list',
+      name: 'expenseAccountCategoryReport',
+      component: BlankLayout,
+      meta: {
+        title: '费用汇总报表(按品类)',
+        icon: 'profile',
+        permission: 'M_expenseAccountCategoryReportList'
+      },
+      hideChildrenInMenu: true,
+      children: [
+        {
+          path: 'list',
+          name: 'expenseAccountCategoryReportList',
+          component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/expenseAccountReport/categoryList.vue'),
+          meta: {
+            title: '费用汇总报表(按品类)',
+            icon: 'profile',
+            hidden: true,
+            permission: 'M_expenseAccountCategoryReportList'
+          }
+        }
+      ]
+    },
+    {
+      path: '/reportData/receivedSendStorageReport',
+      redirect: '/reportData/receivedSendStorageReport/index',
+      name: 'receivedSendStorageReport',
+      component: BlankLayout,
+      meta: {
+        title: '收发存报表',
+        icon: 'profile',
+        permission: 'M_receivedSendStorageReport'
+      },
+      hideChildrenInMenu: true,
+      children: [
+        {
+          path: 'index',
+          name: 'receivedSendStorageReportIndex',
+          component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/receivedSendStorageReport/index.vue'),
+          meta: {
+            title: '收发存报表',
+            icon: 'profile',
+            hidden: true,
+            permission: 'M_receivedSendStorageReportList'
+          }
+        }
+      ]
+    },
+    {
+      path: '/dataExport/exportSales',
+      redirect: '/dataExport/exportSales/list',
+      name: 'exportSales',
+      component: BlankLayout,
+      meta: {
+        title: '导出销售',
+        icon: 'gold',
+        permission: 'M_exportSales'
+      },
+      hideChildrenInMenu: true,
+      children: [
+        {
+          path: 'list',
+          name: 'exportSalesList',
+          component: () => import(/* webpackChunkName: "dataExport" */ '@/views/dataExport/exportSales/list.vue'),
+          meta: {
+            title: '导出销售',
+            icon: 'gold',
+            hidden: true,
+            permission: 'M_exportSales'
+          }
+        }
+      ]
+    },
+    {
+      path: '/dataExport/exportCheck',
+      redirect: '/dataExport/exportCheck/list',
+      name: 'exportCheck',
+      component: BlankLayout,
+      meta: {
+        title: '导出盘点',
+        icon: 'gold',
+        permission: 'M_exportCheck'
+      },
+      hideChildrenInMenu: true,
+      children: [
+        {
+          path: 'list',
+          name: 'exportCheckList',
+          component: () => import(/* webpackChunkName: "dataExport" */ '@/views/dataExport/exportCheck/list.vue'),
+          meta: {
+            title: '导出盘点',
+            icon: 'gold',
+            hidden: true,
+            permission: 'M_exportCheck'
+          }
+        }
+      ]
+    }
+  ]
+}

+ 4 - 4
src/config/sysSetting.js

@@ -306,8 +306,8 @@ export default {
       component: BlankLayout,
       meta: {
         title: '轮胎补贴配置',
-        icon: 'sketch'
-        // permission: 'M_tireSubsidySetting'
+        icon: 'sketch',
+        permission: 'M_tireSubsidySetting'
       },
       hideChildrenInMenu: true,
       children: [
@@ -318,8 +318,8 @@ export default {
           meta: {
             title: '轮胎补贴配置',
             icon: 'sketch',
-            hidden: true
-            // permission: 'M_tireSubsidySettingIndex'
+            hidden: true,
+            permission: 'M_tireSubsidySettingIndex'
           }
         }
       ]

+ 13 - 13
src/views/reportData/tireSubsidyReport/incrementalSubsidyList.vue

@@ -16,9 +16,9 @@
                 <div style="display: inline;" slot="label">
                   <a-popover placement="top">
                     <template slot="content">
-                      <p>1、销售单(非转单)下推时间</p>
-                      <p>2、销售单(转单)转单完结时间</p>
-                      <p>3、销售退货单客服确认时间</p>
+                      <p>1、销售单(非转单)下推时间</p>
+                      <p>2、销售单(转单)转单完结时间</p>
+                      <p>3、销售退货单客服确认时间</p>
                     </template>
                     查询季度 <a-icon type="question-circle" />
                   </a-popover>
@@ -26,16 +26,16 @@
                 <quarterDate ref="quarterDate" id="incSubSidy-time" :value="timeInfo" @change="dateChange" />
               </a-form-model-item>
             </a-col>
+            <a-col :flex="1">
+              <a-form-item label="所在区域">
+                <subarea id="incSubSidy-subarea" ref="subarea" @change="subareaChange"></subarea>
+              </a-form-item>
+            </a-col>
             <a-col :flex="1">
               <a-form-model-item label="地区">
                 <AreaList id="incSubSidy-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
               </a-form-model-item>
             </a-col>
-            <a-col :flex="1">
-              <a-form-item label="区域/分区">
-                <subarea id="incSubSidy-subarea" ref="subarea" @change="subareaChange"></subarea>
-              </a-form-item>
-            </a-col>
             <a-col :flex="2">
               <a-form-model-item label="客户名称">
                 <custList id="incSubSidy-dealerName" dataAuthFlag="0" placeholder="请输入客户名称" ref="custList" @change="custChange" />
@@ -85,7 +85,7 @@
           bordered>
           <template slot="footer">
             <a-row :gutter="15">
-              <a-col :md="4" :sm="24">订货数量合计:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty: '--' }}</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.subsidyAmount || totalData.subsidyAmount==0)) ? toThousands(totalData.subsidyAmount): '--' }}</a-col>
             </a-row>
           </template>
@@ -189,10 +189,10 @@ export default {
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'provinceName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '订货数量(总部)', dataIndex: 'salesQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '订货数量(转单)', dataIndex: 'transferQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { 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: 'salesQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '转单订货数量', dataIndex: 'transferQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { 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) : '--') } }

+ 14 - 14
src/views/reportData/tireSubsidyReport/incrementalSubsidyYearList.vue

@@ -16,9 +16,9 @@
                 <div style="display: inline;" slot="label">
                   <a-popover placement="top">
                     <template slot="content">
-                      <p>1、销售单(非转单)下推时间</p>
-                      <p>2、销售单(转单)转单完结时间</p>
-                      <p>3、销售退货单客服确认时间</p>
+                      <p>1、销售单(非转单)下推时间</p>
+                      <p>2、销售单(转单)转单完结时间</p>
+                      <p>3、销售退货单客服确认时间</p>
                     </template>
                     查询年份 <a-icon type="question-circle" />
                   </a-popover>
@@ -36,16 +36,16 @@
                 </a-select>
               </a-form-model-item>
             </a-col>
+            <a-col :flex="1">
+              <a-form-item label="所在区域">
+                <subarea id="incSubSidyYear-subarea" ref="subarea" @change="subareaChange"></subarea>
+              </a-form-item>
+            </a-col>
             <a-col :flex="1">
               <a-form-model-item label="地区">
                 <AreaList id="incSubSidyYear-areaList" changeOnSelect ref="areaList" @change="areaChange" defValKey="id"></AreaList>
               </a-form-model-item>
             </a-col>
-            <a-col :flex="1">
-              <a-form-item label="区域/分区">
-                <subarea id="incSubSidyYear-subarea" ref="subarea" @change="subareaChange"></subarea>
-              </a-form-item>
-            </a-col>
             <a-col :flex="2">
               <a-form-model-item label="客户名称">
                 <custList id="incSubSidyYear-dealerName" dataAuthFlag="0" placeholder="请输入客户名称" ref="custList" @change="custChange" />
@@ -95,8 +95,8 @@
           bordered>
           <template slot="footer">
             <a-row :gutter="15">
-              <a-col :md="4" :sm="24">订货数量合计:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty: '--' }}</a-col>
-              <a-col :md="4" :sm="24">增量补贴金额:{{ (totalData && (totalData.subsidyAmount || totalData.subsidyAmount==0)) ? toThousands(totalData.subsidyAmount): '--' }}</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>
           </template>
         </s-table>
@@ -202,10 +202,10 @@ export default {
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'provinceName', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '客户名称', dataIndex: 'dealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '订货数量(总部)', dataIndex: 'salesQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '订货数量(转单)', dataIndex: 'transferQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { 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: 'salesQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '转单订货数量', dataIndex: 'transferQty', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { 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) : '--') } },

+ 2 - 2
src/views/reportData/tireSubsidyReport/index.vue

@@ -2,10 +2,10 @@
   <div>
     <a-card size="small" :bordered="false">
       <a-tabs default-active-key="1" @change="handleChange">
-        <a-tab-pane key="1" tab="服务费/运费明细报表" force-render>
+        <a-tab-pane key="1" tab="服务费运费明细报表" force-render>
           <serviceFreightDetailList ref="tableList1"></serviceFreightDetailList>
         </a-tab-pane>
-        <a-tab-pane key="2" tab="服务费/运费报表" force-render>
+        <a-tab-pane key="2" tab="服务费运费报表" force-render>
           <serviceFreightList ref="tableList2"></serviceFreightList>
         </a-tab-pane>
         <a-tab-pane key="3" tab="增量补贴报表(季度)" force-render>

+ 8 - 6
src/views/reportData/tireSubsidyReport/serviceFreightDetailList.vue

@@ -16,9 +16,9 @@
                 <div style="display: inline;" slot="label">
                   <a-popover placement="top">
                     <template slot="content">
-                      <p>1、销售单(非转单)下推时间</p>
-                      <p>2、销售单(转单)转单完结时间</p>
-                      <p>3、销售退货单客服确认时间</p>
+                      <p>1、销售单(非转单)下推时间</p>
+                      <p>2、销售单(转单)转单完结时间</p>
+                      <p>3、销售退货单客服确认时间</p>
                     </template>
                     查询日期 <a-icon type="question-circle" />
                   </a-popover>
@@ -63,17 +63,17 @@
                 </a-form-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-model-item label="是否轮胎省仓">
+                <a-form-model-item label="轮胎省仓">
                   <v-select
                     v-model="queryParam.belongProvinceFlag"
                     id="sfdetail-belongProvinceFlag"
                     code="Flag"
-                    placeholder="请选择是否轮胎省仓"
+                    placeholder="请选择轮胎省仓"
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">
-                <a-form-item label="区域/分区">
+                <a-form-item label="所在区域">
                   <subarea id="sfdetail-subarea" ref="subarea" @change="subareaChange"></subarea>
                 </a-form-item>
               </a-col>
@@ -243,6 +243,8 @@ export default {
         { title: '轮胎省仓', dataIndex: 'belongProvinceFlagDictValue', width: '80px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售数量', dataIndex: 'bizQty', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '销售金额', dataIndex: 'bizAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '服务费比例', dataIndex: 'subsidyServiceDiff', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '服务费金额', dataIndex: 'subsidyServiceAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '运费补贴', dataIndex: 'subsidyShippingDiff', width: '80px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '运费补贴金额', dataIndex: 'subsidyShippingAmount', width: '100px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '客户名称', dataIndex: 'dealerName', width: '150px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 11 - 11
src/views/reportData/tireSubsidyReport/serviceFreightList.vue

@@ -16,9 +16,9 @@
                 <div style="display: inline;" slot="label">
                   <a-popover placement="top">
                     <template slot="content">
-                      <p>1、销售单(非转单)下推时间</p>
-                      <p>2、销售单(转单)转单完结时间</p>
-                      <p>3、销售退货单客服确认时间</p>
+                      <p>1、销售单(非转单)下推时间</p>
+                      <p>2、销售单(转单)转单完结时间</p>
+                      <p>3、销售退货单客服确认时间</p>
                     </template>
                     查询月份 <a-icon type="question-circle" />
                   </a-popover>
@@ -190,14 +190,14 @@ export default {
         { title: '分区', dataIndex: 'subareaArea.subareaAreaName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'provinceName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '记账主体', dataIndex: 'belongDealerName', width: '15%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '服务费(记)', dataIndex: 'subsidyServiceSales', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '服务费(扣)', dataIndex: 'subsidyServiceReturn', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '服务费合计', dataIndex: 'subsidyServiceTotal', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '运费补贴(总部记)', dataIndex: 'subsidyShippingSales', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '运费补贴(总部扣)', dataIndex: 'subsidyShippingReturn', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '运费补贴(转单记)', dataIndex: 'subsidyShippingTransferAdd', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '运费补贴(转单扣)', dataIndex: 'subsidyShippingTransferSub', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '运费补贴合计', dataIndex: 'subsidyShippingTotal', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '服务费金额(记)', dataIndex: 'subsidyServiceSales', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '服务费金额(扣)', dataIndex: 'subsidyServiceReturn', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '服务费金额合计', dataIndex: 'subsidyServiceTotal', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '运费补贴金额(总部记)', dataIndex: 'subsidyShippingSales', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '运费补贴金额(总部扣)', dataIndex: 'subsidyShippingReturn', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '运费补贴金额(转单记)', dataIndex: 'subsidyShippingTransferAdd', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '运费补贴金额(转单扣)', dataIndex: 'subsidyShippingTransferSub', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '运费补贴金额合计', dataIndex: 'subsidyShippingTotal', width: '10%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ]
       return arr
     }