no message

src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue

@@ -1087,7 +1087,7 @@ export default {
         {
           field: "TransportCost",
           formatter: this.moneyFormat,
-          title: "联运成本",
+          title: "联运收入",
           width: 90,
           titleAlign: "left",
           columnAlign: "left",

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -503,10 +503,20 @@ tr._item_list td:last-child {
                 <el-option value="1" label="团队营收"></el-option>
                 <el-option value="3" label="单办签证"></el-option>
                 <el-option value="2" label="国际机票"></el-option>
+                <el-option value="4" label="国内票务"></el-option>
                 <el-option value="5" label="散卖机票"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+         <el-col :span="4">
+            <el-form-item label="是否联运">
+              <el-select v-model="msg.Is_Transport" filterable class="w150">
+                <el-option value="-1" label="不限"></el-option>
+                <el-option value="1" label="是"></el-option>
+                <el-option value="0" label="否"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>          
         </el-row>
       </el-form>
       <ul class="clearfix">
@@ -519,6 +529,7 @@ tr._item_list td:last-child {
           <!--<button class="hollowFixedBtn" @click="exportExcelCurrentPage">导出2</button>-->
         </li>
       </ul>
+    <!-- <div class="query-box">以下统计数据每隔2小时自动更新一次，上次更新时间：{{SDate===''?暂无:SDate}}，下次更新时间为：{{EDate===''?'暂无':EDate}}</div> -->
     </div>
     <ul class="other_report clearfix">
       <!-- <li @click="goEasyReport">简易报表</li> -->
@@ -729,7 +740,8 @@ export default {
         endDate: "",
         Type: 1,
         QueryCondition: "-1",
-        DataType: "1"
+        DataType: "1",
+        Is_Transport:'-1'
       },
       getCompanyMsg: {
         // 公司
@@ -756,6 +768,8 @@ export default {
         QEndDate: "",
         Is_Open: ""
       },
+      SDate:'',
+      EDate:'',
       defaultMonth: [],
       pickerOptions: {
         onPick: ({ maxDate, minDate }) => {
@@ -1853,9 +1867,12 @@ export default {
         this.msg,
         res => {
           if (res.data.resultCode == 1) {
+            //console.log( res.data.data);
             let data = res.data.data.pageData;
             // res.data.data.TotalRevenue
             this.total = res.data.data.count;
+            this.SDate=res.data.data.StartDate;
+            this.EDate=res.data.data.NextDate;
             if (this.total == 0) {
               this.DataList = [];
             } else {