解决冲突

src/components/FinancialModule/BasicDocuments.vue

@@ -263,7 +263,8 @@
         <p class="_tit">{{GetDetail.FinanceName}}</p>
         <div class="_conten">
             <template v-if="GetDetail.Type!==1 && GetDetail.Type!==7">
-                <my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill>
+                <!-- <my-Bill :ID="GetDetail.FrID" v-on:headCallBack="headCall" :width="widthSon" :color="colorSon"></my-Bill> -->
+                <new-Bill :ID="GetDetail.FrID"></new-Bill>
             </template>
             <template v-else-if="GetDetail.Type===1 && GetDetail.Type!==7">
                 <my-RVB-Bill :ID="GetDetail.FrID" :width="widthSon"  :color="colorSon"></my-RVB-Bill>
@@ -1105,6 +1106,8 @@ import teamProductModule from "../commonPage/teamProductModule.vue";
 import TicketFinace from "../commonPage/TicketFinace.vue";
 import SaleOrderModule from "../commonPage/SaleOrderModule.vue";
 import TicketingModule from "../commonPage/TicketingModule.vue";
+
+import newBill from "./FinancialSubmodule/NewBillModule.vue";
 // import MsgBus from '../../assets/utils/msgBus.js';
 export default {
     data(){
@@ -1237,6 +1240,7 @@ export default {
         'SaleOrderModule':SaleOrderModule,
         'TicketFinace':TicketFinace,
         'my-HB-Bill':myhrBill,
+        'new-Bill':newBill
     },methods:{
     payMsgListShow: function (type, index) {
         if(this.choiceMsg.Status==1){
@@ -1784,7 +1788,6 @@ export default {
             this.apipost('Financial_post_GetDetail',{ID:id,Type:2}, res => {
                 if(res.data.resultCode == 1) {
                     let data= res.data.data;
-                    console.log(data,'datas');
                     data.DetailList.forEach(x=>{
                         x.UnitPrice = this.$commonUtils.addCommas(x.UnitPrice.toFixed(2))
                         x.Money = x.Money.toFixed(2)
@@ -1814,10 +1817,11 @@ export default {
                         this.isShowChoice = true;
                     }
                     //遍历默认不勾选
+                    if(this.GetDetail.TradeDetailList&&this.GetDetail.TradeDetailList.length>0){
                         this.GetDetail.TradeDetailList.forEach(x=>{
                             x.isChecked = false;
                         })
-                    console.log(this.GetDetail,'getdetails');
+                    }
                     // 拼接团号显示团信息
                     let str = '';
                     if(data.TCIDList.length>0){

src/components/FinancialModule/CapitalAllocationDetail.vue

@@ -668,7 +668,6 @@ export default {
                 x.comText = this.$t('fnc.xsfujian');
                 x.isShow = false;
             });
-            console.log(this.GetDetail)
         }else{
           this.Error(res.data.message);
         }

src/components/Hotel/roomQuery.vue

@@ -49,7 +49,7 @@
         <li>
 
           <input type="button" class="normalBtn" value="查询" @click="getList();resetPageIndex()" />
-          <input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" style="display:none;" />
+          <input type="button" class="normalBtn" value="下载" @click="DownLoadHotel()" />
         </li>
       </ul>
     </div>

src/components/PrintPage.vue

@@ -74,7 +74,6 @@ export default {
         'my-GZ-Bill': myGZBill
     },methods:{
         numAdd(){ 
-            alert(111)
             this.num = this.num + 1
         }
     },mounted(){

src/components/SalesModule/Lowpricemanagement.vue

@@ -39,16 +39,22 @@
         <td>{{item.Reasons}}</td>
         <td>{{item.ApplyReason}}</td>
         <td>
-          <el-row>
+          <el-row v-if="item.ApplyState === 0">
             <button class="normalBtn" type="primary" @click="outerVisible = true,dialogTitle='审核理由',addMsg.ID=item.ID,addMsg.ApplyState= 1,addMsg.Reasons=item.Reasons">同意</button>
             <button class="hollowFixedBtn" @click="outerVisible = true,dialogTitle='拒绝理由',addMsg.ID=item.ID,addMsg.ApplyState= 2,addMsg.Reasons=item.ApplyReason">拒绝</button>
           </el-row>
         </td>
       </tr>
     </table>
-
+    <div class="noDataNotice" v-if="dataList.length<1">
+      <i class="iconfont icon-kong"></i>
+      <p>{{$t("active.ld_noData")}}</p>
+    </div>
     <el-dialog custom-class='w450' :title="dialogTitle" :visible.sync="outerVisible" center :before-close="closeChangeMachie">
       <el-form  :rules="rules" ref="addMsg" label-width="100px">
+        <el-form-item label="优惠金额" prop="Description">
+          <el-input  class='w217' v-model="addMsg.ApplyPrice"></el-input>
+        </el-form-item>
         <el-form-item :label="$t('system.label_info')" prop="Description">
           <el-input maxlength='250' class='w217' type="textarea" v-model="addMsg.Reasons"></el-input>
         </el-form-item>
@@ -80,7 +86,8 @@
         addMsg: {
           Reasons: '',
           ApplyState:"",
-          ID:''
+          ID:'',
+          ApplyPrice: '',
         },
         rules: {
           Name: [{
@@ -126,18 +133,23 @@
         done();
       },
       submitForm(){ 
-        console.log(this.addMsg.Description)
+        if (!this.addMsg.ApplyPrice || this.addMsg.ApplyPrice < 0) {
+          this.$message.error('请填写大于等于0的金额')
+          return
+        }
         this.apipost("lessprice_post_UpdateLesspriceOrder", this.addMsg, res => {
           if (res.data.resultCode == 1) {
             this.$message.success(res.data.message)
             this.outerVisible = false;
             this.addMsg.Reasons = '';
+            this.addMsg.ApplyPrice = '';
             this.getList()
           }
           else {
             this.$message.error(res.data.message)
             this.outerVisible = false;
             this.addMsg.Reasons = '';
+            this.addMsg.ApplyPrice = '';
           }
         }, err => {})
       }

src/components/SalesModule/groupTourOrder.vue

@@ -1267,8 +1267,8 @@
               <em style="font-size: 12px !important;color: #606266;line-height: 34px">订单当前单价</em>
               <em style=" display: inline-block;padding: 0 10px;height: 34px;line-height: 34px;text-align: left;font-size: 16px;border-radius: 3px;background-color: #E5E5E5;vertical-align: top;" class='w150'>{{SOMsg.OrderUnitPrice}}</em>
 
-              <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
-              <el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input>
+              <!-- <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
+              <el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input> -->
 
               <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >审核人</em>
               <el-select  placeholder="请选择" v-model="SOMsg.UpdateBy">
@@ -3166,7 +3166,7 @@
         this.remarksMsg.isOrder = '1'
         this.SpecialOffer = false
         this.SOMsg.UpdateBy=''
-        this.SOMsg.ApplyPrice=''
+        this.SOMsg.ApplyPrice=0
         this.SOMsg.ApplyReason=''
     },
       clearMsg () {
@@ -3602,10 +3602,10 @@
       },
       //申请优惠
       Preservation(){
-        if(this.SOMsg.ApplyPrice < 0 ){
-          this.$message.error('请填写大于等于0的金额')
-          return
-        }
+        // if(this.SOMsg.ApplyPrice <= 0 ){
+        //   this.$message.error('请填写大于等于0的金额')
+        //   return
+        // }
         var numReg = /^[0-9]+$/
         var numRe = new RegExp(numReg)
         if (!numRe.test(this.SOMsg.ApplyPrice)) {
@@ -3628,13 +3628,13 @@
               this.$message.success(res.data.message)
               this.SpecialOffer =false;
               this.SOMsg.UpdateBy=''
-              this.SOMsg.ApplyPrice=''
+              this.SOMsg.ApplyPrice=0
               this.SOMsg.ApplyReason=''
             }else {
               this.$message.error(res.data.message)
               this.SpecialOffer =false;
               this.SOMsg.UpdateBy=''
-              this.SOMsg.ApplyPrice=''
+              this.SOMsg.ApplyPrice=0
               this.SOMsg.ApplyReason=''
             }
           },

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -2179,8 +2179,8 @@
                 <em style="font-size: 12px !important;color: #606266;line-height: 34px">订单当前单价</em>
                 <em style=" display: inline-block;padding: 0 10px;height: 34px;line-height: 34px;text-align: left;font-size: 16px;border-radius: 3px;background-color: #E5E5E5;vertical-align: top;" class='w150'>{{SOMsg.OrderUnitPrice}}</em>
 
-                <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
-                <el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input>
+                <!-- <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >优惠金额</em>
+                <el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150' ></el-input> -->
 
                 <em style="margin-left: 100px;font-size: 12px !important;color: #606266;" >审核人</em>
                 <el-select  placeholder="请选择" v-model="SOMsg.UpdateBy">
@@ -3597,7 +3597,7 @@ submitYSZEForm(){
       this.remarksMsg.isOrder=1;
       this.SpecialOffer = false;
       this.SOMsg.UpdateBy=''
-      this.SOMsg.ApplyPrice=''
+      this.SOMsg.ApplyPrice=0
       this.SOMsg.ApplyReason=''
     },
     houseSubmit: function (){
@@ -4137,10 +4137,10 @@ submitYSZEForm(){
     },
     //申请优惠
     Preservation(){
-      if(this.SOMsg.ApplyPrice < 0 ){
-        this.$message.error('请填写大于等于0的金额')
-        return
-      }
+      // if(this.SOMsg.ApplyPrice < 0 ){
+      //   this.$message.error('请填写大于等于0的金额')
+      //   return
+      // }
       var numReg = /^[0-9]+$/
       var numRe = new RegExp(numReg)
       if (!numRe.test(this.SOMsg.ApplyPrice)) {
@@ -4163,13 +4163,13 @@ submitYSZEForm(){
             this.$message.success(res.data.message)
             this.SpecialOffer =false;
             this.SOMsg.UpdateBy=''
-            this.SOMsg.ApplyPrice=''
-            this.SOMsg.ApplyReason=''
+            this.SOMsg.ApplyPrice=0
+            this.SOMsg.ApplyReason=0
           }else {
             this.$message.error(res.data.message)
             this.SpecialOffer =false;
             this.SOMsg.UpdateBy=''
-            this.SOMsg.ApplyPrice=''
+            this.SOMsg.ApplyPrice=0
             this.SOMsg.ApplyReason=''
           }
         },

src/components/SalesModule/productQuery.vue

@@ -1981,7 +1981,6 @@
           TCID: id
         }, res => {
           if (res.data.resultCode == 1) {
-            console.log(res.data.data)
             this.tripDetails = res.data.data.FlightList
           } else {
             this.$message.error(res.data.message)

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -2600,8 +2600,8 @@
                 style=" display: inline-block;padding: 0 10px;height: 34px;line-height: 34px;text-align: left;font-size: 16px;border-radius: 3px;background-color: #E5E5E5;vertical-align: top;"
                 class='w150'>{{SOMsg.OrderUnitPrice}}</em>
 
-              <em style="margin-left: 100px;font-size: 12px !important;color: #606266;">优惠金额</em>
-              <el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150'></el-input>
+              <!-- <em style="margin-left: 100px;font-size: 12px !important;color: #606266;">优惠金额</em>
+              <el-input v-model='SOMsg.ApplyPrice' type='text' maxlength='20' class='w150'></el-input> -->
 
               <em style="margin-left: 100px;font-size: 12px !important;color: #606266;">审核人</em>
               <el-select placeholder="请选择" v-model="SOMsg.UpdateBy">
@@ -3890,7 +3890,7 @@
         this.remarksMsg.OrderId = "0";
         this.SpecialOffer = false;
         this.SOMsg.UpdateBy = ''
-        this.SOMsg.ApplyPrice = ''
+        this.SOMsg.ApplyPrice = 0
         this.SOMsg.ApplyReason = ''
 
       },
@@ -4654,10 +4654,10 @@
       },
       //申请优惠
       Preservation() {
-        if (this.SOMsg.ApplyPrice < 0) {
-          this.$message.error('请填写大于等于0的金额')
-          return
-        }
+        // if (this.SOMsg.ApplyPrice < 0) {
+        //   this.$message.error('请填写大于等于0的金额')
+        //   return
+        // }
         var numReg = /^[0-9]+$/
         var numRe = new RegExp(numReg)
         if (!numRe.test(this.SOMsg.ApplyPrice)) {
@@ -4680,13 +4680,13 @@
               this.$message.success(res.data.message)
               this.SpecialOffer = false;
               this.SOMsg.UpdateBy = ''
-              this.SOMsg.ApplyPrice = ''
+              this.SOMsg.ApplyPrice = 0
               this.SOMsg.ApplyReason = ''
             } else {
               this.$message.error(res.data.message)
               this.SpecialOffer = false;
               this.SOMsg.UpdateBy = ''
-              this.SOMsg.ApplyPrice = ''
+              this.SOMsg.ApplyPrice = 0
               this.SOMsg.ApplyReason = ''
             }
           },

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1688,9 +1688,7 @@
       //默认显示联运
       this.queryMsg.IsShowUnion = 0;
       let userInfo = this.getLocalStorage()
-      this.CurrentUserInfo = userInfo
-
-      this.$route.query.tcmun = this.$route.query.tcmun
+      this.CurrentUserInfo = userInfo;
       if (this.$route.query.tcmun) {
         this.queryMsg.TCNUM = this.$route.query.tcmun;
       }

src/components/leaderPay2.vue

@@ -239,7 +239,7 @@
                     <th>领队退款</th>
                 </tr>
                 <tr v-for="item in TotalPriceData" v-if="item.PlanPrice > 0 || item.PlanTotalPrice > 0 || item.ExpendTotalPrice > 0">
-                    <td>{{moneyFormat(item.CurrencyStr)}}</td>
+                    <td>{{item.CurrencyStr}}</td>
                     <td>{{moneyFormat(item.PlanPrice)}}</td>
                     <td>{{moneyFormat(item.PlanTotalPrice)}}</td>
                     <td>{{moneyFormat(item.ExpendTotalPrice)}}</td>
@@ -256,6 +256,7 @@
                 <input type="button" class="leader2Btn" value="查看详情" @click="Lookdetails()">
             </div>
         </div>
+        <a :href='blankUrl' id='blankLink' target="_blank" style="display:none">1</a>
     </div>
 </template>
 <script>
@@ -283,6 +284,7 @@ export default {
             totalList:[],
             isShowRemark:false,
             TotalPriceData: [],
+            blankUrl:'',
         }
  	},
     methods: {
@@ -380,17 +382,21 @@ export default {
       Lookdetails(){
           console.log(this.$route.query.id);
           console.log(this.$route.query.NewCombinationNum);
-
-        this.$router.push({
-          name: 'leaderPay',
-          query: {
-            "id": this.$route.query.id,
-            NewCombinationNum:this.$route.query.NewCombinationNum,
-            isUpdate: true,
-            blank: 'y',
-            tab: '领队报账'
-          }
-        })
+          let fullPath = `/leaderPay?id=${this.$route.query.id}&NewCombinationNum=${this.$route.query.NewCombinationNum}&isUpdate=${true}&blank=y&tab=领队报账`
+        let dom = document.querySelector("#blankLink")
+        dom.href=`http://${window.location.host}/#${fullPath}`
+        //console.log(that.$refs.blankLink.click())
+        dom.click()
+        // this.$router.push({
+        //   name: 'leaderPay',
+        //   query: {
+        //     id: this.$route.query.id,
+        //     NewCombinationNum:this.$route.query.NewCombinationNum,
+        //     isUpdate: true,
+        //     blank: 'y',
+        //     tab: '领队报账'
+        //   }
+        // })
       }
 
     },

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -40,7 +40,7 @@
         <TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
           :NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList" v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
 
-        <TravelPrice @saveMsg="SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :priceList="PriceList" v-if="TeamType==0"
+        <TravelPrice @saveMsg="PostConfig.IsUpdateHotel=1,SaveData(1)" ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :priceList="PriceList" v-if="TeamType==0"
           :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice>
         <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip" v-if="TeamType==1"
           :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice2>
@@ -122,6 +122,8 @@
           Feature: "", //行程特色
           fileList: [],
           VideoStr: "", //视频地址
+          //是否更新酒店库存
+          IsUpdateHotel:0
         },
         //行程
         FeatureData: {
@@ -371,6 +373,7 @@
           basicData.TravelInfoIsCopy = true;
         }
         basicData.TeamType=this.TeamType;
+        basicData.IsUpdateHotel=this.PostConfig.IsUpdateHotel;
         this.apipost(
           "travel_post_SetTravelConfigInfo",
           basicData,

src/components/newTravelmanager/TravelGroupControl/TravelPrice.vue

@@ -180,12 +180,12 @@
     border: 1px solid #d1d1d1;
   }
 
-  ._TravelPriceDetails .jiDiv{
-    width:800px;
+  ._TravelPricePopover .jiDiv{
+    width:650px;
     max-height:400px;
     overflow: auto;
   }
-  ._TravelPriceDetails table {
+  ._TravelPricePopover table {
     padding: 10px 0 0 20px;
     background-color: #ededed;
     border-collapse: collapse;
@@ -195,13 +195,13 @@
     width: 100%;
   }
 
-  ._TravelPriceDetails table ._color_666 {
+  ._TravelPricePopover table ._color_666 {
     background-color: #ededed;
     color: #666666;
     padding: 5px;
   }
 
-  ._TravelPriceDetails table td {
+  ._TravelPricePopover table td {
     background-color: #ffffff;
     padding: 9px 0;
     color: #333333;
@@ -209,7 +209,7 @@
     border: 1px solid #d2d2d2;
   }
 
-  ._TravelPriceDetails table td._d_name {
+  ._TravelPricePopover table td._d_name {
     background-color: #ededed;
   }
 
@@ -257,6 +257,7 @@
   .TP_Airticktid {
     text-decoration: underline;
     cursor: pointer;
+    color: #409eff;
   }
 
   .TP_noneed {
@@ -664,7 +665,7 @@
                     <span class="TPsecondTitle">机票绑定</span>
                   </div>
                   <div class="TPright clearfix">
-                    <el-popover popper-class="_TravelPriceDetails" trigger="click">
+                    <el-popover popper-class="_TravelPricePopover" trigger="click">
                       <div>
                         <div style="margin-bottom:20px;">
                           开始日期
@@ -681,28 +682,22 @@
                           <table width="100%" border="0" cellspacing="0" cellpadding="0">
                             <tr>
                               <td class="_color_666">选择</td>
-                              <td class="_color_666">航班号</td>
-                              <td class="_color_666">航空公司</td>
-                              <td class="_color_666">航段</td>
+                              <td class="_color_666">航班号/航空公司/航段</td>
                               <td class="_color_666">时间</td>
                               <td class="_color_666">PNR</td>
-                              <td class="_color_666">机票数量</td>
-                              <td class="_color_666">使用数量</td>
+                              <td class="_color_666">机票数量/使用数量</td>
                               <td class="_color_666">绑定机位数</td>
                             </tr>
                             <tr v-for="fitem in selectFilghtList">
                               <td>
                                 <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>
+                              <td>
+                                <span class="TP_Airticktid" @click="goUrl('TicketManager',fitem.AirticketId)">{{fitem.FlightNumber}}</span> / {{fitem.AlName}} / {{fitem.DepartureName}}-{{fitem.ArrivalCityName}}
                               </td>
-                              <td>{{fitem.AlName}}</td>
-                              <td>{{fitem.DepartureName}}-{{fitem.ArrivalCityName}}</td>
                               <td>{{fitem.FlightDate}} {{fitem.Departure_time}}</td>
                               <td>{{fitem.PNR}}</td>
-                              <td>{{fitem.TicketNum}}</td>
-                              <td>{{fitem.UseAmount}}</td>
+                              <td>{{fitem.TicketNum}} / {{fitem.UseAmount}}</td>
                               <td>
                                 <el-input class="w80" placeholder="机位数" @keyup.native="getFlightBindNum(fitem)" v-model="fitem.BindNum"></el-input>
                               </td>
@@ -812,7 +807,7 @@
               <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 }}</span>
+                <span style="float: right; color:red; font-size: 13px">剩余库存:{{subItem.Inventory}} / 价格:{{subItem.CostPrice}}</span>
               </el-option>
             </el-select>
           </td>
@@ -1558,7 +1553,7 @@
             IsMoreThanZero: 1
           };
           this.apipost(
-            "hotel_post_GetHasStockHotelList", msg,
+            "hotel_post_GetHasStockHotelListExt", msg,
             res => {
               if (res.data.resultCode == 1) {
                 item.HotelList = res.data.data;
@@ -1576,7 +1571,6 @@
           LineTeamId:this.PostConfig.LineteamId
         }
         this.apipost("sell_get_GetNewTCIDLessprice", msg,res => {
-            console.log(res,'res');
             if (res.data.resultCode == 1) {
                 this.lessPriceData = res.data.data;
             }else{
@@ -1626,7 +1620,6 @@
             this.DateArr.push(x.StartDate);
           });
           this.initCalendar();
-          console.log(this.priceData,'pricedate');
         },
         deep: true
       },
@@ -1651,5 +1644,4 @@
       TravelPriceFlightList: TravelPriceFlightList
     }
   };
-
 </script>
\ No newline at end of file

src/router/config.js

@@ -3000,12 +3000,12 @@ export default {
                                 title: '奖项列表'
                             }
                         },
-                        {
-                            path: '/Rotationchart',
-                            name: 'Rotationchart',
-                            component: resolve => require(['@/components/activity/Rotationchart'], resolve),
+                        , {
+                            path: '/BmenuManagement',
+                            name: 'BmenuManagement',
+                            component: resolve => require(['@/components/activity/BmenuManagement'], resolve),
                             meta: {
-                                title: '轮播图管理'
+                                title: 'B2B菜单管理'
                             }
                         },
                     ]