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

src/components/FinancialModule/addFinancialDocuments.vue

@@ -185,8 +185,8 @@
                         <el-radio :label="1" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.gongzhang')}}</el-radio>
                         <el-radio :label="0" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.sizhang')}}</el-radio>
                         <el-radio :label="2" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.rmbxianjin')}}</el-radio>
-                        <el-radio :label="3" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>{{$t('fnc.wbxianjin')}}</el-radio>
-                        <el-radio :label="4" v-if='msg.TemplateId===36 || msg.TemplateId===37 || msg.TemplateId===43'>{{$t('fnc.zjinchi')}}</el-radio>
+                        <el-radio :label="3" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48'>{{$t('fnc.wbxianjin')}}</el-radio>
+                        <el-radio :label="4" v-if='(msg.TemplateId===36 || msg.TemplateId===37) && msg.TemplateId!==43'>{{$t('fnc.zjinchi')}}</el-radio>
                         <el-radio :label="5" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.ptxnzhanghu')}}</el-radio>
                         <el-radio :label="6" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.djxnzhanghu')}}</el-radio>
                         <el-radio :label="7" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.szxiangdi')}}</el-radio>

src/components/LeaderManagement/leaderReimbursement.vue

@@ -123,6 +123,7 @@
         <td width="80">实际用房数</td>
         <td width="">房间类型</td>
         <td width="">房间数</td>
+        <td width="80">预定人数</td>
         <td width="80">免费人数</td>
         <td width="">单价/人</td>
         <td width="">金额小计</td>
@@ -172,6 +173,15 @@
             </div>
           </div>
         </td>
+        <td>
+          <div class="alcenter">
+            <div v-for="subItem in outItem.HotelOrderList">
+              <p v-for="childItem in subItem.OrderDetailsList">
+                {{childItem.BookNum}}
+              </p>
+            </div>
+          </div>
+        </td>
         <td>
           <div class="alcenter">
             <div v-for="subItem in outItem.HotelOrderList">
@@ -218,8 +228,9 @@
         <td>
           <div v-for="subItem in outItem.HotelOrderList"> 
             <span v-if="subItem.PayStyle === 1">现付</span>
-            <span v-else-if="subItem.PayStyle === 2">公司结算</span>
-            <span v-else-if="subItem.PayStyle === 3">预付</span>
+            <span v-else-if="subItem.PayStyle === 2">签单</span>
+            <span v-else-if="subItem.PayStyle === 4">预付</span>
+             <span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
             <span v-else>暂无</span>
           </div>
         </td>
@@ -239,7 +250,7 @@
           {{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
         </td>
         <td>签单/预付/抵扣总金额</td>
-        <td colspan="6">
+        <td colspan="7">
           {{moneyFormat(TotalNav.reimburseTotalPrice.BalanceTotalPrice)}}
         </td>
       </tr>
@@ -530,7 +541,7 @@
           Money: obj.LeaderGetPriceT,
           TCNUMS: obj.TCNUMS
         }
-        let id = [43]
+        let id = [43,48]
         this.$router.push({
           name: 'ChoiceAddFinancialDocuments',
           query:{

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -180,11 +180,12 @@
     border: 1px solid #d1d1d1;
   }
 
-  ._TravelPricePopover .jiDiv{
-    width:650px;
-    max-height:400px;
+  ._TravelPricePopover .jiDiv {
+    width: 650px;
+    max-height: 400px;
     overflow: auto;
   }
+
   ._TravelPricePopover table {
     padding: 10px 0 0 20px;
     background-color: #ededed;
@@ -334,12 +335,14 @@
     cursor: default !important;
     box-shadow: none !important;
   }
-  .lessPriceRule{
-    font-size:14px;
-    margin-left:40px;
+
+  .lessPriceRule {
+    font-size: 14px;
+    margin-left: 40px;
     text-decoration: underline;
     cursor: pointer;
   }
+
 </style>
 
 <template>
@@ -443,7 +446,8 @@
                     <el-checkbox v-model="priceData.IsLessPrice" :true-label="CheckedVaule"
                       :false-label="UnCheckedVaule">可少价
                     </el-checkbox>
-                    <input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true" v-if="PostConfig.LineId==14 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
+                    <input type="button" class="normalBtn" value="酒店使用情况" @click="outerVisible=true"
+                      v-if="PostConfig.LineId==14 && priceData.PriceHotelList&&priceData.PriceHotelList.length>0" />
                   </div>
                   <el-form-item prop="B2BMemberPrice">
                     <el-input placeholder="请输入" class="w190 ComSeat" v-model="priceData.B2BMemberPrice"
@@ -693,13 +697,16 @@
                                 <el-checkbox v-model="fitem.IsSelected===true" @change="getSelect(fitem)"></el-checkbox>
                               </td>
                               <td>
-                                <span class="TP_Airticktid" @click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span> / {{fitem.AlName}} / {{fitem.DepartureName}}-{{fitem.ArrivalCityName}}
+                                <span class="TP_Airticktid"
+                                  @click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span> /
+                                {{fitem.AlName}} / {{fitem.DepartureName}}-{{fitem.ArrivalCityName}}
                               </td>
                               <td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>
                               <td>{{fitem.PNR}}</td>
                               <td>{{fitem.TicketNum}} / {{fitem.UseAmount}}</td>
                               <td>
-                                <el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input>
+                                <el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)"
+                                  v-model="fitem.BindNum"></el-input>
                               </td>
                             </tr>
                           </table>
@@ -775,7 +782,8 @@
                   </div>
                 </div>
                 <div class="TPright">
-                      <span v-if="priceData.IsLessPrice==1" @click="getLessPriceInfo(),lessPriceVisible=true" class="lessPriceRule">少价规则</span>
+                  <span v-if="priceData.IsLessPrice==1" @click="getLessPriceInfo(),lessPriceVisible=true"
+                    class="lessPriceRule">少价规则</span>
                 </div>
               </div>
             </el-form>
@@ -789,6 +797,12 @@
     </div>
     <el-dialog custom-class='Tp_hotelDialog' title="酒店使用情况" :visible.sync="outerVisible" center>
       <table class="TphotelTable" border="0" cellspacing='1' v-if="priceData.TCID>0">
+        <tr>
+           <th>日期</th>
+           <th>酒店</th>
+           <th>占房时间</th>
+           <th>更换酒店</th>
+        </tr>
         <tr v-if="priceData.PriceHotelList" v-for="item in priceData.PriceHotelList">
           <td style="background-color:#E6E6E6;color:#333;" width="120">{{item.UseDay}}</td>
           <td>
@@ -797,9 +811,10 @@
                 {{index+1}}.{{subItem.HotelName}}&nbsp;&nbsp;
                 <span v-if="subItem.UseCount>0 && item.SubList.length==1">
                   <a style="color:green">{{subItem.RemainingInventory>-3?"【OK】":"【暂定】"}}</a>
-                  【<span style="color:green">本团使用库存：{{subItem.UseCount}} {{subItem.CostPrice!=0?"价格:"+subItem.CostPrice:""}}</span>】</span>
-                  【<span
-                  style="color:#E95252;">剩余库存：{{subItem.RemainingInventory}} <template v-if="subItem.CreateDateStr">占房时间:{{subItem.CreateDateStr}}</template>
+                  【<span style="color:green">本团使用库存：{{subItem.UseCount}}
+                    {{subItem.CostPrice!=0?"价格:"+subItem.CostPrice:""}}</span>】
+                </span>
+                【<span style="color:#E95252;">剩余库存：{{subItem.RemainingInventory}}
                 </span>】
                 &nbsp;&nbsp;
                 <el-checkbox v-if="item.SubList.length>1" v-model="item.CheckList[index].CheckStatus"
@@ -807,13 +822,23 @@
               </div>
             </div>
           </td>
+          <td>
+            <div class="tp_divList" v-for="(subItem,index) in item.SubList">
+              <div>
+                <span v-if="subItem.UseCount>0 && item.SubList.length==1">
+                  <span style="color:green;white-space:nowrap;">{{subItem.CreateDateStr}}</span>
+                </span>
+              </div>
+            </div>
+          </td>
           <td>
             <el-select class="w180" v-model="item.NewHotelId" @visible-change="getHotelList(item,$event)"
               @change="changeHotelList()" filterable>
               <el-option :key="0" label="请选择" :value="0"></el-option>
               <el-option v-for="subItem in item.HotelList" :key="subItem.ID" :label="subItem.Name" :value="subItem.ID">
                 <span style="float: left">{{subItem.Name}}</span>
-                <span style="float: right; color:red; font-size: 13px">剩余库存:{{subItem.Inventory}} / 价格:{{subItem.CostPrice}}</span>
+                <span style="float: right; color:red; font-size: 13px">剩余库存:{{subItem.Inventory}} /
+                  价格:{{subItem.CostPrice}}</span>
               </el-option>
             </el-select>
           </td>
@@ -822,7 +847,8 @@
       <div slot="footer" class="dialog-footer">
         <button class="normalBtn" type="primary" @click="saveHoteluseDetail()"
           :class="{'disClick':!isSaved}">{{btnText}}</button> &nbsp;
-        <button class="hollowFixedBtn" :class="{'disClick':!isSaved}" @click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button>
+        <button class="hollowFixedBtn" :class="{'disClick':!isSaved}"
+          @click="cancelHotelUseDetail()">{{$t('pub.cancelBtn')}}</button>
       </div>
     </el-dialog>
 
@@ -835,13 +861,16 @@
         </tr>
         <tr v-for="item in lessPriceData">
           <td>
-            <span v-if="item.LessMoney!=null" style="margin-right:30px;">{{item.LessMoney}}元</span><span v-if="item.LessPercent!=null">{{item.LessPercent}}%</span>
+            <span v-if="item.LessMoney!=null" style="margin-right:30px;">{{item.LessMoney}}元</span><span
+              v-if="item.LessPercent!=null">{{item.LessPercent}}%</span>
           </td>
           <td>
-            <span v-if="item.DeptLessMoney!=null" style="margin-right:30px;">{{item.DeptLessMoney}}元</span><span v-if="item.DeptLessPercent!=null">{{item.DeptLessPercent}}%</span>
+            <span v-if="item.DeptLessMoney!=null" style="margin-right:30px;">{{item.DeptLessMoney}}元</span><span
+              v-if="item.DeptLessPercent!=null">{{item.DeptLessPercent}}%</span>
           </td>
           <td>
-            <span v-if="item.FilialeLessMoney!=null" style="margin-right:30px;">{{item.FilialeLessMoney}}元</span><span v-if="item.FilialeLessPercent!=null">{{item.FilialeLessPercent}}%</span>
+            <span v-if="item.FilialeLessMoney!=null" style="margin-right:30px;">{{item.FilialeLessMoney}}元</span><span
+              v-if="item.FilialeLessPercent!=null">{{item.FilialeLessPercent}}%</span>
           </td>
         </tr>
       </table>
@@ -945,8 +974,8 @@
           }
         },
         //少价规则
-        lessPriceVisible:false,
-        lessPriceData:[],
+        lessPriceVisible: false,
+        lessPriceData: [],
       };
     },
     methods: {
@@ -1160,7 +1189,7 @@
           QFlightDateEnd: this.QFlightDateEnd,
           CreateBy: createBy,
           AirTicketId: this.priceData.AirTicketId,
-          TCID:this.priceData.TCID
+          TCID: this.priceData.TCID
         };
 
         let that = this;
@@ -1437,10 +1466,9 @@
           parseInt(this.priceData.YSeat) +
           parseInt(this.priceData.CSeat) +
           parseInt(this.priceData.FSeat);
-          if(Number(fitem.TicketNum)-Number(fitem.OtherTeamUseNum)<Number(fitem.BindNum))
-          {
-             fitem.BindNum=0;
-             this.Error("最多只能绑定"+(Number(fitem.TicketNum)-Number(fitem.OtherTeamUseNum))+"个机位");
+        if (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum) < Number(fitem.BindNum)) {
+          fitem.BindNum = 0;
+          this.Error("最多只能绑定" + (Number(fitem.TicketNum) - Number(fitem.OtherTeamUseNum)) + "个机位");
         }
         this.selectFilghtList.forEach((x, index) => {
           if (x.IsSelected) {
@@ -1522,8 +1550,8 @@
       },
       //保存酒店使用情况
       saveHoteluseDetail() {
-        var that=this;
-        this.Confirm("是否确定提交选中的酒店?",function(){
+        var that = this;
+        this.Confirm("是否确定提交选中的酒店?", function () {
           if (that.isSaved) {
             that.isSaved = false;
             that.$emit("saveMsg");
@@ -1570,16 +1598,16 @@
         }
       },
       //获取少价信息
-      getLessPriceInfo(){
+      getLessPriceInfo() {
         let msg = {
-          RB_Branch_id:this.priceData.OutBranchId,
-          LineID:this.PostConfig.LineId,
-          LineTeamId:this.PostConfig.LineteamId
+          RB_Branch_id: this.priceData.OutBranchId,
+          LineID: this.PostConfig.LineId,
+          LineTeamId: this.PostConfig.LineteamId
         }
-        this.apipost("sell_get_GetNewTCIDLessprice", msg,res => {
+        this.apipost("sell_get_GetNewTCIDLessprice", msg, res => {
             if (res.data.resultCode == 1) {
               this.lessPriceData = res.data.data;
-            }else{
+            } else {
               this.Error(res.data.message);
             }
           },
@@ -1650,4 +1678,5 @@
       TravelPriceFlightList: TravelPriceFlightList
     }
   };
+
 </script>