Просмотр исходного кода

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

lilei 1 неделя назад
Родитель
Сommit
ca0ed7644b

+ 1 - 1
src/views/reportData/billingStatistics/customerCountList.vue

@@ -387,7 +387,7 @@ export default {
       params.removeReportFlag = this.removeReportFlag
       _this.exportLoading = true
       _this.spinning = true
-      hdExportExcel(salesStatsDealerExport, params, this.removeReportFlag == 0 ? '开单统计报表(客户)' : '未统计销售退货(客户)', function () {
+      hdExportExcel(salesStatsDealerExport, params, this.removeReportFlag == 0 ? '开单统计报表(客户)' : '剔除数据(客户)', function () {
         _this.exportLoading = false
         _this.spinning = false
       })

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

@@ -8,10 +8,10 @@
         <a-tab-pane key="2" tab="开单统计报表(省份)" force-render>
           <provinceCountList ref="provinceList" :tableTitle="tableTitle1" :removeReportFlag="0"></provinceCountList>
         </a-tab-pane>
-        <a-tab-pane key="3" tab="未统计销售退货(客户)" force-render>
+        <a-tab-pane key="3" tab="剔除数据(客户)" force-render>
           <customerCountList ref="customerList1" :tableTitle="tableTitle2" :removeReportFlag="1"></customerCountList>
         </a-tab-pane>
-        <a-tab-pane key="4" tab="未统计销售退货(省份)" force-render>
+        <a-tab-pane key="4" tab="剔除数据(省份)" force-render>
           <provinceCountList ref="provinceList1" :tableTitle="tableTitle3" :removeReportFlag="1"></provinceCountList>
         </a-tab-pane>
       </a-tabs>

+ 1 - 1
src/views/reportData/billingStatistics/provinceCountList.vue

@@ -297,7 +297,7 @@ export default {
       params.removeReportFlag = this.removeReportFlag
       _this.exportLoading = true
       _this.spinning = true
-      hdExportExcel(salesStatsProvinceExport, params, this.removeReportFlag == 0 ? '开单统计报表(省份)' : '未统计销售退货(省份)', function () {
+      hdExportExcel(salesStatsProvinceExport, params, this.removeReportFlag == 0 ? '开单统计报表(省份)' : '剔除数据(省份)', function () {
         _this.exportLoading = false
         _this.spinning = false
       })

+ 1 - 1
src/views/setting/dailyReportSettings/index.vue

@@ -17,7 +17,7 @@
         <a-tab-pane key="5" tab="分区月目标" force-render>
           <partitionTargetList pageType="PARTITION_MONTHLY_TARGET"></partitionTargetList>
         </a-tab-pane>
-        <a-tab-pane key="6" tab="销售退货剔除" force-render>
+        <a-tab-pane key="6" tab="销售/销售退货剔除" force-render>
           <salesReturnRemove></salesReturnRemove>
         </a-tab-pane>
       </a-tabs>

+ 1 - 1
src/views/setting/salesReturnRemove/baseModal.vue

@@ -182,7 +182,7 @@ export default {
     getDetail () {
       bizRemoveConfigDetail({ bizSn: this.bizSn, configType: 'BILLING_REPORT' }).then(res => {
         const { bizSn, bizNo, dealerSn, dealerName, salesStatsDealer, salesStatsProvince } = res.data
-        this.dealerData = { buyerName: dealerName }
+        this.dealerData = { dealerName: dealerName }
         this.form = Object.assign(this.form, {
           bizNo: bizNo,
           dealerSn: dealerSn,