소스 검색

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

1004749546@qq.com 3 년 전
부모
커밋
26be67e083

+ 191 - 191
src/config/router.config.js

@@ -1584,12 +1584,12 @@ export const asyncRouterMap = [
         },
         children: [
           {
-            path: '/reportData/actualSalesReport',
-            redirect: '/reportData/actualSalesReport/list',
-            name: 'actualSalesReport',
+            path: '/reportData/salesDetails',
+            redirect: '/reportData/salesDetails/list',
+            name: 'salesDetails',
             component: RouteView,
             meta: {
-              title: '实售销售报表',
+              title: '销售明细(开单统计)',
               icon: 'profile'
               // permission: 'M_warehouseList'
             },
@@ -1597,10 +1597,10 @@ export const asyncRouterMap = [
             children: [
               {
                 path: 'list',
-                name: 'actualSalesReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/actualSalesReport/list.vue'),
+                name: 'salesDetailsList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesDetails/list.vue'),
                 meta: {
-                  title: '实售销售列表',
+                  title: '销售明细列表',
                   icon: 'profile',
                   hidden: true
                   // permission: 'M_warehouseList'
@@ -1609,12 +1609,12 @@ export const asyncRouterMap = [
             ]
           },
           {
-            path: '/reportData/billingReturnReport',
-            redirect: '/reportData/billingReturnReport/list',
-            name: 'billingReturnReport',
+            path: '/reportData/allocationOrderTotal',
+            redirect: '/reportData/allocationOrderTotal/list',
+            name: 'allocationOrderTotal',
             component: RouteView,
             meta: {
-              title: '开单退货报表',
+              title: '调拨开单统计',
               icon: 'profile'
               // permission: 'M_warehouseList'
             },
@@ -1622,10 +1622,10 @@ export const asyncRouterMap = [
             children: [
               {
                 path: 'list',
-                name: 'billingReturnReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/billingReturnReport/list.vue'),
+                name: 'allocationOrderTotalList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/allocationOrderTotal/list.vue'),
                 meta: {
-                  title: '开单退货列表',
+                  title: '调拨开单列表',
                   icon: 'profile',
                   hidden: true
                   // permission: 'M_warehouseList'
@@ -1634,12 +1634,12 @@ export const asyncRouterMap = [
             ]
           },
           {
-            path: '/reportData/salesReturnReport',
-            redirect: '/reportData/salesReturnReport/list',
-            name: 'salesReturnReport',
+            path: '/reportData/allocationDetails',
+            redirect: '/reportData/allocationDetails/list',
+            name: 'allocationDetails',
             component: RouteView,
             meta: {
-              title: '实售退货报表',
+              title: '调拨明细',
               icon: 'profile'
               // permission: 'M_warehouseList'
             },
@@ -1647,10 +1647,10 @@ export const asyncRouterMap = [
             children: [
               {
                 path: 'list',
-                name: 'salesReturnReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesReturnReport/list.vue'),
+                name: 'allocationDetailsList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/allocationDetails/list.vue'),
                 meta: {
-                  title: '实售退货列表',
+                  title: '调拨明细列表',
                   icon: 'profile',
                   hidden: true
                   // permission: 'M_warehouseList'
@@ -1659,12 +1659,12 @@ export const asyncRouterMap = [
             ]
           },
           {
-            path: '/reportData/priceDifferenceDetailReport',
-            redirect: '/reportData/priceDifferenceDetailReport/list',
-            name: 'priceDifferenceDetailReport',
+            path: '/reportData/salesReturnsReport',
+            redirect: '/reportData/salesReturnsReport/list',
+            name: 'salesReturnsReport',
             component: RouteView,
             meta: {
-              title: '总部差价明细报表',
+              title: '销售退货单报表',
               icon: 'profile'
               // permission: 'M_warehouseList'
             },
@@ -1672,10 +1672,10 @@ export const asyncRouterMap = [
             children: [
               {
                 path: 'list',
-                name: 'priceDifferenceDetailReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/priceDifferenceDetailReport/list.vue'),
+                name: 'salesReturnsReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesReturnsReport/list.vue'),
                 meta: {
-                  title: '总部差价明细列表',
+                  title: '销售退货单报表列表',
                   icon: 'profile',
                   hidden: true
                   // permission: 'M_warehouseList'
@@ -1683,106 +1683,6 @@ export const asyncRouterMap = [
               }
             ]
           },
-          {
-            path: '/reportData/provinceTypeSalesDetails',
-            redirect: '/reportData/provinceTypeSalesDetails/list',
-            name: 'provinceTypeSalesDetails',
-            component: RouteView,
-            meta: {
-              title: '全国各省品类实际销售明细',
-              icon: 'deployment-unit'
-              // permission: 'M_warehouseList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'provinceTypeSalesDetailsList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/reportData/provinceTypeSalesDetails/list.vue'),
-                meta: {
-                  title: '全国各省品类实际销售明细列表',
-                  icon: 'deployment-unit',
-                  hidden: true
-                  // permission: 'M_warehouseList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/districtTypeSalesDetails',
-            redirect: '/reportData/districtTypeSalesDetails/list',
-            name: 'districtTypeSalesDetails',
-            component: RouteView,
-            meta: {
-              title: '全国各区品类实际销售明细',
-              icon: 'deployment-unit'
-              // permission: 'M_warehouseList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'districtTypeSalesDetailsList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/reportData/districtTypeSalesDetails/list.vue'),
-                meta: {
-                  title: '全国各区品类实际销售明细列表',
-                  icon: 'deployment-unit',
-                  hidden: true
-                  // permission: 'M_warehouseList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/regionalPromotionCostStatistics',
-            redirect: '/reportData/regionalPromotionCostStatistics/list',
-            name: 'regionalPromotionCostStatistics',
-            component: RouteView,
-            meta: {
-              title: '区域促销费用统计',
-              icon: 'deployment-unit'
-              // permission: 'M_warehouseList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'regionalPromotionCostStatisticsList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/reportData/regionalPromotionCostStatistics/list.vue'),
-                meta: {
-                  title: '区域促销费用统计列表',
-                  icon: 'deployment-unit',
-                  hidden: true
-                  // permission: 'M_warehouseList'
-                }
-              }
-            ]
-          },
-          {
-            path: '/reportData/nationalCustomerCostStatistics',
-            redirect: '/reportData/nationalCustomerCostStatistics/list',
-            name: 'nationalCustomerCostStatistics',
-            component: RouteView,
-            meta: {
-              title: '全国客户费用统计',
-              icon: 'deployment-unit'
-              // permission: 'M_warehouseList'
-            },
-            hideChildrenInMenu: true,
-            children: [
-              {
-                path: 'list',
-                name: 'nationalCustomerCostStatisticsList',
-                component: () => import(/* webpackChunkName: "shop" */ '@/views/reportData/nationalCustomerCostStatistics/list.vue'),
-                meta: {
-                  title: '全国客户费用统计列表',
-                  icon: 'deployment-unit',
-                  hidden: true
-                  // permission: 'M_warehouseList'
-                }
-              }
-            ]
-          },
           {
             path: '/reportData/salesReturnDetailReport',
             redirect: '/reportData/salesReturnDetailReport/list',
@@ -1880,105 +1780,205 @@ export const asyncRouterMap = [
             }]
           },
           {
-            path: '/reportData/salesDetails',
-            redirect: '/reportData/salesDetails/list',
-            name: 'salesDetails',
+            path: '/reportData/actualSalesReport',
+            redirect: '/reportData/actualSalesReport/list',
+            name: 'actualSalesReport',
             component: RouteView,
             meta: {
-			  title: '销售明细(开单统计)',
-			  icon: 'profile'
-			  // permission: 'M_warehouseList'
+              title: '实售销售报表',
+              icon: 'profile'
+              // permission: 'M_warehouseList'
             },
             hideChildrenInMenu: true,
             children: [
-			  {
+              {
                 path: 'list',
-                name: 'salesDetailsList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesDetails/list.vue'),
+                name: 'actualSalesReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/actualSalesReport/list.vue'),
                 meta: {
-				  title: '销售明细列表',
-				  icon: 'profile',
-				  hidden: true
-				  // permission: 'M_warehouseList'
+                  title: '实售销售列表',
+                  icon: 'profile',
+                  hidden: true
+                  // permission: 'M_warehouseList'
                 }
-			  }
+              }
             ]
-		  },
-		  {
-            path: '/reportData/allocationOrderTotal',
-            redirect: '/reportData/allocationOrderTotal/list',
-            name: 'allocationOrderTotal',
+          },
+          {
+            path: '/reportData/billingReturnReport',
+            redirect: '/reportData/billingReturnReport/list',
+            name: 'billingReturnReport',
             component: RouteView,
             meta: {
-			  title: '调拨开单统计',
-			  icon: 'profile'
-			  // permission: 'M_warehouseList'
+              title: '开单退货报表',
+              icon: 'profile'
+              // permission: 'M_warehouseList'
             },
             hideChildrenInMenu: true,
             children: [
-			  {
+              {
                 path: 'list',
-                name: 'allocationOrderTotalList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/allocationOrderTotal/list.vue'),
+                name: 'billingReturnReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/billingReturnReport/list.vue'),
                 meta: {
-				  title: '调拨开单列表',
-				  icon: 'profile',
-				  hidden: true
-				  // permission: 'M_warehouseList'
+                  title: '开单退货列表',
+                  icon: 'profile',
+                  hidden: true
+                  // permission: 'M_warehouseList'
                 }
-			  }
+              }
             ]
-		  },
-		  {
-            path: '/reportData/allocationDetails',
-            redirect: '/reportData/allocationDetails/list',
-            name: 'allocationDetails',
+          },
+          {
+            path: '/reportData/salesReturnReport',
+            redirect: '/reportData/salesReturnReport/list',
+            name: 'salesReturnReport',
             component: RouteView,
             meta: {
-			  title: '调拨明细',
-			  icon: 'profile'
-			  // permission: 'M_warehouseList'
+              title: '实售退货报表',
+              icon: 'profile'
+              // permission: 'M_warehouseList'
             },
             hideChildrenInMenu: true,
             children: [
-			  {
+              {
                 path: 'list',
-                name: 'allocationDetailsList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/allocationDetails/list.vue'),
+                name: 'salesReturnReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesReturnReport/list.vue'),
                 meta: {
-				  title: '调拨明细列表',
-				  icon: 'profile',
-				  hidden: true
-				  // permission: 'M_warehouseList'
+                  title: '实售退货列表',
+                  icon: 'profile',
+                  hidden: true
+                  // permission: 'M_warehouseList'
                 }
-			  }
+              }
             ]
-		  },
-		  {
-            path: '/reportData/salesReturnsReport',
-            redirect: '/reportData/salesReturnsReport/list',
-            name: 'salesReturnsReport',
+          },
+          {
+            path: '/reportData/priceDifferenceDetailReport',
+            redirect: '/reportData/priceDifferenceDetailReport/list',
+            name: 'priceDifferenceDetailReport',
             component: RouteView,
             meta: {
-			  title: '销售退货单报表',
-			  icon: 'profile'
-			  // permission: 'M_warehouseList'
+              title: '总部差价明细报表',
+              icon: 'profile'
+              // permission: 'M_warehouseList'
             },
             hideChildrenInMenu: true,
             children: [
-			  {
+              {
                 path: 'list',
-                name: 'salesReturnsReportList',
-                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/salesReturnsReport/list.vue'),
+                name: 'priceDifferenceDetailReportList',
+                component: () => import(/* webpackChunkName: "reportData" */ '@/views/reportData/priceDifferenceDetailReport/list.vue'),
                 meta: {
-				  title: '销售退货单报表列表',
-				  icon: 'profile',
-				  hidden: true
-				  // permission: 'M_warehouseList'
+                  title: '总部差价明细列表',
+                  icon: 'profile',
+                  hidden: true
+                  // permission: 'M_warehouseList'
                 }
-			  }
+              }
             ]
-		  }
+          },
+          {
+            path: '/reportData/provinceTypeSalesDetails',
+            redirect: '/reportData/provinceTypeSalesDetails/list',
+            name: 'provinceTypeSalesDetails',
+            component: RouteView,
+            meta: {
+              title: '全国各省品类实际销售明细',
+              icon: 'deployment-unit'
+              // permission: 'M_warehouseList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'provinceTypeSalesDetailsList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/reportData/provinceTypeSalesDetails/list.vue'),
+                meta: {
+                  title: '全国各省品类实际销售明细列表',
+                  icon: 'deployment-unit',
+                  hidden: true
+                  // permission: 'M_warehouseList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/districtTypeSalesDetails',
+            redirect: '/reportData/districtTypeSalesDetails/list',
+            name: 'districtTypeSalesDetails',
+            component: RouteView,
+            meta: {
+              title: '全国各区品类实际销售明细',
+              icon: 'deployment-unit'
+              // permission: 'M_warehouseList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'districtTypeSalesDetailsList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/reportData/districtTypeSalesDetails/list.vue'),
+                meta: {
+                  title: '全国各区品类实际销售明细列表',
+                  icon: 'deployment-unit',
+                  hidden: true
+                  // permission: 'M_warehouseList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/regionalPromotionCostStatistics',
+            redirect: '/reportData/regionalPromotionCostStatistics/list',
+            name: 'regionalPromotionCostStatistics',
+            component: RouteView,
+            meta: {
+              title: '区域促销费用统计',
+              icon: 'deployment-unit'
+              // permission: 'M_warehouseList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'regionalPromotionCostStatisticsList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/reportData/regionalPromotionCostStatistics/list.vue'),
+                meta: {
+                  title: '区域促销费用统计列表',
+                  icon: 'deployment-unit',
+                  hidden: true
+                  // permission: 'M_warehouseList'
+                }
+              }
+            ]
+          },
+          {
+            path: '/reportData/nationalCustomerCostStatistics',
+            redirect: '/reportData/nationalCustomerCostStatistics/list',
+            name: 'nationalCustomerCostStatistics',
+            component: RouteView,
+            meta: {
+              title: '全国客户费用统计',
+              icon: 'deployment-unit'
+              // permission: 'M_warehouseList'
+            },
+            hideChildrenInMenu: true,
+            children: [
+              {
+                path: 'list',
+                name: 'nationalCustomerCostStatisticsList',
+                component: () => import(/* webpackChunkName: "shop" */ '@/views/reportData/nationalCustomerCostStatistics/list.vue'),
+                meta: {
+                  title: '全国客户费用统计列表',
+                  icon: 'deployment-unit',
+                  hidden: true
+                  // permission: 'M_warehouseList'
+                }
+              }
+            ]
+          }
         ]
       },
       // 权限管理

+ 1 - 1
src/views/reportData/actualSalesReport/list.vue

@@ -63,7 +63,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"

+ 11 - 10
src/views/reportData/allocationDetails/list.vue

@@ -140,7 +140,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
@@ -191,20 +191,21 @@ export default {
       checkVal: '',
       reportData: reportData.reportDataList,
       columns: [
-        { title: '区域', dataIndex: 'data1', width: 200, align: 'center', fixed: 'left', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '区域', dataIndex: 'data1', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨单号', dataIndex: 'data2', width: 200, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
-        { title: '调拨开单日期', dataIndex: 'data3', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '调拨开单日期', dataIndex: 'data3', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'data4', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '客户名称', dataIndex: 'data5', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '客户名称', dataIndex: 'data5', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') }, ellipsis: true },
         { title: '客户类型', dataIndex: 'data6', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '品牌', dataIndex: 'data7', width: 200, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '品牌', dataIndex: 'data7', width: 200, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') }, ellipsis: true },
         { title: '二级类别', dataIndex: 'data8', width: 200, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '产品名称', dataIndex: 'data9', width: 120, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '产品名称', dataIndex: 'data9', align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') }, ellipsis: true },
         { title: '产品编码', dataIndex: 'data10', width: 120, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '调拨数量', dataIndex: 'data11', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'data12', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '进价', dataIndex: 'data13', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '售价', dataIndex: 'data14', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调拨数量', dataIndex: 'data11', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '单位', dataIndex: 'data12', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '进价', dataIndex: 'data13', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '售价', dataIndex: 'data14', width: 100, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '总进价', dataIndex: 'data15', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '毛利', dataIndex: 'data16', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库', dataIndex: 'data17', width: 120, align: 'center', sorter: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 5 - 4
src/views/reportData/allocationOrderTotal/list.vue

@@ -57,10 +57,11 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
+      :scroll="{ x: 1140 }"
       bordered>
       <template slot="footer" slot-scope="currentPageData">
         <a-row :gutter="15">
@@ -104,10 +105,10 @@ export default {
       checkVal: '',
       reportData: reportData.reportDataList,
       columns: [
-        // { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
         { title: '调拨单号', dataIndex: 'data1', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '调拨开单日期', dataIndex: 'data2', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'data3', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '调拨开单日期', dataIndex: 'data2', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'data3', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '调拨数量', dataIndex: 'data4', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '进价', dataIndex: 'data5', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '毛利', dataIndex: 'data6', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 1 - 1
src/views/reportData/billingReturnReport/list.vue

@@ -63,7 +63,7 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"

+ 7 - 6
src/views/reportData/salesDetails/list.vue

@@ -126,11 +126,11 @@
     <s-table
       class="sTable"
       ref="table"
-      size="default"
+      size="small"
       :rowKey="(record) => record.id"
       :columns="columns"
       :data="loadData"
-      :scroll="{ x: 3100 }"
+      :scroll="{ x: 3500 }"
       bordered>
       <template slot="footer" slot-scope="currentPageData">
         <a-row :gutter="15">
@@ -180,15 +180,16 @@ export default {
       checkVal: '',
       reportData: reportData.reportDataList,
       columns: [
-        { title: '区域', dataIndex: 'data1', width: 200, align: 'center', fixed: 'left', customRender: function (text) { return text || '--' } },
+        { title: '序号', dataIndex: 'no', width: 80, align: 'center', fixed: 'left' },
+        { title: '区域', dataIndex: 'data1', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '销售单号', dataIndex: 'data2', width: 200, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '省份', dataIndex: 'data3', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'data4', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '客户名称', dataIndex: 'data4', width: 220, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '客户类型', dataIndex: 'data5', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '直接绑定客户类型', dataIndex: 'data6', width: 200, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '间接绑定客户类型', dataIndex: 'data7', width: 200, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '开单日期', dataIndex: 'data8', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '销售日期', dataIndex: 'data9', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '开单日期', dataIndex: 'data8', width: 160, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '销售日期', dataIndex: 'data9', width: 160, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '品牌', dataIndex: 'data10', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '二级类别', dataIndex: 'data11', width: 120, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品名称', dataIndex: 'data12', width: 120, align: 'center', ellipsis: true, customRender: function (text) { return ((text || text == 0) ? text : '--') } },

+ 1 - 1
src/views/salesManagement/outboundOrder/list.vue

@@ -118,7 +118,7 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       columns: [
         { title: '创建时间', dataIndex: 'createDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditDate', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditTime', width: 160, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库单号', scopedSlots: { customRender: 'stockOutNo' }, width: 220, align: 'center' },
         { title: '业务单号', dataIndex: 'outBizNo', width: 220, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '出库类型', dataIndex: 'outBizTypeDictValue', width: 140, align: 'center', customRender: function (text) { return text || '--' } },