1

src/components/FinancialModule/DataAnalysis/index.vue

@@ -13,7 +13,7 @@
               <el-select
                 filterable
                 v-model="msg.OutBranchId"
-                @change="getStatement"
+                @change="getChange"
                 clearable
               >
                 <el-option
@@ -29,6 +29,19 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item :label="$t('fnc.bweibi')">
+              <el-select :disabled="coinGetShow" filterable v-model="msg.StandardCurrencyId" class  @change="getChange">
+                <el-option :value="-1" :label="$t('pub.unlimitedSel')"></el-option>
+                <el-option
+                  v-for="item in coinGetList"
+                  :label="item.Name"
+                  :value="item.ID"
+                  :key="item.ID"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item label="线路">
               <el-select filterable v-model="msg.LineId" @change="getStatement"
@@ -63,6 +76,26 @@
                 </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="4" v-if="msg.Type==2">
+            <el-form-item label="数据类别：">
+              <el-select v-model="msg.DataType" filterable class="w150" @change="getStatement">
+                <el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
+                <el-option value="1" label="团队营收"></el-option>
+                <el-option value="3" label="单办签证"></el-option>
+                <el-option value="15" label="手配费收入"></el-option>
+                <el-option value="16" label="单项机票"></el-option>
+                <el-option value="17" label="单项酒店"></el-option>
+                <el-option value="18" label="单项包车"></el-option>
+                <el-option value="19" label="单项门票"></el-option>
+                <el-option value="20" label="开票收入"></el-option>
+                <el-option value="21" label="日本手配费收入"></el-option>
+                <el-option value="22" label="车行收入"></el-option>
+                <el-option value="23" label="欧洲单团分润收入"></el-option>
+                <el-option value="24" label="欧洲损失分摊"></el-option>
+                <el-option value="25" label="CRM直客部外丟團"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <ul class="clearfix">
@@ -98,8 +131,10 @@ export default {
         startDate: '',
         endDate: '',
         OutBranchId: -1,
+        StandardCurrencyId:0,
         LineId: 0,
-        Type: '1'
+        Type: '1',
+        DataType:'-1'
       },
       dateTime: [],
       CompanyList: [],
@@ -109,6 +144,7 @@ export default {
         Status: "0",
       },
       LineList: [],
+      coinGetList: [],
       pickerOptions: {
         shortcuts: [{
           text: '本月',
@@ -143,10 +179,37 @@ export default {
     this.dateTime = [this.$commonUtils.getFormatDateM(start),this.$commonUtils.getFormatDateM(end)]
     this.msg.startDate = this.dateTime[0]
     this.msg.endDate = this.dateTime[1]
+    this.financeinfo_post_GetList()
     this.getQueryData()
     this.getStatement()
   },
   methods: {
+    getChange(val){
+      if(this.msg.OutBranchId == -1){
+        this.coinGetShow = false
+        this.msg.StandardCurrencyId = val>-1?val:this.coinGetList[0].ID
+      }else{
+        this.coinGetShow = true
+        this.msg.StandardCurrencyId = -1
+      }
+      this.getStatement();
+    },
+    financeinfo_post_GetList(){ // 获取币种
+      this.apipost('financeinfo_post_GetAllStandardCurrencyList',{}, res => {
+        if(res.data.resultCode == 1) {
+            this.coinGetList = res.data.data;
+            if(this.msg.OutBranchId == -1){
+              this.coinGetShow = false
+              this.msg.StandardCurrencyId = this.coinGetList[0].ID
+              this.msg.StandardCurrencyId=this.$route.query.StandardCurrencyId?Number(this.$route.query.StandardCurrencyId):this.msg.StandardCurrencyId;
+            }else{
+              this.coinGetShow = true
+              this.msg.StandardCurrencyId = -1
+            }
+            this.getPageList();
+        }
+      })
+    },
     getStatement(){
       this.loading = true
       this.apipost(

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -2389,18 +2389,18 @@ export default {
         {
           field: "TicketFee",
           formatter: this.moneyFormat,
-          title: "过路停车费",
-          width: 90,
+          title: "过路停车费收入",
+          width: 100,
           titleAlign: "left",
           columnAlign: "right",
           isResize: true,
           componentName: "TCIDJumpWang"
         },
         {
-          field: "YingFu",
+          field: "JiPiao",
           formatter: this.moneyFormat,
-          title: "应付金额",
-          width: 90,
+          title: "过路停车费支出",
+          width: 100,
           titleAlign: "left",
           columnAlign: "right",
           isResize: true,
@@ -2418,7 +2418,6 @@ export default {
         },
         {
           field: "MaoLiRate",
-          // formatter: this.moneyFormat,
           title: "毛利率",
           width: 90,
           titleAlign: "left",