修改地接总表及平台账户

src/components/FinancialModule/PlatformAccount.vue

@@ -571,6 +571,7 @@ export default {
       isReady: false,
       multipleSort: false,
       loading: true,
+      CompanySelect:[],
       msg: {
         pageIndex: 1,
         pageSize: 15,
@@ -769,12 +770,12 @@ export default {
         filters: [{}],
         type: "text"
       };
-      let companyList = [];
+      // let companyList = [];
       this.CompanyList.forEach(x => {
         let item = {};
         item.label = x.BName;
         item.value = x.Id;
-        companyList.push(item);
+        this.CompanySelect.push(item);
       });
       let allName = {
         field: "allName",
@@ -784,9 +785,9 @@ export default {
         columnAlign: "left",
         isResize: true,
         filterMultiple: false,
-        filters: companyList,
+        filters: this.CompanySelect,
         result: "",
-        type: "select"
+        type: "select",
         // isFrozen:true
       };
       let Accountholder = {
@@ -959,6 +960,9 @@ export default {
     },
     filterMethod(filters) {
       this.msg.Alias = filters.Alias;
+      if(filters.allName=='__all__'){
+        filters.allName='-1'
+      }
       this.msg.RB_Branch_Id = filters.allName;
       this.msg.SettlementType =
         filters.Commission.length == 1 ? filters.Commission[0] : 0;
@@ -1422,11 +1426,17 @@ export default {
   },
   mounted() {
     this.msg.pageSize = this.calcPageSize(40);
-    this.getList();
-    this.getAccountTypeList();
     let userInfo = this.getLocalStorage();
     this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
-    this.getCompanyList();
+    var branchId = userInfo.RB_Branch_id;
+    if(branchId==0||branchId==49){
+      this.getCompanyList();
+    }else{
+      this.msg.RB_Branch_Id = branchId;
+    }
+    this.getList();
+    this.initColums();
+    this.getAccountTypeList();
     this.getFinancialList();
     this.getfinanceinfoList();
   },

src/components/commonPage/commonTeamInfo.vue

@@ -3,7 +3,7 @@
 </style>
 
 <template>
-    <div class="trip-box-commonTeam">
+    <div class="trip-box-commonTeam" v-loading="loading">
         <div class="item-title">
             <span class="t">{{tripList.length}}日行程</span>
             <span>
@@ -34,7 +34,8 @@ export default {
   props: ["subConfig"],
   data() {
     return {
-      tripList: []
+      tripList: [],
+      loading:false
     };
   },
   components: {
@@ -47,14 +48,17 @@ export default {
   mounted() {},
   methods: {
     GetTrip(id) {
+      this.tripList=[];
       if (id !== undefined) {
         //根据ID 获取行程内容
+        this.loading=true;
         this.apipost(
           "b2b_get_GetB2BTravelInfoNoDes",
           {
             configId: id
           },
           res => {
+            this.loading=false;
             if (res.data.resultCode == 1) {
               this.tripList = res.data.data.dayList;
               this.init();

src/components/dmc/manager/dmcTotalTable.vue

@@ -434,7 +434,7 @@
               <td colspan="22" style="text-align: left!important;padding:0 20px;">
                 <div class="link">
                   <!-- <p @click="goUrlT('productQuery',item.TCNUMS,'产品查询')" style="padding-top:4px;">{{item.Titles}}</p> -->
-                  <p @click="getJourney(item.TCID,item.Titles)" style="padding-top:4px;">{{item.Titles}}</p>
+                  <p @click="getJourney(item.ConfigID,item.Titles)" style="padding-top:4px;">{{item.Titles}}</p>
                   <div v-if="outItem.StaticsReportList[index].DMCNum && outItem.StaticsReportList[index].DMCNum!=''"
                     class="colorE95252" style="padding-top:5px;">地接备注团号:{{outItem.StaticsReportList[index].DMCNum}}
                   </div>