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

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -1530,6 +1530,16 @@ export default {
           isResize: true,
           componentName: "TCIDJumpWang"
         },
+        {
+          field: "AirLossIncome",
+          formatter: this.moneyFormat,
+          title: "机损增收",
+          width: 120,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        },
         // {field: 'Money11', title: '房费',width: 90, titleAlign: 'left',columnAlign:'left',isResize:true},
         {
           field: "Visa",
@@ -2531,8 +2541,8 @@ export default {
       if (field === "YaoQingHan") return this.priceFormat(rowData.YaoQingHan);
       if (field === "CheZi") return this.priceFormat(rowData.CheZi);
       if (field === "JiPiao") return this.priceFormat(rowData.JiPiao);
-      if (field === "GuoNeiLianYunJiPiao")
-        return this.priceFormat(rowData.GuoNeiLianYunJiPiao);
+      if (field === "GuoNeiLianYunJiPiao") return this.priceFormat(rowData.GuoNeiLianYunJiPiao);
+      if (field === "AirLossIncome") return this.priceFormat(rowData.AirLossIncome);
       if (field === "Visa") return this.priceFormat(rowData.Visa);
       if (field === "TiCheng") return this.priceFormat(rowData.TiCheng);
       if (field === "CompensationMoney")
@@ -2626,6 +2636,9 @@ export default {
       if(rowData.GuoNeiLianYunJiPiao < 0 && columnName=="GuoNeiLianYunJiPiao"){
         return "column-cell-class-name-test-red"
       }
+      if(rowData.AirLossIncome < 0 && columnName=="AirLossIncome"){
+        return "column-cell-class-name-test-red"
+      }
       if(rowData.Visa < 0 && columnName=="Visa"){
         return "column-cell-class-name-test-red"
       }

src/components/FinancialModule/TradeCommission/CommissionRule.vue

@@ -186,7 +186,7 @@
               <th style="min-width: 220px;"
                 v-for="( son , sIndex ) in item.BonusRuleList"
                 :key="sIndex"
-              >连续 {{ son.StartValue }} 个月达标
+              >{{ son.StartValue }} 个月达标
             </th>
             </tr>
             <tr>

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -247,7 +247,7 @@
                   <div>当前利润：<span class="Team_Coins">￥{{DataList.TeamBalance.ActualProfit}}</span></div>
                   <div>
                     注：实收-(应付/实付)+佣金收入+自费收入+其他收入
-                    -联运成本+挂账总收入-挂账总支出+冲抵总收入-冲抵总支出
+                    -联运成本+挂账总收入-挂账总支出+冲抵总收入-冲抵总支出-机损增收
                   </div>
                 </div>
               </div>
@@ -322,6 +322,22 @@
                 </div>
               </div>
             </el-col>
+            <el-col :span="3" v-if="DataList&&DataList.TeamBalance&&DataList.TeamBalance.IsShowAirLoss">
+              <div class="Team_DList">
+                <div class="Team_firstTitle">
+                  <span class="Team_comCoinType Team_shou">
+                    <i class="iconfont icon-qian"></i>
+                  </span>机损增收
+                </div>
+                <div class="Team_Incontent">
+                  <div>单价：<span>￥{{DataList.TeamBalance.AirLossIncomeUnitPrice}}/机位</span></div>
+                  <div>机位数量：<span class="Team_Coins">{{DataList.TeamBalance.AirSeatNum}}</span></div>
+                  <div>机损增收：<span class="Team_Coins">￥{{DataList.TeamBalance.AirLossIncome}}</span></div>
+                  <div>
+                  </div>
+                </div>
+              </div>
+            </el-col>
           </el-row>
         </div>
       </div>

src/components/sale/components/progressComm.vue

@@ -171,7 +171,9 @@
           &&this.commissionratioList.CommissionProfit>=data.StartValue&&this.commissionratioList.CommissionProfit<=data.EndValue){
             return this.commissionratioList.CommissionProfit>25000?(this.commissionratioList.CommissionProfit/data.StartValue)*100:(this.commissionratioList.CommissionProfit/data.EndValue)*100
           }else{
-            return 0
+            if(this.commissionratioList.CommissionProfit!=0){
+              return 100
+            }
           }
         }else{
           if(this.commissionratioList.type==1
@@ -181,10 +183,11 @@
           }else if(this.commissionratioList.type==3&&this.commissionratioList.AvgLureNum){
             return (this.commissionratioList.AvgLureNum/data.StartValue)*100
           }else{
-            return 0
+            if(this.commissionratioList.AvgLureNum>=data.StartValue){
+              return 100
+            }
           }
         }
-        // return 100
       },
       // 自定义进度条文字
       setItemText(row) {