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

src/components/FinancialModule/addFinancialDocuments.vue

@@ -1455,7 +1455,7 @@
             yballPrice += (Number(item.UnitPrice)*100)
           })
           this.yballPriceTo = yballPrice/100
-          totalAmount = this.$commonUtils.addCommas(Math.round(this.orderObj.Money * 100) / 100)
+          totalAmount = Math.round(this.orderObj.Money * 100) / 100
           if (totalAmount != this.yballPriceTo) {
             this.Error(`原币总金额需等于${this.orderObj.Money}！`)
             return

src/components/FinancialModule/domesticCommissionTW2.vue

@@ -88,7 +88,7 @@
 
                 </td>
                 <td>
-                    <p>{{item.SumDiJieBonus?item.SumDiJieBonus:'-'}}</p>
+                    <p>{{item.BranchDiJieBonus?item.BranchDiJieBonus:'-'}}</p>
 
                 </td>
                 <td>
@@ -133,11 +133,13 @@
                             <el-button type="primary" class="CM_look" @click="goUrl('domesticCommissionUserTW',item.Id)"
                                 icon="iconfont icon-chakan" circle></el-button>
                         </el-tooltip>
-                        <el-tooltip v-if="cMaker==true&&item.BranchCommission>0&&item.CurrencyRateList[0].Rate>0" class="item" effect="dark" content="提成制单" placement="top">
+                        <!--  v-if="cMaker==true&&item.BranchCommission>0&&item.CurrencyRateList[0].Rate>0" -->
+                        <el-tooltip class="item" effect="dark" content="提成制单" placement="top">
                             <el-button @click="YijianZD(item,1)" type="danger" class="CM_look"
                                 icon="iconfont icon-mui-icon-add" circle></el-button>
                         </el-tooltip>
-                        <el-tooltip v-if="cMaker==true&&item.SumDiJieBonus>0&&item.CurrencyRateList[0].Rate>0" class="item" effect="dark" content="地接奖励制单" placement="top">
+                        <!--  v-if="cMaker==true&&item.SumDiJieBonus>0&&item.CurrencyRateList[0].Rate>0"  -->
+                        <el-tooltip class="item" effect="dark" content="地接奖励制单" placement="top">
                             <el-button @click="YijianZD(item,2)" type="danger" class="CM_look"
                                 icon="iconfont icon-mui-icon-add" circle></el-button>
                         </el-tooltip>
@@ -393,17 +395,22 @@
                 );
             },
             YijianZD(item,type) {
-                let Money
-                if(this.msg.OutBranchId>-1){
+                let Money = 0
+                if(type==1){
+                  if(this.msg.OutBranchId>0){
                     if(item.BranchCommission>0){
                         Money=item.BranchCommission
                     }else{
                         this.Error("公司提成为0,不能制单!")
                         return;
                     }
+                  }else{
+                      Money=item.SumPrice
+                  }
                 }else{
-                    Money=item.SumPrice
+                  Money=item.BranchDiJieBonus
                 }
+
                 let obj = {
                     CostType: 16,
                     Money: Money,

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -375,7 +375,10 @@
                     <span v-if="item.Status==1" title="销售">{{$t('visaT.sale')}}</span>
                     <span v-if="item.GroupRecommendType==1" title="精品">精</span>
                     <label
-                      style="display:inline-block;margin:5px 0 0 5px;font-size:12px;">{{item.PriceTeamTypeName}}</label>
+                      style="display:inline-block;margin:5px 0 0 5px;font-size:12px;">
+                      <!-- {{item.PriceTeamTypeName}} -->
+                      单团
+                    </label>
                   </div>
                   <div class="TCL-OutBranchName" :title="$t('visa.v_salecompany')">{{item.OutBranchName}}</div>
                   <div class="TCL-TOPTCNUM">({{item.TCID}}) {{item.TCNUM}}</div>

src/components/TravelManager/TravelList/todayOrderTotal.vue

@@ -292,6 +292,13 @@
                   "></i></el-tooltip>
               <el-tooltip class="item" effect="dark" content="通过B2B确认单报名" placement="top" v-show="item.isFormB2B == 1">
                 <i class="iconfont icon-tiaozheng" style="font-size: 22px; color: #297bef"></i></el-tooltip>
+
+                <label
+              style="display:inline-block;margin:5px 0 0 5px;font-size:12px;color: red;">
+                <!-- {{item.PriceTeamTypeName}} -->
+                {{item.teamType == 1?'单团':''}}
+              </label>
+
             </p>
 
             <p class="fz12 over_ellipsis" style="width: 100%; text-decoration: underline; cursor: pointer"