no message

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -464,7 +464,7 @@ tr._item_list td:last-child {
               </el-select>
             </el-form-item>
           </el-col>
-          
+
           <el-col :span="4">
             <el-form-item label="团号：">
               <el-input v-model="msg.TCNUM" class></el-input>
@@ -591,7 +591,7 @@ tr._item_list td:last-child {
                 </el-select>
               </el-form-item>
             </el-col>
-            
+
           <el-col :span="4">
               <el-form-item label="是否联运：">
                 <el-select v-model="msg.Is_Transport" filterable class="w150">
@@ -600,7 +600,7 @@ tr._item_list td:last-child {
                   <el-option value="0" label="否"></el-option>
                 </el-select>
               </el-form-item>
-            </el-col>   
+            </el-col>
             <el-col :span="4">
               <el-form-item label="地接团号：">
                 <el-input v-model="msg.DMCNUM" class></el-input>
@@ -615,7 +615,7 @@ tr._item_list td:last-child {
                   <el-option :value="3" label="导游"></el-option>
                 </el-select>
               </el-form-item>
-            </el-col>   
+            </el-col>
             <el-col :span="4">
               <el-form-item label="领队/导游：">
                 <el-select v-model="msg.LeaderId" filterable class="w150">
@@ -623,7 +623,7 @@ tr._item_list td:last-child {
                   <el-option v-for="item in LeaderList" :label='item.Name' :value='item.ID' :key='item.ID'></el-option>
                 </el-select>
               </el-form-item>
-            </el-col>  
+            </el-col>
             <el-col :span="4">
               <el-form-item label="只看收据未制单：" label-width="125px">
                 <el-select v-model="msg.IsSelectReceipt" filterable class="w150">
@@ -631,22 +631,22 @@ tr._item_list td:last-child {
                   <el-option label="否" :value="0"></el-option>
                 </el-select>
               </el-form-item>
-            </el-col>  
+            </el-col>
           </template>
           <el-col :span="4" v-if="userId==1 || userId==5 || F_GeneralManager">
-              
+
               <el-button @click="msg.Is_Open=0,SetTravelClose()" type="danger" size="small" round :loading="btnloading">开启团队收支</el-button>
               <el-button @click="msg.Is_Open=1,SetTravelClose()" type="danger" size="small" round :loading="btnloading">关闭团队收支</el-button>
-            </el-col>    
+            </el-col>
           <el-col :span="5">
             <p v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
             <p v-if="UpdateStaus==2">
               上次更新时间 {{UpdateStartTime}}<br/>
               每日8点、12点、19点、22点数据更新~
             </p>
-            </el-col>  
-               
-          
+            </el-col>
+
+
         </el-row>
       </el-form>
       <ul class="clearfix">
@@ -687,7 +687,7 @@ tr._item_list td:last-child {
         :footer="footer"
         :footer-row-height="33"
         :multiple-sort="multipleSort"
-        :row-click="rowClick" 
+        :row-click="rowClick"
       >
         <!-- 多个排序 -->
       </v-table>
@@ -729,7 +729,7 @@ Vue.component("TCIDJump", {
   //  团队跳转
   template: `
   <div>
-    <span style="cursor: pointer" v-if="rowData.DataType===1"  @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span> 
+    <span style="cursor: pointer" v-if="rowData.DataType===1"  @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID,rowData)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID,rowData)">{{rowData.TCID}}</span>
@@ -745,7 +745,7 @@ Vue.component("TCIDJump", {
     <span style="cursor: pointer" v-if="rowData.DataType===15">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===16">{{rowData.TCID}}</span>
   </div>
-  
+
   `,
   props: {
     rowData: {
@@ -782,9 +782,9 @@ Vue.component("TCIDJump", {
             }
           });
         }
-        
+
         }
-      
+
     },
     // 获取包车type
     GetCarList(path,id) {
@@ -832,7 +832,7 @@ Vue.component("TCIDJump", {
           err => {}
         );
       },
-   
+
     goUrlVisa(path, id) {
       this.$router.push({
         path: "/" + path,
@@ -844,7 +844,7 @@ Vue.component("TCIDJump", {
 Vue.component("TCNUMJump", {
   //  团队跳转
   template: `<div>
-  <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===1"  @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span> 
+  <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===1"  @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===2" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProductOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
   <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
@@ -979,7 +979,7 @@ Vue.component("TCNUMJump", {
           });
         }
       }
-      
+
     },
     // 获取包车type
     GetCarList(path,id) {
@@ -1027,7 +1027,7 @@ Vue.component("TCNUMJump", {
           err => {}
         );
       },
-   
+
     goUrlExtend(path, id) {
       this.$router.push({
         path: "/" + path,
@@ -1142,7 +1142,7 @@ Vue.component("Transport", {
 });
 Vue.component("TCIDJumpWang", {
   template: `<div>
-  <span style="cursor: pointer" v-if="rowData.DataType===1"  @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData[field]}}</span> 
+  <span style="cursor: pointer" v-if="rowData.DataType===1"  @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData[field]}}</span>
   <span v-else >{{rowData[field]}}</span>
   </div>`,
   props: {
@@ -1161,7 +1161,7 @@ Vue.component("TCIDJumpWang", {
       red: false
     }
   },mounted(){
- 
+
   },
   methods: {
     goUrl(path, id,rowData) {
@@ -1171,7 +1171,7 @@ Vue.component("TCIDJumpWang", {
         });
     }
   },
-     
+
 });
 export default {
   data() {
@@ -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",
@@ -2055,7 +2065,7 @@ export default {
       this.productionDate[0]=this.msg.startDate;
       this.productionDate[1]=this.msg.endDate;
     }
-    
+
     if(this.msg.LineId>0){
       this.msg.DataType="1";
     }
@@ -2116,7 +2126,7 @@ export default {
             this.msg.DataType='6';
         }
     }
-    
+
   },
   components: {},
   mounted() {
@@ -2133,10 +2143,10 @@ export default {
       this.msg.OutBranchId = this.$route.query.BranchId?Number(this.$route.query.BranchId):this.msg.OutBranchId;
     }
     this.financeinfo_post_GetList()
-    this.getCompanyList();   
+    this.getCompanyList();
     this.getLineList();
     this.getStartList1();
-    
+
     this.GetSupperOrderEditAuth();
   },
   methods: {
@@ -2216,9 +2226,9 @@ export default {
           err => {}
         )
       },
-      getLineTeamList(lineId,PlaceId) { 
-        
-        
+      getLineTeamList(lineId,PlaceId) {
+
+
        //获取系列列表
       this.apipost(
         "team_post_GetList",
@@ -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"
       }
@@ -2671,9 +2684,9 @@ export default {
             return "column-cell-class-name-test"
           }else{
             return "column-cell-class-name-test-red"
-          } 
+          }
       }
-      
+
       if(rowData.TransportCD < 0 && columnName=="TransportCD"){
             return "column-cell-class-name-test-red"
       }
@@ -2713,7 +2726,7 @@ export default {
        if(rowData.TransportHF < 0 && columnName=="TransportHF"){
             return "column-cell-class-name-test-red"
       }
-       
+
        if(rowData.TransportNN < 0 && columnName=="TransportNN"){
         return "column-cell-class-name-test-red"
       }
@@ -2762,11 +2775,11 @@ export default {
       if(rowData.AverageCost < 0 && columnName=="AverageCost"){
         return "column-cell-class-name-test-red"
       }
-      
+
       if(rowData.AverageProfit < 0 && columnName=="AverageProfit"){
         return "column-cell-class-name-test-red"
       }
-      
+
       // 给三行column为‘hobby’的列设置className
       if (columnName === "LineName") {
         return "column-cell-class-name-test";
@@ -2801,7 +2814,7 @@ export default {
       );
     },
 
-    
+
     getLineList() {
       // 获取线路
       this.apipost("line_post_GetAllList", {}, res => {
@@ -2881,10 +2894,10 @@ export default {
                 this.BranchStatus=true;
                 this.msg.OutBranchId=BranchStatus;
             }
-            
-       
+
+
             let data = res.data.data.pmodel.pageData;
-            
+
             this.total = res.data.data.pmodel.count;
             this.SDate=res.data.data.pmodel.StartDate;
             this.EDate=res.data.data.pmodel.NextDate;

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>