no message

src/components/FinancialModule/platformFinancial.vue

@@ -11,9 +11,6 @@
       <div class="query-box" style="margin-bottom: 0px;">
           <el-form class="_info_box clearfix"  label-width="110px">
               <el-row style="padding:15px 20px 0 0;">
-                 
-               
-                
                   <el-col :span="4">
                       <el-form-item label="所属公司：">
                           <el-select  filterable  v-model='msg.RB_Branch_Id' @change="getDepartmentMsg.RB_Branch_Id=msg.RB_Branch_Id,msg.RB_Depart_Id='',msg.UpdateBy='',getDepartment()"  class="">
@@ -53,6 +50,7 @@
               <li class="hight_query">
                  
                   <button class="hollowFixedBtn" @click="resetPageIndex()">{{$t('pub.searchBtn')}}</button>
+                  <button class="normalBtn" @click="method5()">导出</button>
               </li>
           </ul>
       </div>
@@ -65,9 +63,8 @@
                     <template v-if="multipleSelection.length>0">
                       <el-tag size="small" 
                       style="margin-right: 5px;margin-bottom: 5px;"
-                      v-for="(x,index) in multipleSelection" :key="x.FrID" >
+                      v-for="(x,index) in multipleSelection" :key="x.FrID" :type="x.Type==0?'danger':''">
                       {{x.Alias}}：{{x.TotalMoney}}
-                        
                     </el-tag>
                     </template>
                   </div>
@@ -517,7 +514,30 @@ export default {
           this.msg.pageIndex = val;
           this.getPageList();
       },
-    
+      method5: function() {
+        if(!this.msg.ClientID)this.msg.ClientID="";
+          if(!this.msg.ClientType)this.msg.ClientType=0;
+          if(!this.msg.CurrencyId)this.msg.CurrencyId=0;
+          if(!this.msg.CostTypeID)this.msg.CostTypeID=0;
+          if(this.msg.TemplateIds=='0')this.msg.TemplateIds='';
+          if(this.msg.RB_Branch_Id === '')this.msg.RB_Branch_Id=-1;
+          if(this.msg.HelpBranchId === '')this.msg.HelpBranchId=-1;
+          if(!this.msg.RB_Depart_Id)this.msg.RB_Depart_Id=0;
+          if(!this.msg.UpdateBy)this.msg.UpdateBy=0;
+          if(!this.msg.TCID)this.msg.TCID=0;
+          if(!this.msg.OrderID)this.msg.OrderID=0;
+          if(!this.msg.Status)this.msg.Status=0;
+          if(!this.msg.FrID)this.msg.FrID=0;
+          if(!this.msg.NewFinanceId)this.msg.NewFinanceId=0;
+          if(!this.msg.Conditon)this.msg.Conditon=1;
+          if(!this.msg.TradeWay)this.msg.TradeWay=0;
+          if(!this.msg.AccountType)this.msg.AccountType=0;
+          if(!this.msg.KJCostTypeId)this.msg.KJCostTypeId=0;
+          if(!this.msg.IsSelectKJSetCostType)this.msg.IsSelectKJSetCostType=0;
+          let time = this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
+          var fileName = `平台在途金额统计${time}.xls`;
+          this.GetLocalFile("Financial_post_GetPlatformStatisticsExport", this.msg,fileName);
+      } ,
       getPageList(){  // 获取列表数据
           if(!this.msg.ClientID)this.msg.ClientID="";
           if(!this.msg.ClientType)this.msg.ClientType=0;

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1102,9 +1102,6 @@
                       <el-dropdown-item v-if="item.Status==1" @click.native="OutGroup(item.TCID,2,item.TravelEndAudit)">
                         {{$t('Operation.Op_jietuan')}}
                       </el-dropdown-item>
-                      <el-dropdown-item @click.native="GroupTypeObj=item,GroupTypeVisible=true">
-                        <div>修改出团公司 </div>
-                      </el-dropdown-item>
                       <el-dropdown-item v-if="item.Status==2" @click.native="OutGroup(item.TCID,1,item.TravelEndAudit)">
                         {{$t('visaT.sale')}}
                       </el-dropdown-item>
@@ -1210,7 +1207,8 @@
         <el-checkbox v-model="queryCommonData.checkDialogAll" @change="checkAllDialog" style="margin-right:20px;">
           {{$t('system.table_chekAll')}}</el-checkbox>
         <el-checkbox-group v-model="queryCommonData.ckedplat" @change="checkDialog">
-          <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name"  :disabled="((sales.Id=='2'||sales.Id=='5')&&SaleB2COrWeChatStatus)?true:false">
+          <el-checkbox v-for="sales in $tripUtils.TeamStatesList.salsPlat" :label="sales.Id" :key="sales.Name"
+            :disabled="((sales.Id=='2'||sales.Id=='5')&&SaleB2COrWeChatStatus)?true:false">
             {{sales.Name}}</el-checkbox>
         </el-checkbox-group>
       </span>
@@ -1276,20 +1274,12 @@
         <price-dialog :ConfigId="dialog.ConfigId" :OfferId="dialog.OfferId" ref="dialog"></price-dialog>
       </el-dialog>
     </div>
-    <!-- 修改出团公司 -->
-    <EditLeaveGroup v-if="GroupTypeVisible" :item="GroupTypeObj" @Cancel='CancelGroupType'/>
   </div>
 </template>
 <script>
   import commonHotelInfo from "../../commonPage/commonHotelInfo.vue";
   import priceDialog from '../TravelNewQuotation/priceDialog.vue';
-  import EditLeaveGroup from './components/EditLeaveGroup.vue';
   export default {
-    components: {
-      commonHotelInfo,
-      priceDialog,
-      EditLeaveGroup
-    },
     provide() {
       return {
         reload: this.reload
@@ -1297,15 +1287,13 @@
     },
     data() {
       return {
-        GroupTypeVisible: false,
-        GroupTypeObj:{},
         dialog: {
           show: false,
           ConfigId: '',
           OfferId: ''
         },
         isCommissionDetails: false, //团控提成详情权限
-        SaleB2COrWeChatStatus:true,//上架B2C或者微信小程序
+        SaleB2COrWeChatStatus: true, //上架B2C或者微信小程序
         QSendCommissionStateList: [{
             Name: '不限',
             ID: 0
@@ -1550,6 +1538,10 @@
 
       };
     },
+    components: {
+      commonHotelInfo,
+      priceDialog
+    },
     //监听器
     watch: {
       // 方法1
@@ -1558,10 +1550,6 @@
       },
     },
     methods: {
-      CancelGroupType() {
-        this.GroupTypeVisible = false
-        this.GroupTypeObj = {}
-      },
       IsShowAllBranch() {
         var flag = true;
         if (this.CurrentUserInfo && this.CurrentUserInfo.RB_Branch_id && this.CurrentUserInfo.RB_Branch_id == 1220) {
@@ -2777,7 +2765,8 @@
         this.CurrentUserInfo.RB_Branch_id == 0 ||
         this.CurrentUserInfo.RB_Branch_id == 1216 ||
         this.CurrentUserInfo.RB_Branch_id == 49 ||
-        this.CurrentUserInfo.RB_Branch_id == 1218
+        this.CurrentUserInfo.RB_Branch_id == 1218 ||
+        this.CurrentUserInfo.RB_Branch_id == 1249
       ) {
         this.IsModifyTravelControl = 1;
       } else {
@@ -2844,7 +2833,7 @@
       }
       if (
         this.queryCommonData.IsParentCompany != 1 &&
-        this.CurrentUserInfo.RB_Branch_id != 49
+        this.CurrentUserInfo.RB_Branch_id != 49  && this.CurrentUserInfo.RB_Branch_id != 1249 
       ) {
         this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id);
       }

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -1923,7 +1923,7 @@
         this.queryMsg.StartGroupDate = nowDate;
       }
 
-      if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224) {
+      if (this.queryCommonData.IsParentCompany != 1 && userInfo.RB_Branch_id != 49 && userInfo.RB_Branch_id != 1224&& userInfo.RB_Branch_id != 1249) {
         this.queryMsg.OutBranchIds.push(userInfo.RB_Branch_id);
       }
       //默认查询全部团队状态

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -1946,7 +1946,7 @@
         this.queryMsg.StartGroupDate = nowDate
       }
       if (this.queryCommonData.IsParentCompany != 1) {
-        if (this.CurrentUserInfo.RB_Branch_id != 49&&this.CurrentUserInfo.RB_Branch_id != 1245) {
+        if (this.CurrentUserInfo.RB_Branch_id != 49&&this.CurrentUserInfo.RB_Branch_id != 1245&& this.CurrentUserInfo.RB_Branch_id != 1249) {
           this.queryMsg.OutBranchIds.push(this.CurrentUserInfo.RB_Branch_id)
 
         }