lilei 6 days ago
parent
commit
1331d29f04

+ 9 - 8
src/views/reportData/billingStatistics/dataCustomer.js

@@ -221,10 +221,10 @@ export default {
       {
         'colour': 'red',
         'customRender': 'amount',
-        'dataIndex': 'lt',
+        'dataIndex': 'luntai',
         'title': '轮胎',
         'align': 'right',
-        'key': 'lt'
+        'key': 'luntai'
       },
       {
         'customRender': 'amount',
@@ -251,10 +251,10 @@ export default {
       {
         'colour': 'red',
         'customRender': 'amount',
-        'dataIndex': 'hj',
+        'dataIndex': 'ppdlpphj',
         'title': '合计',
         'align': 'right',
-        'key': 'hj'
+        'key': 'ppdlpphj'
       }
     ],
     'list': [
@@ -308,6 +308,7 @@ export default {
         'align': 'center',
         'key': 'dealerLevel'
       },
+      { 'title': '销售退货单号', 'key': 'bizNo', 'dataIndex': 'bizNo', 'fixed': 'left', 'align': 'center'},
       {
         'customRender': 'amount',
         'dataIndex': 'jplqq',
@@ -529,10 +530,10 @@ export default {
       {
         'colour': 'red',
         'customRender': 'amount',
-        'dataIndex': 'lt',
+        'dataIndex': 'luntai',
         'title': '轮胎',
         'align': 'right',
-        'key': 'lt'
+        'key': 'luntai'
       },
       {
         'customRender': 'amount',
@@ -559,10 +560,10 @@ export default {
       {
         'colour': 'red',
         'customRender': 'amount',
-        'dataIndex': 'hj',
+        'dataIndex': 'ppdlpphj',
         'title': '合计',
         'align': 'right',
-        'key': 'hj'
+        'key': 'ppdlpphj'
       }
     ]
   }

+ 9 - 8
src/views/reportData/billingStatistics/dataProvince.js

@@ -221,10 +221,10 @@ export default {
     {
       "colour": "red",
       "customRender": "amount",
-      "dataIndex": "lt",
+      "dataIndex": "luntai",
       "title": "轮胎",
       "align": "right",
-      "key": "lt"
+      "key": "luntai"
     },
     {
       "customRender": "amount",
@@ -251,10 +251,10 @@ export default {
     {
       "colour": "red",
       "customRender": "amount",
-      "dataIndex": "hj",
+      "dataIndex": "ppdlpphj",
       "title": "合计",
       "align": "right",
-      "key": "hj"
+      "key": "ppdlpphj"
     }
   ],
   "list": [
@@ -287,6 +287,7 @@ export default {
       "align": "center",
       "key": "provinceName"
     },
+    { 'title': '销售退货单号', 'key': 'bizNo', 'dataIndex': 'bizNo', 'fixed': 'left', 'align': 'center'},
     {
       "customRender": "amount",
       "dataIndex": "jplqq",
@@ -508,10 +509,10 @@ export default {
     {
       "colour": "red",
       "customRender": "amount",
-      "dataIndex": "lt",
+      "dataIndex": "luntai",
       "title": "轮胎",
       "align": "right",
-      "key": "lt"
+      "key": "luntai"
     },
     {
       "customRender": "amount",
@@ -538,10 +539,10 @@ export default {
     {
       "colour": "red",
       "customRender": "amount",
-      "dataIndex": "hj",
+      "dataIndex": "ppdlpphj",
       "title": "合计",
       "align": "right",
-      "key": "hj"
+      "key": "ppdlpphj"
     }
   ]
 }

+ 6 - 4
src/views/reportData/billingStatistics/index.vue

@@ -9,10 +9,10 @@
           <provinceCountList ref="provinceList" :tableTitle="tableTitle1" :removeReportFlag="0"></provinceCountList>
         </a-tab-pane>
         <a-tab-pane key="3" tab="未统计销售退货(客户)" force-render>
-          <customerCountList ref="customerList1" :tableTitle="tableTitle" :removeReportFlag="1"></customerCountList>
+          <customerCountList ref="customerList1" :tableTitle="tableTitle2" :removeReportFlag="1"></customerCountList>
         </a-tab-pane>
         <a-tab-pane key="4" tab="未统计销售退货(省份)" force-render>
-          <provinceCountList ref="provinceList1" :tableTitle="tableTitle1" :removeReportFlag="1"></provinceCountList>
+          <provinceCountList ref="provinceList1" :tableTitle="tableTitle3" :removeReportFlag="1"></provinceCountList>
         </a-tab-pane>
       </a-tabs>
     </a-card>
@@ -32,8 +32,10 @@ export default {
   data () {
     return {
       tabVal: 1, // tab值  1轮胎月度费用报表 2轮胎季度费用报表 3轮胎年度费用报表 4轮胎费用明细报表
-      tableTitle: tableTitle,
-      tableTitle1: tableTitle1
+      tableTitle: { count: tableTitle.count, list: tableTitle.list.filter(item => item.key !== 'bizNo') },
+      tableTitle1: { count: tableTitle1.count, list: tableTitle1.list.filter(item => item.key !== 'bizNo') },
+      tableTitle2: tableTitle,
+      tableTitle3: tableTitle1
     }
   },
   methods: {

+ 0 - 3
src/views/reportData/billingStatistics/provinceCountList.vue

@@ -220,9 +220,6 @@ export default {
         item.width = tw + 'px'
         this.tableWidth = this.tableWidth + tw
       })
-      if (this.removeReportFlag == 1) {
-
-      }
       this.resetSearchForm()
     },
     // 查询

+ 9 - 8
src/views/setting/dailyReportSettings/salesReturnRemove.vue

@@ -157,14 +157,15 @@ export default {
       const a = ['', '剔除']
       const arr = [
         { title: '编号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '总部销退单号', dataIndex: 'bizNo', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '退货日期', dataIndex: 'bizDate', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '全国销售日报', dataIndex: 'countrySalesDay', width: '6%', align: 'center', customRender: function (text) { return a[text] } },
-        { title: '项目销售日报1', dataIndex: 'dailyPl', width: '6%', align: 'center', customRender: function (text) { return a[text] } },
-        { title: '项目销售日报2', dataIndex: 'dailyPljl', width: '5%', align: 'center', customRender: function (text) { return a[text] } },
-        { title: '分区销售日报', dataIndex: 'areaSalesDay', width: '5%', align: 'center', customRender: function (text) { return a[text] } },
-        { title: '创建时间', dataIndex: 'createDate', width: '5%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总部销退单号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货状态', dataIndex: 'billStatusDictValue', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货日期', dataIndex: 'bizDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '客户名称', dataIndex: 'dealerName', width: '16%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '全国销售日报', dataIndex: 'countrySalesDay', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
+        { title: '项目销售日报1', dataIndex: 'dailyPl', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
+        { title: '项目销售日报2', dataIndex: 'dailyPljl', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
+        { title: '分区销售日报', dataIndex: 'areaSalesDay', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
+        { title: '创建时间', dataIndex: 'createDate', width: '8%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '6%', align: 'center' }
       ]
       return arr

+ 2 - 1
src/views/setting/salesReturnRemove/list.vue

@@ -161,8 +161,9 @@ export default {
       const arr = [
         { title: '编号', dataIndex: 'no', width: '4%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '总部销退单号', dataIndex: 'bizNo', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货状态', dataIndex: 'billStatusDictValue', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '退货日期', dataIndex: 'bizDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '客户名称', dataIndex: 'dealerName', width: '10%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'dealerName', width: '26%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '开单统计(客户)', dataIndex: 'salesStatsDealer', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
         { title: '开单统计(省份)', dataIndex: 'salesStatsProvince', width: '10%', align: 'center', customRender: function (text) { return a[text] } },
         { title: '创建时间', dataIndex: 'createDate', width: '10%', align: 'center', customRender: function (text) { return text || '--' } },