页面修改

src/components/Ticketing/TicketManager.vue

@@ -1846,10 +1846,10 @@
                 <div class="_jztime">
                   <p class="PingFangSC">{{item.TicketDeadlineStr}}</p>
                   <p class="_text">{{$t('Airticket.Air_deadTicketTime')}}</p>
-                  <p class="_text cursor-p" style="padding: 5px 0 0 0;"
-                  v-if="item.InvoicingPrice>0" @click="BillingCharge(item,1)">
+                  <p class="_text cursor-p" style="padding: 5px 0 0 0;" v-if="item.InvoicingPrice>0"
+                    @click="BillingCharge(item,1)">
                     ￥{{item.InvoicingPrice}}
-                    <br/>开票收入
+                    <br />开票收入
                   </p>
                 </div>
               </el-col>
@@ -2250,6 +2250,12 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="5">
+          <el-form-item label="可售机票数量(同业/直客)">
+            <el-input v-model="addMsg.B2BSellNum" placeholder="可售机票数量(同业/直客)"
+              @keyup.native="checkInteger(addMsg,'B2BSellNum')" maxlength="2"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="5">
           <el-form-item label="备注">
             <el-input v-model="addMsg.Remark" placeholder="备注" type="textarea" :rows="2"></el-input>
@@ -2523,13 +2529,11 @@
           <el-input v-model="ticketMsg.NewAirId"></el-input>
         </el-form-item>
         <el-form-item label="财务单据ID">
-          <!-- <el-checkbox-group  > -->
           <template v-for="(item,index) in ticketMsg.FinalList">
             <el-checkbox v-model="ckedArr" @change="handleChange(item)" :label="item" :key="index+5000">{{item}}
             </el-checkbox>
           </template>
           <span v-show="ticketMsg.FinalList.length==0" style="font-size:14px">暂无数据</span>
-          <!-- </el-checkbox-group> -->
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -2614,7 +2618,6 @@
               </div>
               <div v-if="file.Type==2">
                 <div class="iconfont icon-excel" @click="showUpLoadFile(file)">
-
                 </div>
                 <span class="iconfont icon-guanbi1" @click="deleteUploadFile(fIndex)"></span>
               </div>
@@ -2630,9 +2633,7 @@
 
     <!-- 开票费用 -->
     <el-dialog width="1000px" :title="BillingChargeTitle" :visible.sync="BillingChargeDialog" center>
-      <el-form class="Rform" ref="form" :model="Ticketform" label-width="67px"
-      :disabled="BillingChargeTitle=='开票费用详情'">
-        <!-- <p>机位数：<span style="color: red;">{{BillingChargeObj.TicketNum}}</span> </p> -->
+      <el-form class="Rform" ref="form" :model="Ticketform" label-width="67px" :disabled="BillingChargeTitle=='开票费用详情'">
         <div style="color: red;font-size: 13px;text-align: right;padding: 0 0 5px 0;">注：开票单价*开票数量+升舱增收=总开票金额</div>
         <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;margin-bottom:15px" cellspacing="0"
           cellpadding="0" v-loading="loading">
@@ -2652,29 +2653,20 @@
             </td>
             <td>
               {{item.UnitPrice}}
-              <!-- <el-input size="mini" style="width:150px" v-model="item.UnitPrice" @keyup.native="checkPrice(item,'UnitPrice'),computeBillingCharge()">
-              </el-input> -->
             </td>
             <td>
               <el-input size="small" style="width:150px" v-model="item.GuestNum"
                 @keyup.native="checkInteger(item,'GuestNum'),computeBillingCharge()"></el-input>
             </td>
             <td>
-              <el-input size="mini" style="width:150px" v-model="item.IncreaseIncome" @keyup.native="checkPrice(item,'IncreaseIncome'),computeBillingCharge()">
+              <el-input size="mini" style="width:150px" v-model="item.IncreaseIncome"
+                @keyup.native="checkPrice(item,'IncreaseIncome'),computeBillingCharge()">
               </el-input>
             </td>
             <td>
               {{item.TotalPrice}}
             </td>
           </tr>
-          <!-- <tr>
-            <td>
-              开票数量合计
-            </td>
-            <td colspan="4">
-              {{TotalNum}}
-            </td>
-          </tr> -->
           <tr v-if="MsgRAirServiceList.length==0">
             <td colspan="5">暂无数据</td>
           </tr>
@@ -2699,9 +2691,9 @@
         }
       };
       return {
-        TotalNum:0,
+        TotalNum: 0,
         BillingChargeObj: {},
-        BillingChargeTitle:'',
+        BillingChargeTitle: '',
         BillingChargeDialog: false,
         FinaceIdnum: "",
         AirSeritem: [],
@@ -2788,12 +2780,20 @@
           IsLimit: 1,
           Departure_city: 0, //出发地
           SellType: -1, //售卖机票类型：0-团队机票，1-单卖机票
-          IsSelectInvoicing: '0',//是否未维护开票金额1-未维护，2-已维护
+          IsSelectInvoicing: '0', //是否未维护开票金额1-未维护，2-已维护
+        },
+        maintenanceList: [{
+            Name: '不限',
+            Id: '0'
+          },
+          {
+            Name: '未维护',
+            Id: '1'
+          },
+          {
+            Name: '已维护',
+            Id: '2'
           },
-        maintenanceList:[
-          {Name:'不限',Id:'0'},
-          {Name:'未维护',Id:'1'},
-          {Name:'已维护',Id:'2'},
         ],
         addMsg: {
           ID: "0",
@@ -2818,6 +2818,7 @@
           DayNum: 0, //行程天数
           SellType: 0, //售卖机票类型：0-团队机票，1-单卖机票
           Remark: "", //备注信息
+          B2BSellNum: 0, //可售机票数量
         },
         //去程
         addGoFlight: {
@@ -3014,34 +3015,35 @@
     },
     methods: {
       // 开票费用
-      SumbitBillingCharge(){
-        for(let i=0;i<this.MsgRAirServiceList.length;i++){
-          if (this.MsgRAirServiceList[i].GuestNum===''||this.MsgRAirServiceList[i].IncreaseIncome==='') {
+      SumbitBillingCharge() {
+        for (let i = 0; i < this.MsgRAirServiceList.length; i++) {
+          if (this.MsgRAirServiceList[i].GuestNum === '' || this.MsgRAirServiceList[i].IncreaseIncome === '') {
             this.Error("请完善需开票费用信息！");
             return;
           }
-          if(this.MsgRAirServiceList[i].GuestNum&&this.MsgRAirServiceList[i].GuestNum>this.MsgRAirServiceList[i].SeatNum){
+          if (this.MsgRAirServiceList[i].GuestNum && this.MsgRAirServiceList[i].GuestNum > this.MsgRAirServiceList[i]
+            .SeatNum) {
             this.Error(`开票数不能大于${this.MsgRAirServiceList[i].TCNUM}团机位使用数${this.MsgRAirServiceList[i].SeatNum}`);
             return;
           }
         }
         this.computeBillingCharge()
         let msg = []
-        this.MsgRAirServiceList.forEach(x=>{
+        this.MsgRAirServiceList.forEach(x => {
           let obj = {
-            TCID:x.TCID,
-            ID:x.ID,
-            GuestNum:x.GuestNum?x.GuestNum:0,
-            UnitPrice:x.UnitPrice,
-            TotalPrice:x.TotalPrice,
-            IncreaseIncome:x.IncreaseIncome?x.IncreaseIncome:0,
-            AirticketId:x.AirticketId,
+            TCID: x.TCID,
+            ID: x.ID,
+            GuestNum: x.GuestNum ? x.GuestNum : 0,
+            UnitPrice: x.UnitPrice,
+            TotalPrice: x.TotalPrice,
+            IncreaseIncome: x.IncreaseIncome ? x.IncreaseIncome : 0,
+            AirticketId: x.AirticketId,
           }
           msg.push(obj)
         })
         this.Btnloading = true;
         this.apipost(
-          "Invoicing_Get_SetInvoicingList",msg,
+          "Invoicing_Get_SetInvoicingList", msg,
           res => {
             this.Btnloading = false;
             if (res.data.resultCode == 1) {
@@ -3057,18 +3059,18 @@
         );
       },
 
-      BillingCharge(item,type){
-        if(type){
+      BillingCharge(item, type) {
+        if (type) {
           this.BillingChargeTitle = '开票费用详情'
-        }else{
+        } else {
           this.BillingChargeTitle = '编辑开票费用'
         }
         this.BillingChargeObj = item
         this.loading = true
         this.BillingChargeDialog = true
         this.apipost(
-          "Invoicing_Get_GetInvoicingList",{
-            airticketId:item.ID
+          "Invoicing_Get_GetInvoicingList", {
+            airticketId: item.ID
           },
           res => {
             this.loading = false
@@ -3077,18 +3079,18 @@
               list = res.data.data
               this.MsgRAirServiceList = [];
               item.PriceList.forEach(price => {
-                list.forEach(x=>{
-                  if(x.TCID==price.TCID){
+                list.forEach(x => {
+                  if (x.TCID == price.TCID) {
                     let obj = {
                       AirticketId: x.AirticketId,
                       OutBranchName: price.OutBranchName,
                       TCID: x.TCID,
                       TCNUM: price.TCNUM,
                       ID: x.ID,
-                      GuestNum: x.GuestNum,//人数
-                      UnitPrice: x.UnitPrice,//开票单价
-                      TotalPrice: x.TotalPrice,//总开票金额(人数 * 单价)
-                      IncreaseIncome: x.IncreaseIncome,//增收
+                      GuestNum: x.GuestNum, //人数
+                      UnitPrice: x.UnitPrice, //开票单价
+                      TotalPrice: x.TotalPrice, //总开票金额(人数 * 单价)
+                      IncreaseIncome: x.IncreaseIncome, //增收
                       SeatNum: x.SeatNum,
                     };
                     this.MsgRAirServiceList.push(obj);
@@ -3100,10 +3102,10 @@
             }
           })
       },
-      computeBillingCharge(){
+      computeBillingCharge() {
         this.TotalNum = 0
-        this.MsgRAirServiceList.forEach(x=>{
-          x.TotalPrice=(x.GuestNum*x.UnitPrice)+Number(x.IncreaseIncome)
+        this.MsgRAirServiceList.forEach(x => {
+          x.TotalPrice = (x.GuestNum * x.UnitPrice) + Number(x.IncreaseIncome)
           // this.TotalNum+=Number(x.GuestNum)
         })
       },
@@ -3528,7 +3530,7 @@
           name: "ChoiceAddFinancialDocuments",
           query: {
             Type: nFeeType,
-            portTypeId:1,
+            portTypeId: 1,
             path: "TicketFinace",
             blank: "y",
             orderObj: JSON.stringify(orderObj),
@@ -3559,7 +3561,7 @@
           name: "ChoiceAddFinancialDocuments",
           query: {
             Type: nFeeType,
-            portTypeId:1,
+            portTypeId: 1,
             path: "TicketFinace",
             blank: "y",
             orderObj: JSON.stringify(orderObj)
@@ -3622,16 +3624,16 @@
             if (res.data.resultCode == 1) {
               this.total = res.data.data.count;
               let datas = res.data.data.pageData
-              let arrList = function(list){
-                list.forEach(x=>{
+              let arrList = function (list) {
+                list.forEach(x => {
                   x.isBillingCharge = false
                 })
               }
               arrList(datas)
               this.dataList = datas;
-              let Time = this.getBeforeDate(0,new Date().Format("yyyy-MM-dd"))
+              let Time = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
               this.dataList.forEach(data => {
-                if(Time>data.TicketDeadlineStr){
+                if (Time > data.TicketDeadlineStr) {
                   data.isBillingCharge = true
                 }
                 data.RAirServiceList.forEach(item => {

src/components/index.vue

@@ -1843,7 +1843,7 @@
       this.allWindowWidth = allWindowWidth - 50 - 220 - 60;
       let maxLength = parseInt(allWindowWidth / 110);
       this.maxLength = maxLength;
-      this.testApi();
+      //this.testApi();
       //this.testEmp();
       let userinfo = this.getLocalStorage();
       let ActionMenuCode = userinfo.ActionMenuCode;