Merge branch 'master' into langEn

src/components/FinancialModule/DataAnalysis/allEchart.vue

@@ -16,7 +16,6 @@
                   filterable
                   v-model="msg.OutBranchId"
                   @change="getChange"
-                  clearable
                   :disabled="PermissionState==2"
                 >
                   <el-option
@@ -98,7 +97,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>
@@ -122,10 +121,10 @@
               style="width: 100%;" filterable multiple collapse-tags
               v-model="msg.LineIdList" @change="getStatement"
               clearable>
-                <el-option  v-if="activeName!=2"
+                <!-- <el-option  v-if="activeName!=2"
                   :value="0"
                   :label="$t('pub.unlimitedSel')"
-                ></el-option>
+                ></el-option> -->
                 <el-option
                   v-for="item in LineList"
                   :label="item.LineName"
@@ -172,11 +171,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 +343,9 @@ export default {
         LossType:'0',
         IsLastData:1,
         LineIdList: [14],
-        LineIdStr: '14'
+        LineIdStr: '14',
+        QueryCondition: '',
+        Is_Open:0
       },
       shopMsg:{
         startDate: '',
@@ -363,6 +364,7 @@ export default {
         {Name: '领队导游排名',Id:2},
         {Name: '佣金占比统计',Id:3},
       ],
+      testMsg:"人均收入",
       dateTime: [],
       CompanyList: [],
       getCompanyMsg: {
@@ -456,7 +458,7 @@ export default {
         }else{
           this.msg.OutBranchIdList = this.msg.OutBranchIdList.filter(x=>{return x!=-1})
         }
-        if(this.msg.OutBranchIdList.indexOf('-1')!=-1) {
+        if(this.msg.OutBranchIdList.indexOf('-1')!=-1 || this.msg.OutBranchIdList.length ==0) {
           this.coinGetShow = false
           this.msg.StandardCurrencyId = 1
         }else {
@@ -492,6 +494,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 && x.Name.indexOf('毛利率')==-1) 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;

src/components/FinancialModule/DataAnalysis/index.vue

@@ -15,7 +15,6 @@
                 filterable
                 v-model="msg.OutBranchId"
                 @change="getChange"
-                clearable
                 :disabled="PermissionState==2"
               >
                 <el-option
@@ -146,7 +145,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="2" v-if="activeName!=2&&activeName!=3">
+          <el-col :span="2" v-if="activeName!=3">
             <el-form-item label="季度汇总">
               <el-checkbox v-model="msg.LossType" true-label="1" false-label="0" @change="getStatement"></el-checkbox>
             </el-form-item>

src/components/TravelManager/Ticket/TravelticketManager.vue

@@ -937,7 +937,7 @@
           IsSurplusNumGreaterThan: false,
           currentPage: 1,
           //起飞状态
-          FlyState: "0",
+          FlyState: "-1",
           //是否查询采购人员(1-查询，0-不查询)
           IsQueryPurchase: 1,
           //机票编号

src/components/administrative/ElectronicAudit.vue

@@ -154,6 +154,7 @@
                   <el-tooltip class="item" effect="dark" :content="$t('fnc.chakan')" placement="top-start">
                     <el-button type="danger" icon="iconfont icon-chakan" @click="goToDetail(item)" circle></el-button>
                   </el-tooltip>
+
                 </el-row>
               </td>
             </tr>
@@ -341,6 +342,12 @@
                 <el-button type="success" icon="iconfont icon-chakan" circle @click="ViewContract(item)"
                   style="padding:5px;"></el-button>
               </el-tooltip>
+
+              <el-tooltip class="item" effect="dark" content="下载" placement="top-start"
+                v-if="item.Status==2||item.Status==4">
+                <el-button type="success" icon="el-icon-download" circle @click="DownLoadContract(item)">
+                </el-button>
+              </el-tooltip>
             </td>
           </tr>
         </table>
@@ -453,6 +460,39 @@
       };
     },
     methods: {
+      //下载合同
+      DownLoadContract(item) {
+        let msg = {
+          ID: item.ID,
+          CType: item.CType
+        };
+        let urlObj = this.domainManager();
+        this.loading = true;
+        this.$http({
+          headers: {
+            'Content-Type': 'application/json'
+          },
+          method: 'post',
+          url: urlObj.DomainUrl + '/api/file/GetDownLoadTripContract',
+          data: {
+            "msg": msg
+          }
+        }).then(res => {
+          this.loading = false
+          if (res.data.resultCode === 1) {
+            let sign = item.T_ContractNum;
+            const a = document.createElement('a');
+            a.setAttribute('download', '');
+            a.setAttribute('href', urlObj.DomainUrl + '/api/file/DownloadFileForPdf?fileName=' + sign +
+              '.pdf&&fPath=' + res.data.data);
+            a.click();
+          } else {
+            this.Error('PDF获取失败');
+          }
+        }).catch(err => {
+
+        });
+      },
       //出境重新查询
       resetOutQuery() {
         this.msgOut.PageIndex = 1;