1

src/components/FinancialModule/DataAnalysis/allEchart.vue

@@ -98,7 +98,7 @@
               </el-form-item>
             </el-col>
           </template>
-          <el-col :span="4">
+          <el-col :span="3">
             <el-form-item :label="$t('fnc.bweibi')">
               <el-select :disabled="coinGetShow" filterable v-model="msg.StandardCurrencyId"  @change="getStatement">
                 <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
@@ -172,11 +172,11 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <!-- <el-col :span="2" v-if="msg.Type!=3">
-            <el-form-item label="季度汇总">
-              <el-checkbox v-model="msg.LossType" true-label="1" false-label="0" @change="getStatement"></el-checkbox>
+          <el-col :span="3" v-if="activeName!=4">
+            <el-form-item label="同比年度">
+              <el-input v-model="msg.QueryCondition" type="number"></el-input>
             </el-form-item>
-          </el-col> -->
+          </el-col>
         </el-row>
       </el-form>
       <ul class="clearfix">
@@ -344,7 +344,9 @@ export default {
         LossType:'0',
         IsLastData:1,
         LineIdList: [14],
-        LineIdStr: '14'
+        LineIdStr: '14',
+        QueryCondition: '',
+        Is_Open:0
       },
       shopMsg:{
         startDate: '',
@@ -363,6 +365,7 @@ export default {
         {Name: '领队导游排名',Id:2},
         {Name: '佣金占比统计',Id:3},
       ],
+      testMsg:"人均收入",
       dateTime: [],
       CompanyList: [],
       getCompanyMsg: {
@@ -492,6 +495,8 @@ export default {
       this.msg.LineIdStr = this.msg.LineIdList.join(',')
       if(this.msg.Type==2) this.msg.StandardBranchIds = this.msg.OutBranchIdList.join(',')
 
+      if(this.msg.QueryCondition !=''){this.msg.Is_Open=1;}else{this.msg.Is_Open=0;}
+
       this.loading = true
       let msg = this.msg
       let url ='financestatistics_post_GetDataAnalysisStat'

src/components/FinancialModule/DataAnalysis/components/threeEchart/ActualRateChange.vue

@@ -81,7 +81,7 @@ export default {
           },
           data: x.MonthData.map(x=>{ return x.toFixed(0) })	// 绑定实时数据数组
         }
-        if(x.Name=='人均车资') datas.push(obj)
+        if(x.Name.indexOf('人均车资')==0) datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;

src/components/FinancialModule/DataAnalysis/components/threeEchart/ActualRateChange2.vue

@@ -81,7 +81,7 @@ export default {
           },
           data: x.MonthData.map(x=>{ return x.toFixed(0) })	// 绑定实时数据数组
         }
-        if(x.Name=='人均房费') datas.push(obj)
+        if(x.Name.indexOf('人均房费')==0) datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;

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

@@ -82,7 +82,7 @@ export default {
           },
           data: x.MonthData.map(x=>{ return (x/10000).toFixed(2) })	// 绑定实时数据数组
         }
-        if(x.Name=='毛利') datas.push(obj)
+        if(x.Name.indexOf('毛利')==0) datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;

src/components/FinancialModule/DataAnalysis/components/threeEchart/ActualRateColumnar2.vue

@@ -82,7 +82,7 @@ export default {
           },
           data: x.MonthData.map(x=>{ return (x/10000).toFixed(2) })	// 绑定实时数据数组
         }
-        if(x.Name=='实际利润') datas.push(obj)
+        if(x.Name.indexOf('实际利润')==0) datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;

src/components/FinancialModule/DataAnalysis/components/threeEchart/ChangeProportion.vue

@@ -99,7 +99,7 @@ export default {
           },
           data: x.MonthData.map(x=>{ return x })	// 绑定实时数据数组
         }
-        if(x.Name=='人数') datas.push(obj)
+        if(x.Name.indexOf('人数')==0) datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;

src/components/FinancialModule/DataAnalysis/components/threeEchart/ChangeProportion2.vue

@@ -98,7 +98,7 @@ export default {
           },
           data: x.MonthData.map(x=>{ return x.toFixed(0) })	// 绑定实时数据数组
         }
-        if(x.Name=='人均签证') datas.push(obj)
+        if(x.Name.indexOf('人均签证')==0) datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;

src/components/FinancialModule/DataAnalysis/components/threeEchart/IncomeChange.vue

@@ -82,7 +82,7 @@ export default {
           },
           data: x.MonthData.map(x=>{ return (x/10000).toFixed(2) })	// 绑定实时数据数组
         }
-        if(x.Name=='收入') datas.push(obj)
+        if(x.Name.indexOf('收入')==0) datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;

src/components/FinancialModule/DataAnalysis/components/threeEchart/IncomeChange2.vue

@@ -81,7 +81,7 @@ export default {
           },
           data: x.MonthData.map(x=>{ return x.toFixed(0) })	// 绑定实时数据数组
         }
-        if(x.Name=='人均餐费') datas.push(obj)
+        if(x.Name.indexOf('人均餐费')==0) datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;

src/components/FinancialModule/DataAnalysis/components/threeEchart/IncomeShare.vue

@@ -82,7 +82,7 @@ export default {
           },
           data: x.MonthData.map(x=>{ return x })	// 绑定实时数据数组
         }
-        if(x.Name=='团数') datas.push(obj)
+        if(x.Name.indexOf('团数')==0) datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;

src/components/FinancialModule/DataAnalysis/components/threeEchart/IncomeShare2.vue

@@ -81,7 +81,7 @@ export default {
           },
           data: x.MonthData.map(x=>{ return x.toFixed(0) })	// 绑定实时数据数组
         }
-        if(x.Name=='人均门票') datas.push(obj)
+        if(x.Name.indexOf('人均门票')==0) datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;

src/components/FinancialModule/DataAnalysis/components/threeEchart/WoolRateChange.vue

@@ -81,7 +81,7 @@ export default {
           },
           data: x.MonthData.map(x=>{ return x.toFixed(0) })	// 绑定实时数据数组
         }
-        if(x.Name=='人均机票') datas.push(obj)
+        if(x.Name.indexOf('人均机票')==0) datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;

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

@@ -98,7 +98,7 @@ export default {
           },
           data: x.MonthData.map(x=>{ return x.toFixed(0) })	// 绑定实时数据数组
         }
-        if(x.Name=='人均收入') datas.push(obj)
+        if(x.Name.indexOf('人均收入')==0) datas.push(obj)
         if(indexs>6){
           let name=x.Name;
           Newobj[name]=false;