Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -846,7 +846,7 @@
             <th width="200">{{$t('objFill.dangqianshr')}}</th>
           </tr>
           <template v-for="item in DataList.FiniceReciveList">
-            <tr v-if="item.OrderSource===7">
+            <tr v-if="item.OrderSource===7 || isExists(item.CostTypeList, '国内购物佣金')">
               <td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
               </td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
@@ -901,7 +901,7 @@
               v-if="NotExists(item.CostTypeList,'团费')&& NotExists(item.CostTypeList,'小费')&&
               NotExists(item.CostTypeList,'自费') && NotExists(item.CostTypeList,'团款') &&
                NotExists(item.CostTypeList,'地接费（结算）') && NotExists(item.CostTypeList,'小费收入') &&
-                NotExists(item.CostTypeList,'自费收支结算') && NotExists(item.CostTypeList,'佣金收入')&& item.OrderSource!==7">
+                NotExists(item.CostTypeList,'自费收支结算') && NotExists(item.CostTypeList,'佣金收入')&& NotExists(item.CostTypeList,'国内购物佣金')&& item.OrderSource!==7">
               <td><span class="Team_income" @click="goUrl('FinancialDocumentsDetail',item.FrID)">{{item.FrID}}</span>
               </td>
               <td><span v-for="subItem in item.CostTypeList" :key="subItem.subCode">{{subItem}}</span></td>
@@ -2744,7 +2744,7 @@
                 this.moneyAll.xiaofeiss += item.PayMoney;
               }
               // 收入 佣金
-              if (item.OrderSource === 7) {
+              if (item.OrderSource === 7 || that.isExists(item.CostTypeList, '国内购物佣金')) {
                 this.moneyAll.yongjinys += item.Money;
                 this.moneyAll.yongjinss += item.PayMoney;
               }
@@ -2752,7 +2752,7 @@
               if (that.NotExists(item.CostTypeList, '团费') && that.NotExists(item.CostTypeList, '小费') && that
                 .NotExists(item.CostTypeList, '自费') && that.NotExists(item.CostTypeList, '团款') && that
                 .NotExists(item.CostTypeList, '地接费（结算）') && that.NotExists(item.CostTypeList, '小费收入') && that
-                .NotExists(item.CostTypeList, '自费收支结算') && that.NotExists(item.CostTypeList, '佣金收入') && item
+                .NotExists(item.CostTypeList, '自费收支结算') && that.NotExists(item.CostTypeList, '佣金收入')&& that.NotExists(item.CostTypeList, '国内购物佣金') && item
                 .OrderSource !== 7) {
                 this.moneyAll.otherys += item.Money;
                 this.moneyAll.otherss += item.PayMoney;