Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/FinancialModule/DataAnalysis/allEchart.vue

@@ -109,6 +109,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4" v-if="activeName==4">
+            <el-form-item label="汇率">
+              <el-input v-model="shopMsg.MaoLiRate" type="number" @change="getChange"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col v-if="activeName!=4 && activeName!=3" :span="msg.LineIdList.length<2?4:'4'">
             <el-form-item label="线路">
               <el-select
@@ -421,7 +426,7 @@ export default {
           this.coinGetShow = true
         }
       }
-
+      if(!this.shopMsg.MaoLiRate) this.shopMsg.MaoLiRate = 0.049
       this.getStatement();
     },
     financeinfo_post_GetList(){ // 获取币种
@@ -454,9 +459,6 @@ export default {
       let url ='financestatistics_post_GetDataAnalysisStat'
 
       if(this.activeName=='4'){
-        if(this.msg.StandardCurrencyId==1||!this.msg.StandardCurrencyId){
-          this.shopMsg.MaoLiRate = 0.049
-        }
         this.shopMsg.startDate = this.msg.startDate
         this.shopMsg.endDate = this.msg.endDate
         msg = this.shopMsg
@@ -467,7 +469,6 @@ export default {
         msg,
         res => {
           if (res.data.resultCode == 1) {
-            console.log(this.StatisticalData,'=---------'  )
             this.StatisticalData = res.data.data
           } else {
             this.Error(res.data.message);

src/components/FinancialModule/DataAnalysis/components/ShoppingCommission.vue

@@ -26,7 +26,7 @@
           label="购物占比"
           min-width="120" align="center">
           <template slot-scope="scope">
-              {{scope.row.DetailList[i].TotalRate.toFixed(2)}}%
+              {{scope.row.DetailList[i].TotalRate}}%
           </template>
         </el-table-column>
         <el-table-column
@@ -42,7 +42,7 @@
           label="返佣占比"
           min-width="120" align="center">
           <template slot-scope="scope">
-              {{scope.row.DetailList[i].CommissionRate.toFixed(2)}}%
+              {{scope.row.DetailList[i].CommissionRate}}%
           </template>
         </el-table-column>
         <el-table-column
@@ -115,7 +115,7 @@
           prop=""
           label="占比" align="center">
             <template slot-scope="scope">
-                {{scope.row.Rate.toFixed(2)}}%
+                {{scope.row.Rate}}%
             </template>
           </el-table-column>
           <el-table-column
@@ -161,7 +161,7 @@
           prop=""
           label="占比"align="center">
             <template slot-scope="scope">
-                {{scope.row.Rate.toFixed(2)}}%
+                {{scope.row.Rate}}%
             </template>
           </el-table-column>
           <el-table-column
@@ -207,7 +207,7 @@
           prop=""
           label="占比" align="center">
             <template slot-scope="scope">
-                {{scope.row.Rate.toFixed(2)}}%
+                {{scope.row.Rate}}%
             </template>
           </el-table-column>
 

src/components/FinancialModule/DataAnalysis/index.vue

@@ -4,7 +4,7 @@
       <el-tab-pane label="线路经营情况" name="1"></el-tab-pane>
       <el-tab-pane label="公司经营情况" name="2"></el-tab-pane>
       <el-tab-pane label="日本小包OR常规" name="3"></el-tab-pane>
-      <!-- <el-tab-pane label="购物佣金情况" name="4"></el-tab-pane> -->
+      <el-tab-pane label="购物佣金情况" name="4"></el-tab-pane>
     </el-tabs>
     <div class="query-box">
       <el-form class="_info_box clearfix" label-width="90px">
@@ -86,6 +86,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4" v-if="activeName==4">
+            <el-form-item label="汇率">
+              <el-input v-model="shopMsg.MaoLiRate" type="number"  @change="getChange"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="4" v-if="activeName!=4">
             <el-form-item label="线路">
               <el-select filterable v-model="msg.LineId" @change="getStatement"
@@ -273,6 +278,7 @@ export default {
         this.coinGetShow = true
         this.msg.StandardCurrencyId = -1
       }
+      if(!this.shopMsg.MaoLiRate) this.shopMsg.MaoLiRate = 0.049
       this.getStatement();
     },
     financeinfo_post_GetList(){ // 获取币种
@@ -297,9 +303,6 @@ export default {
       let msg = this.msg
       let url ='financestatistics_post_GetDataAnalysisStat'
       if(this.activeName=='4') {
-        if(this.msg.StandardCurrencyId==1||!this.msg.StandardCurrencyId){
-          this.shopMsg.MaoLiRate = 0.049
-        }
         this.shopMsg.startDate = this.msg.startDate
         this.shopMsg.endDate = this.msg.endDate
         this.shopMsg.LossType = this.msg.LossType