1 机损分摊

src/components/FinancialModule/ReportForm/AirTicketLoss.vue

@@ -30,7 +30,8 @@
           </div>
       </div>
       <div v-if="LossIncomeList&&LossIncomeList.length>0" style="font-size: 14px;color: red;margin-bottom: 3px;text-align: right;">
-        注: 韩国线与日本自由行是统计团队亏损，其他线路为机票损失
+        <!-- 注: 韩国线与日本自由行是统计团队亏损，其他线路为机票损失 -->
+        注: 以下为团队航班目的地统计
       </div>
        <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
            <tr>
@@ -120,6 +121,20 @@ export default {
         goToDetail(item){
             if(item.Value!='损失占比'){
                 if(item.IsTravel==1){
+                    if(item.LossType==-1){
+                        this.$router.push({
+                            name: 'TeamRevenueReport',
+                            query: {
+                                StartTime:item.StartTime,
+                                EndTime:item.EndTime,
+                                LineId:item.LineId,
+                                IsSelectTravelLoss:2,
+                                AirLossId:item.AirLossId,
+                                blank: "y",
+                            }
+                        });
+                    }
+                    else{
                     this.$router.push({
                     name: 'TeamRevenueReport',
                     query: {
@@ -132,6 +147,7 @@ export default {
                     }
                     });
                 }
+                }
                 else{
                     this.$router.push({
                     name: 'AirTicketLossDetail',

src/components/FinancialModule/ReportForm/EasyReport.vue

@@ -67,13 +67,14 @@
             <button class="normalBtn page_EasyReport_search" style="left: 900px;" @click="getData(2)">{{$t('pub.searchBtn')}}</button>
           </el-col>
         </el-row>
-        <el-row >
+        <!-- <el-row >
           <el-col :span="6" v-for="(month, index) in monthList" :key="index">
             <el-form-item :label="`${month.name}：`">
               <el-input v-model="month.value" @change="MonthIndex = month.id" type="number"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
+        -->
       </el-form>
       <div class="page_EasyReport_export">
         <button class="normalBtn " @click="exportExcel">导出EXCEL</button>
@@ -1067,7 +1068,7 @@ export default {
         endDate=that.year+"-"+column.end
       }
 
-      if(rowIndex<18){
+      if(rowIndex<19){
         // if(BranchId == 1245){
         //   that.$router.push({ name: "TeamRevenueReport",query:{"StartTime":startDate,"EndTime":endDate,BranchId:BranchId,OutBranchId:BranchId,StandardCurrencyId,blank:'y',tab:"营收报表"} })
         // }

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -515,6 +515,7 @@ tr._item_list td:last-child {
                 <el-option value="21" label="日本手配费收入"></el-option>
                 <el-option value="22" label="车行收入"></el-option>
                 <el-option value="23" label="欧洲单团分润收入"></el-option>
+                <el-option value="24" label="欧洲损失分摊"></el-option>
               </el-select>
               <el-select v-model="msg.DataType" :disabled="shujuType" filterable class="w150"  v-if="isShowGrounding==false">
                 <el-option value="6" v-if="isShowType" label="日本地接部专户"></el-option>
@@ -764,6 +765,7 @@ Vue.component("TCIDJump", {
     <span style="cursor: pointer" v-if="rowData.DataType===16">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===22" @click="goCarUrl('CarDealerOrderOP',rowData.TCID,rowData)">{{rowData.TCID}}</span>
     <span style="cursor: pointer" v-if="rowData.DataType===23"  @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span>
+    <span style="cursor: pointer" v-if="rowData.DataType===24"  @click="goUrl('TeamBalancePayment',rowData.TCID,rowData)">{{rowData.TCID}}</span>
   </div>
 
   `,
@@ -912,6 +914,7 @@ Vue.component("TCNUMJump", {
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===21" @click="goUrl('FinancialDocumentsDetail',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===22" @click="goCarUrl('CarDealerOrderOP',rowData.TCID,rowData)">{{rowData.TCNUM}}</span>
     <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===23"  @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span>
+    <span style="cursor: pointer;text-decoration:underline" v-if="rowData.DataType===24"  @click="goUrl('TravelControlList',rowData.TCNUM,rowData)">{{rowData.TCNUM}}</span>
   </div>`,
   props: {
     rowData: {
@@ -1887,6 +1890,16 @@ export default {
           isResize: true,
           componentName: "TCIDJumpWang"
         },
+        {
+          field: "LossApportionment",
+          formatter: this.moneyFormat,
+          title: "损失分摊",
+          width: 90,
+          titleAlign: "left",
+          columnAlign: "right",
+          isResize: true,
+          componentName: "TCIDJumpWang"
+        },
         {
           field: "ShiJiLiRun",
           formatter: this.moneyFormat,
@@ -2249,9 +2262,6 @@ export default {
     if(this.$route.query.LtIdStr){
       this.msg.LtIdStr=this.$route.query.LtIdStr
     }
-    if(this.$route.query.IsSelectTravelLoss){
-      this.msg.IsSelectTravelLoss=this.$route.query.IsSelectTravelLoss
-    }
     if(this.msg.endDate!=""){
       this.productionDate[0]=this.msg.startDate;
       this.productionDate[1]=this.msg.endDate;
@@ -2260,6 +2270,13 @@ export default {
     if(this.msg.LineId>0){
       this.msg.DataType="1";
     }
+    if(this.$route.query.IsSelectTravelLoss){
+      this.msg.IsSelectTravelLoss=this.$route.query.IsSelectTravelLoss;
+      this.msg.LossId = this.$route.query.AirLossId;
+      if(this.msg.IsSelectTravelLoss==2){
+        this.msg.DataType="-1";
+      }
+    }
     if(this.msg.LineId==-1){
       // 其余都是不限
       this.msg.DataType="-1";
@@ -2331,6 +2348,9 @@ export default {
     if(this.msg.LineId==-20){
       this.msg.DataType="23";
     }
+    if(this.msg.LineId==-24){
+      this.msg.DataType="24";
+    }
     let userInfo = this.getLocalStorage();
     if((","+userInfo.ActionMenuCode+",").indexOf(',F_Query_TicketTeamRevenueReport,')!=-1){
         this.isShowType = false;