no message

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -511,6 +511,7 @@ tr._item_list td:last-child {
                 <el-option value="17" v-if="isShowType" label="单项酒店"></el-option>
                 <el-option value="18" v-if="isShowType" label="单项包车"></el-option>
                 <el-option value="19" v-if="isShowType" label="单项门票"></el-option>
+                <el-option value="20" 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>
@@ -1540,6 +1541,16 @@ export default {
           isResize: true,
           componentName: "TCIDJumpWang"
         },
+        {
+          field: "AirServiceCharge",
+          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",
@@ -2551,6 +2562,7 @@ export default {
       if (field === "JiPiao") return this.priceFormat(rowData.JiPiao);
       if (field === "GuoNeiLianYunJiPiao") return this.priceFormat(rowData.GuoNeiLianYunJiPiao);
       if (field === "AirLossIncome") return this.priceFormat(rowData.AirLossIncome);
+      if (field === "AirServiceCharge") return this.priceFormat(rowData.AirServiceCharge);
       if (field === "Visa") return this.priceFormat(rowData.Visa);
       if (field === "TiCheng") return this.priceFormat(rowData.TiCheng);
       if (field === "CompensationMoney")
@@ -2647,6 +2659,9 @@ export default {
       if(rowData.AirLossIncome < 0 && columnName=="AirLossIncome"){
         return "column-cell-class-name-test-red"
       }
+      if(rowData.AirServiceCharge < 0 && columnName=="AirServiceCharge"){
+        return "column-cell-class-name-test-red"
+      }
       if(rowData.Visa < 0 && columnName=="Visa"){
         return "column-cell-class-name-test-red"
       }

src/components/Ticketing/TicketManager.vue

@@ -1387,8 +1387,8 @@
         <li>
           <span>
             <em>开票状态</em>
-            <el-select v-model="msg.TicketManager" :placeholder="$t('pub.pleaseSel')" class="w120">
-              <el-option v-for="item in TicketManagerList" :key="item.Id" :label="item.Name" :value="item.Id">
+            <el-select v-model="msg.IsSelectInvoicing" :placeholder="$t('pub.pleaseSel')" class="w120">
+              <el-option v-for="item in maintenanceList" :key="item.Id" :label="item.Name" :value="item.Id">
               </el-option>
             </el-select>
           </span>
@@ -1866,6 +1866,7 @@
                 <div class="_jztime">
                   <p class="PingFangSC">{{item.TicketDeadlineStr}}</p>
                   <p class="_text">{{$t('Airticket.Air_deadTicketTime')}}</p>
+                  <p class="_text" v-if="item.InvoicingPrice>0">￥{{item.InvoicingPrice}}</p>
                 </div>
               </el-col>
               <el-col :span="3" class="">
@@ -1950,12 +1951,6 @@
                       <el-button type="primary" class="iconfont icon-duigou" @click="UpdateTicketState(item.ID,1)">
                       </el-button>
                     </el-tooltip>
-                    <!-- <el-tooltip class="item" effect="dark" content="开票费用" placement="top-start"
-                     v-if="item.isBillingCharge">
-                      <el-button type="primary" class="el-icon-coin" @click="BillingCharge(item)"
-                      style="font-size: 16px;">
-                      </el-button>
-                    </el-tooltip> -->
                   </el-button-group>
                 </div>
               </el-col>
@@ -2792,9 +2787,9 @@
           IsLimit: 1,
           Departure_city: 0, //出发地
           SellType: -1, //售卖机票类型：0-团队机票，1-单卖机票
-          TicketManager: '0',//是否未维护开票金额1-未维护，2-已维护
+          IsSelectInvoicing: '0',//是否未维护开票金额1-未维护，2-已维护
         },
-        TicketManagerList:[
+        maintenanceList:[
           {Name:'不限',Id:'0'},
           {Name:'未维护',Id:'1'},
           {Name:'已维护',Id:'2'},