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

src/components/FinancialModule/domesticCommissionTW2.vue

@@ -412,7 +412,7 @@
                 }
 
                 let obj = {
-                    CostType: 16,
+                    CostType: type==1?16:186,
                     Money: Money,
                     CurrencyId: item.CurrencyRateList[0].CurrencyId,
                     XSTC: 1,
@@ -429,14 +429,21 @@
                     orderObj: JSON.stringify(obj),
                     companyID: this.msg.OutBranchId
                 }
-                if(this.msg.OutBranchId>0){
+                // 费用流程
+                if(type==1){
+                  if(this.msg.OutBranchId>0){
                     query.id = 30
                     query.Name = "分公司销售提成单"
+                  }else{
+                      query.id = 28
+                      query.Name = "总部销售提成单"
+                  }
                 }else{
-                    query.id = 28
-                    query.Name = "总部销售提成单"
+                  query.id = 87
+                  query.Name = "费用科目"
                 }
 
+
                 this.$router.push({
                     path: "/addFinancialDocuments",
                     query

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -296,7 +296,7 @@
                 <label
               style="display:inline-block;margin:5px 0 0 5px;font-size:12px;color: red;">
                 <!-- {{item.PriceTeamTypeName}} -->
-                {{item.teamType == 1?'单团':''}}
+                {{item.teamType == 1?'小包团':''}}
               </label>
 
             </p>