1

src/components/FinancialModule/DataAnalysis/allEchart.vue

@@ -267,6 +267,7 @@
 </template>
 
 <script>
+import moment from 'moment';
 import IncomeChange from "./components/oneEchart/IncomeChange.vue";
 import IncomeShare from "./components/oneEchart/IncomeShare.vue";
 import WoolRateChange from "./components/oneEchart/WoolRateChange.vue";
@@ -399,10 +400,11 @@ export default {
   },
   mounted() {
     this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id
-    const end = new Date();
-    const start = new Date();
-    start.setMonth(start.getMonth() - 6);
-    this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
+    
+    let sDate = moment().subtract(7, 'months').format('YYYY-MM');
+    let eDate = moment().subtract(1, 'months').format('YYYY-MM');
+
+    this.dateTime = [sDate,eDate]
     this.msg.startDate = this.dateTime[0]
     this.msg.endDate = this.dateTime[1]
 
@@ -524,7 +526,7 @@ export default {
         this.msg.LineIdList = [],
         this.msg.LineIdStr = ''
         this.msg.IsLastData = 2
-        this.msg.OutBranchIdList = [0]
+        this.msg.OutBranchIdList = [0,1,32,33]
         this.msg.StandardBranchIds =  '0'
         this.coinGetShow = true
         this.msg.StandardCurrencyId = -1
@@ -555,10 +557,10 @@ export default {
         this.msg.startDate = this.dateTime[0]
         this.msg.endDate = this.dateTime[1]
       }else{
-        const end = new Date();
-        const start = new Date();
-        start.setMonth(start.getMonth() - 6);
-        this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
+        let sDate = moment().subtract(7, 'months').format('YYYY-MM');
+        let eDate = moment().subtract(1, 'months').format('YYYY-MM');
+
+        this.dateTime = [sDate,eDate]
         this.msg.startDate = start
         this.msg.endDate = end
       }

src/components/FinancialModule/DataAnalysis/components/twoEchart/ActualRateColumnar.vue

 <template>
   <div class="echartsBox">
     <div class="titleBox row">
-      <h3>净利润变化趋势图</h3>
+      <h3>净利润变化趋势图（简易报表的净利润）</h3>
       <div style="margin-left: 20px;">
 
 

src/components/FinancialModule/DataAnalysis/components/twoEchart/ActualRateColumnarZZT.vue

 <template>
   <div class="echartsBox">
     <div class="titleBox row">
-      <h3>实际利润变化趋势图</h3>
+      <h3>实际利润变化趋势图（营收报表的实际利润）</h3>
       <div style="margin-left: 20px;">
 
 

src/components/FinancialModule/DataAnalysis/components/twoEchart/WoolRateColumnar.vue

 <template>
   <div class="echartsBox">
     <div class="titleBox row">
-      <h3>营业利润变化趋势图</h3>
+      <h3>营业利润变化趋势图（营收报表实际利润+联运收入）</h3>
       <div style="margin-left: 20px;">
 
 

src/components/FinancialModule/DataAnalysis/index.vue

@@ -177,6 +177,7 @@
 </template>
 
 <script>
+import moment from 'moment';
 import Lines from "./components/line.vue";
 import Corporations from "./components/corporation.vue";
 import Packets from "./components/packet.vue";
@@ -254,10 +255,10 @@ export default {
   },
   mounted() {
     this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id
-    const end = new Date();
-    const start = new Date();
-    start.setMonth(start.getMonth() - 6);
-    this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
+    let sDate = moment().subtract(7, 'months').format('YYYY-MM');
+    let eDate = moment().subtract(1, 'months').format('YYYY-MM');
+
+    this.dateTime = [sDate,eDate]
     this.msg.startDate = this.dateTime[0]
     this.msg.endDate = this.dateTime[1]
 
@@ -361,10 +362,10 @@ export default {
         this.msg.startDate = this.dateTime[0]
         this.msg.endDate = this.dateTime[1]
       }else{
-        const end = new Date();
-        const start = new Date();
-        start.setMonth(start.getMonth() - 6);
-        this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
+        let sDate = moment().subtract(7, 'months').format('YYYY-MM');
+        let eDate = moment().subtract(1, 'months').format('YYYY-MM');
+
+        this.dateTime = [sDate,eDate]
         this.msg.startDate = start
         this.msg.endDate = end
       }