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

src/components/FinancialModule/ChoiceAddFinancialDocuments2.vue

@@ -39,8 +39,8 @@
       <el-input v-model="searchVal" placeholder="请输入内容" style="width:200px"></el-input>
     </div>
     <ul class="_conten">
-      <li v-for="(item,index) in NewItems">
-        <template v-if="(item.IsShow === 1 || item.showYes) && item.bigShow">
+      <template v-for="(item,index) in NewItems">
+      <li v-if="(item.IsShow === 1 || item.showYes) && item.bigShow">
         <div class="_left">
           <span class="_Icon">{{item.Name.substring(0,1)}}</span>
           <div>
@@ -68,8 +68,8 @@
             @click="goUrl('addFinancialDocuments',item.Id,item.Name+$t('visa.v_dan'),item.Type,item.IsUploadPic)"></i>
           </el-tooltip>
         </div>
-        </template>
       </li>
+    </template>
     </ul>
     <div class="noData" v-show="noData">
       {{$t('system.content_noData')}}
@@ -327,13 +327,7 @@
                 y.showYes = true
                 newList.push(JSON.parse(JSON.stringify(y)))
               } else {
-                if(!this.$route.query.noTypeCost){
-                  y.showYes = true
-                  newList.push(JSON.parse(JSON.stringify(y)))
-                }else{
-                  y.showYes = false
-                }
-
+                y.showYes = false
               }
             })
           })
@@ -385,8 +379,6 @@
                   // }
                 // }
                 x.bigShow = true
-                x.showYes = true
-
                 if(x.Type==1){
                     this.collectList.push(x);
                 }else if (x.Type==2){

src/components/FinancialModule/addFinancialDocuments.vue

@@ -558,7 +558,9 @@
                 <el-select filterable v-model='da.CostTypeId' ref='CostTypeId' :placeholder="$t('rule.qxzfyshuoming')"
                   @change="getCostTypeName(da.CostTypeId, daIn),getRate(da.CostTypeId,da.CurrencyId,2,daIn),addList(2,daIn+1)"
                   class=" _border_b_1">
-                  <el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID' :disabled="SelectDisablsed!=item.ID">
+                  <!-- SelectDisablsed!=item.ID -->
+                  <el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'
+                  :disabled="SelectState">
                   </el-option>
                 </el-select>
               </td>
@@ -613,8 +615,9 @@
                 :placeholder="$t('rule.qxzfyshuoming')"
                 @change="getCostTypeName(detailList.CostTypeId), getRate(detailList.CostTypeId,detailList.CurrencyId,1),addList(1)"
                 class="_border_b_1">
+                <!-- SelectDisablsed!=item.ID -->
                 <el-option v-for='item in GetCostTypeList' :label='item.Name' :value='item.ID' :key='item.ID'
-                  :disabled="SelectDisablsed!=item.ID">
+                  :disabled="SelectState">
                 </el-option>
               </el-select>
             </td>
@@ -2082,7 +2085,6 @@
               if (this.orderObj.SelectState) {
                 this.SelectState = true;
                 this.SelectDisablsed = Number(this.orderObj.CostType)
-
               }
               if (this.orderObj.CurrencyId) {
                 this.detailList.CurrencyId = Number(this.orderObj.CurrencyId);

src/components/SalesVisa/ModifyVisaProduct.vue

@@ -442,6 +442,7 @@
                             type="daterange"
                             range-separator="至"
                             value-format="yyyy-MM-dd"
+                            @change="getTimeDate"
                             >
                             </el-date-picker>
                           </br>
@@ -994,6 +995,19 @@ getCompanyList() {
       };
       this.PriceDates=[]
     },
+    getTimeDate(){
+      this.addMsg.EffectiveStartDate = moment(this.PriceDates[0]).format(
+        "YYYY-MM-DD"
+      );
+      this.addMsg.SendVisaDate = moment(this.PriceDates[1]).format(
+        "YYYY-MM-DD"
+      );
+      let SendVisaDate = moment(new Date(this.addMsg.SendVisaDate)).format("YYYY-MM")+'-25'
+      if(this.addMsg.SendVisaDate>=SendVisaDate){
+        this.Error(`价格有效结束日期请选择${SendVisaDate}之前日期！`);
+        return;
+      }
+    },
     SaveVisaProduct(formName) {
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -1022,7 +1036,7 @@ getCompanyList() {
           this.addMsg.SendVisaDate = moment(this.PriceDates[1]).format(
             "YYYY-MM-DD"
           );
-          let SendVisaDate = moment(new Date(this.addMsg.EffectiveStartDate)).format("YYYY-MM")+'-25'
+          let SendVisaDate = moment(new Date(this.addMsg.SendVisaDate)).format("YYYY-MM")+'-25'
           if(this.addMsg.SendVisaDate>=SendVisaDate){
             this.Error(`价格有效结束日期请选择${SendVisaDate}之前日期！`);
             return;

src/components/SalesVisa/components/visaOrderList.vue

@@ -561,7 +561,7 @@
               </template>
             </template>
           </el-table-column>
-          <el-table-column label="报名日期" min-width="100" style="background:#EAEAEA">
+          <el-table-column label="截止日期" min-width="100" style="background:#EAEAEA">
             <template slot-scope="scope">
               <template>
                 {{ scope.row.sendStartDate }}

src/components/Ticketing/TicketManager.vue

@@ -1866,7 +1866,11 @@
                 <div class="_jztime">
                   <p class="PingFangSC">{{item.TicketDeadlineStr}}</p>
                   <p class="_text">{{$t('Airticket.Air_deadTicketTime')}}</p>
-                  <p class="_text cursor-p" v-if="item.InvoicingPrice>0" @click="BillingCharge(item,1)">开票总金额：￥{{item.InvoicingPrice}}</p>
+                  <p class="_text cursor-p" style="padding: 5px 0 0 0;"
+                  v-if="item.InvoicingPrice>0" @click="BillingCharge(item,1)">
+                    ￥{{item.InvoicingPrice}}
+                    <br/>开票收入
+                  </p>
                 </div>
               </el-col>
               <el-col :span="3" class="">
@@ -2648,6 +2652,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> -->
         <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">
@@ -2661,10 +2666,14 @@
           <tr v-for="(item,index) in MsgRAirServiceList" :key="index">
             <td>
               {{item.TCNUM}}({{item.TCID}}){{item.OutBranchName}}
+              <span style="margin-left: 3px;" v-if="item.SeatNum">使用机位：
+                <span style="color: red;">{{item.SeatNum}}</span>
+              </span>
             </td>
             <td>
-              <el-input size="mini" style="width:150px" v-model="item.UnitPrice" @keyup.native="checkPrice(item,'UnitPrice'),computeBillingCharge()">
-              </el-input>
+              {{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"
@@ -2675,10 +2684,17 @@
               </el-input>
             </td>
             <td>
-              <el-input size="mini" style="width:150px" v-model="item.TotalPrice" @keyup.native="checkPrice(item,'TotalPrice')">
-              </el-input>
+              {{item.TotalPrice}}
             </td>
           </tr>
+          <!-- <tr>
+            <td>
+              开票数量合计
+            </td>
+            <td colspan="4">
+              {{TotalNum}}
+            </td>
+          </tr> -->
           <tr v-if="MsgRAirServiceList.length==0">
             <td colspan="5">暂无数据</td>
           </tr>
@@ -2703,6 +2719,8 @@
         }
       };
       return {
+        TotalNum:0,
+        BillingChargeObj: {},
         BillingChargeTitle:'',
         BillingChargeDialog: false,
         FinaceIdnum: "",
@@ -3022,6 +3040,10 @@
             this.Error("请完善需开票费用信息！");
             return;
           }
+          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 = []
@@ -3046,7 +3068,7 @@
               this.Success(res.data.message);
               // this.initMsg();
               this.BillingChargeDialog = false
-              // this.getList();
+              this.getList();
             } else {
               this.Error(res.data.message);
             }
@@ -3061,6 +3083,7 @@
         }else{
           this.BillingChargeTitle = '编辑开票费用'
         }
+        this.BillingChargeObj = item
         this.loading = true
         this.BillingChargeDialog = true
         this.apipost(
@@ -3086,6 +3109,7 @@
                       UnitPrice: x.UnitPrice,//开票单价
                       TotalPrice: x.TotalPrice,//总开票金额(人数 * 单价)
                       IncreaseIncome: x.IncreaseIncome,//增收
+                      SeatNum: x.SeatNum,
                     };
                     this.MsgRAirServiceList.push(obj);
                   }
@@ -3097,8 +3121,10 @@
           })
       },
       computeBillingCharge(){
+        this.TotalNum = 0
         this.MsgRAirServiceList.forEach(x=>{
           x.TotalPrice=(x.GuestNum*x.UnitPrice)+Number(x.IncreaseIncome)
+          // this.TotalNum+=Number(x.GuestNum)
         })
       },
       SelectFinaceId(val, index) {

src/components/TravelManager/TravelList/TeamBalancePayment.vue

@@ -338,7 +338,7 @@
                 </div>
               </div>
             </el-col>
-            <el-col :span="3" v-if="DataList&&DataList.TeamBalance&&DataList.TeamBalance.IncreaseCharge>0">
+            <el-col :span="3" v-if="DataList&&DataList.TeamBalance">
               <div class="Team_DList">
                 <div class="Team_firstTitle">
                   <span class="Team_comCoinType Team_shou">
@@ -346,9 +346,9 @@
                   </span>开票费用
                 </div>
                 <div class="Team_Incontent">
-                  <div>开票单价：<span>￥{{DataList.TeamBalance.TicketUnit}}/票</span></div>
+                  <div>开票单价：<span>￥{{DataList.TeamBalance.TicketUnit}}/机位</span></div>
                   <div>开票数量：<span class="Team_Coins">{{DataList.TeamBalance.TicketNum}}</span></div>
-                  <div>升舱增收：<span class="Team_Coins">￥{{DataList.TeamBalance.IncreaseCharge}}</span></div>
+                  <div v-if="DataList.TeamBalance.IncreaseCharge>0">升舱增收：<span class="Team_Coins">￥{{DataList.TeamBalance.IncreaseCharge}}</span></div>
                   <div>总开票费用：<span class="Team_Coins">￥{{DataList.TeamBalance.TicketCharge}}</span></div>
                   <div>
                   </div>

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -339,7 +339,7 @@
                     <a style="margin-left: 5px;margin-right: 5px;">只看审核驳回</a>
                     <el-switch v-model="queryMsg.QOutGroupAuditReject" active-text="" inactive-text=""
                       active-color="#409eff" inactive-color="#dcdfe6" active-value="1" inactive-value="0" />
-                    <div style="margin-top: 10px;margin-left: 10px;font-size: 11px;" v-if="isCommissionDetails">
+                    <div style="margin-left: 10px;font-size: 11px;" v-if="isCommissionDetails">
                       <span style="color:#000000;background-color: #ff99cc;padding:0px 2px;border-radius:5px">单项</span>
                       <span style="color:#000000;background-color: #bcd6ee;padding:0px 4px;border-radius:5px">国内</span>
                       <span style="color:#000000;background-color: #DDDDDD;padding:0px 4px;border-radius:5px">出境</span>
@@ -1026,7 +1026,7 @@
                     style="background:#67c23a; border-color:#67c23a">
                     {{$t('Operation.Op_advertising')}}&nbsp;{{item.AdvertCount}}
                   </el-button>
-              
+
                   <template v-if="item.LineID==14||item.LineID==118">
                     <el-button v-if="item.IsPush==0" @click.native='PushMessage(item)' type="primary"
                       style="background:#00C6FF; border-color:#00C6FF;">推送消息