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

src/assets/utils/tripUtils.js

@@ -331,7 +331,6 @@ var tripUtils = {
 
   //行程-【交通对象】
   trafficObj: function () {
-    console.log(ViittoFileUrl)
     return {
       ID: 0,
       ConfigId: 0,

src/components/FinancialModule/BasicDocuments.vue

@@ -1623,7 +1623,7 @@ export default {
         },
         BankAccount_post_GetCashPoolList(){ // 获取资金池账
           let id = 0;
-          this.AccListthis.AccList.forEach(x=>{
+          this.AccList.forEach(x=>{
             if (x.Name === this.payMsg.AccName) {
               id = x.ID;
             }
@@ -1696,7 +1696,7 @@ export default {
         },
         AuditOrRefund(){  // 保存
         // console.log("保存")
-        let that=this;
+         let that=this;
         if(that.Ststus==1){
             if(this.AuditOrRefundMsg.Status=='5'){
                 if(that.GetDetail.AccountNumber.indexOf("东航平台")!=-1){
@@ -1709,9 +1709,6 @@ export default {
                             return;
                         }
                     }
-                    // console.log("benMoney",this.benMoney)
-                    // console.log(parseFloat(that.benMoney) - 5)
-                    // console.log(parseFloat(that.benMoney) + 5)
                 }else{
                     if(this.allMoney!=parseFloat(that.benMoney)){
                         this.Error("请检查实付金额！")

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1982,9 +1982,9 @@
                 <div class="clearfix RL-MARK">
                   <span class="RL-remarkTitle">备注:</span>
                   <p class="RL-redType RL-remarkCon">
-                    <span v-if="childItem.tsIdList&&childItem.tsIdList.length>0">投诉单号：
+                    <span v-if="childItem.TsIdList&&childItem.TsIdList.length>0">投诉单号：
                       <a clas="underline" v-for="ts in childItem.TsIdList" href="javascript:void(0);"
-                        @click="goUrlTS('ComplaintsDetail',ts,childItem.OrderId,'投诉详情')">{{ts}}</a>
+                        @click="goUrlTS('ComplaintsDetail',ts,childItem.OrderId,'投诉详情')">{{ts}} </a>
                       ;</span>
                     <span v-if='childItem.ClientSource==1&&childItem.BrandName!=""'>{{childItem.BrandName}}订单
                       {{childItem.PlatformOrder}};</span>

src/components/activity/TravelInfoList.vue

@@ -9,7 +9,9 @@
 	.user_time_picker .el-date-editor--date>span.el-input__suffix{
 		top:-4px;right: 2px;
 	}
-	.zidingyiFz i{font-size: 14px!important;}
+	.zidingyiFz i{
+        color:#fff;
+        font-size: 14px!important;}
     .TravelInfoList .choose_form .el-form-item{
         display: inline-block;
     }
@@ -117,11 +119,14 @@
 						<el-button type="primary" icon="iconfont icon-nav-xiaoshou" circle @click="Gourl('TravelCoupomPlanList',item)"></el-button>
 					</el-tooltip>
 					<el-tooltip class="item" effect="dark" content="分配销售" placement="top">
-						<el-button type="primary" icon="el-icon-edit" circle @click="Gourl('TravelInfoSalesList',item)"></el-button>
+						<el-button style="background:#5F95E8" icon="iconfont icon-icon-test6" circle @click="Gourl('TravelInfoSalesList',item)"></el-button>
 					</el-tooltip>
 					<el-tooltip class="item" effect="dark" content="删除" placement="top">
 						<el-button @click="Delete(item)" type="danger" class='zidingyiFz' icon="el-icon-delete" circle ></el-button>
 					</el-tooltip>
+                    <el-tooltip class="item" effect="dark" content="取消" placement="top">
+						<el-button @click="Exit(item)" style="background:#62DC9E" class='zidingyiFz' icon="el-icon-document-remove" circle ></el-button>
+					</el-tooltip>
 				</td>
 
 			</tr>
@@ -302,6 +307,24 @@ import moment from "moment"
                     	this.Error(res.data.message)
                     }
                 }, null);
+            },
+            Exit(item){
+                this.$confirm('是否取消该条行程定制信息?', '提示', {
+						confirmButtonText: '确定',
+						cancelButtonText: '取消',
+						type: 'warning'
+					}).then(() => {
+                        this.apiJavaPost("/api/b2b/free/cancelTravelCoupom",{customId:item.customId}, res => {
+                            if (res.data.resultCode === 1) {
+                                this.Success(res.data.message)
+                                this.getList();
+                            } else {
+                            this.Error(res.data.message)
+                            }
+                        }, null);
+					}).catch(() => {
+						
+					});
             },
 			Delete(item){
                 this.$confirm('是否删除该条行程定制信息?', '提示', {

src/components/newTravelmanager/oldTravelGroupControl/TravelDaysTrip_Direct.vue

@@ -348,7 +348,7 @@ export default {
         }
         this.subConfig.DayList.length = this.subConfig.DayNum;
       }
-      console.log("this.sub",this.subConfig);
+ 
     },
 
     //点击往后追加
@@ -697,43 +697,41 @@ export default {
       var FreedomList = [];
       var WarmTipList = [];
       var TitleList = [];
-      // this.subConfig.DayList.forEach((item, dayIndex) => {
-      //   var rank = 1;
-      //   if (item.dayArray != null && item.dayArray.length > 0) {
-      //     item.dayArray.forEach(subItem => {
-      //       subItem.childItem.Rank = rank;
-      //       subItem.childItem.dayNum = item.dayNum;
-      //       subItem.Type = subItem.Type.toString();
-      //       switch (subItem.Type) {
-      //         case this.$tripUtils.TypeKey.traffic:
-      //           TrafficList.push(subItem.childItem);
-      //           break;
-      //         case this.$tripUtils.TypeKey.scenic:
-      //           ScenicList.push(subItem.childItem);
-      //           break;
-      //         case this.$tripUtils.TypeKey.hotel: 
-      //           HotelList.push(subItem.childItem);
-      //           break;
-      //         case this.$tripUtils.TypeKey.dinner:
-      //           DinnerList.push(subItem.childItem);
-      //           break;
-      //         case this.$tripUtils.TypeKey.freedom:
-      //           FreedomList.push(subItem.childItem);
-      //           break;
-      //         case this.$tripUtils.TypeKey.warmtip:
-      //           WarmTipList.push(subItem.childItem);
-      //           break;
-      //         case this.$tripUtils.TypeKey.title:
-      //           TitleList.push(subItem.childItem);
-      //           break;
-      //       }
-      //       rank++;
-      //     });
-      //   }
-      // });
-      this.subConfig.DayList.forEach((item,dayIndex)=>{
-          
-      })
+      this.subConfig.DayList.forEach((item, dayIndex) => {
+        var rank = 1;
+        if (item.dayArray != null && item.dayArray.length > 0) {
+          item.dayArray.forEach(subItem => {
+            subItem.childItem.Rank = rank;
+            subItem.childItem.dayNum = item.dayNum;
+            subItem.Type = subItem.Type.toString();
+            switch (subItem.Type) {
+              case this.$tripUtils.TypeKey.traffic:
+                TrafficList.push(subItem.childItem);
+                break;
+              case this.$tripUtils.TypeKey.scenic:
+                ScenicList.push(subItem.childItem);
+                break;
+              case this.$tripUtils.TypeKey.hotel: 
+                HotelList.push(subItem.childItem);
+                break;
+              case this.$tripUtils.TypeKey.dinner:
+                DinnerList.push(subItem.childItem);
+                break;
+              case this.$tripUtils.TypeKey.freedom:
+                FreedomList.push(subItem.childItem);
+                break;
+              case this.$tripUtils.TypeKey.warmtip:
+                WarmTipList.push(subItem.childItem);
+                break;
+              case this.$tripUtils.TypeKey.title:
+                TitleList.push(subItem.childItem);
+                break;
+            }
+            rank++;
+          });
+        }
+      });
+    
       var obj = {
         RemoveChild: this.subConfig.RemoveChild,
         RemoveImg: this.subConfig.RemoveImg,
@@ -758,9 +756,6 @@ export default {
     //防止首次初始化数据失败
    // this.emitData();
     this.typeArrayList.push(this.$tripUtils.TypeArray[this.$tripUtils.TypeArray.length-1]);
-    // this.getSameJourney();
-
-    console.log(this.subConfig,'subConfigOld');  
   },
   created() {
     if (this.isOpenGroup == undefined) {
@@ -772,10 +767,6 @@ export default {
     getDayNum() {
       return this.subConfig.DayNum;
     },
-    //获取目的地
-    // getCountryId() {
-    //   return this.subArray.CountryID;
-    // },
     getDayList() {
       return this.subConfig.DayList;
     }
@@ -785,16 +776,12 @@ export default {
     getDayNum(newValue, oldValue) {
       this.createLineTrip();
     },
-    //监听目的地国家是否改变
-    // getCountryId(newValue, oldValue) {
-    //   this.createLineTrip();
-    // },
-    // subConfig: {
-    //   handler: function(newValue, oldValue) {
-    //     this.emitData();
-    //   },
-    //   deep: true
-    // }
+    subConfig: {
+      handler: function(newValue, oldValue) {
+        this.emitData();
+      },
+      deep: true
+    }
   }
 };
 </script>
\ No newline at end of file

src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.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>
 
-        <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip" v-if="TeamType==1"
+        <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
           :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice2>
         <div class="btnFixedDiv">
           <div class="toTop" @click="backTop">
@@ -211,7 +211,6 @@
         ) {
           //to do something
         } else {
-          //this.$set(this.FeatureData, "DayList", data);
           this.$refs.TravelFeature.setNewDate(data);
         }
       },
@@ -247,6 +246,7 @@
       //行程回调
       getDaysTrip(tripObj) {
         this.PostDaysTrip = tripObj;
+        console.log("this.PostDaysTrip",this.PostDaysTrip);
       },
       /*获取行程特色内容对象*/
       getFeature(featureObj) {
@@ -267,21 +267,11 @@
           if (this.PostConfig.fileList.length <= 5) {
             this.PostConfig.fileList.push(fileObj);
           }
-
           this.FeatureData.fileList.push(fileObj);
         }
       },
       //提交验证
       submitForm(SaveType) {
-        // let travelConfigVal = this.$refs["TravelConfig"].validateForm();
-        // let travelDaysTripVal = this.$refs["TravelDaysTrip"].validateForm();
-        // if (!travelConfigVal) {
-        //   this.Error("请完善配置信息");
-        // }
-        // if (!travelDaysTripVal) {
-        //   this.Error("请完善行程信息");
-        // }
-        //if (travelConfigVal && travelDaysTripVal) {
         if (this.isSubmit) {
           this.isSubmit = false;
           this.SaveData(SaveType);
@@ -311,7 +301,7 @@
         basicData.RemoveChild = this.PostConfig.RemoveChild;
 
         basicData.TeamType = this.PostConfig.TeamType;
-
+        
         basicData.DayNum = (this.PostDaysTrip && this.PostDaysTrip.DayNum != "") ? this.PostDaysTrip.DayNum : 0;
         basicData.NightNum = (this.PostDaysTrip && this.PostDaysTrip.NightNum != "") ? this.PostDaysTrip.NightNum : 0;
         basicData.StartCityId = (this.PostDaysTrip && this.PostDaysTrip.StartCityId != "") ? this.PostDaysTrip.StartCityId :
@@ -561,15 +551,7 @@
       },
       firstLoadConfigInfo() {
         var routeName = this.$route.name;
-        if(routeName=='TravelManager2'){
-          this.TeamType=0;
-        }
-        if(routeName=='TravelManager3'){
-          this.TeamType=1;
-        }
-        if(routeName=='TravelManager4'){
-          this.TeamType=2;
-        }
+        this.TeamType=1;
         let configId = this.$route.query.configId;
         this.modifyTcid = this.$route.query.tcid;
         this.TCNUM = this.$route.query.TCNUM;

src/components/newTravelmanager/oldTravelGroupControl/dinnerTrip_Direct.vue

@@ -32,7 +32,7 @@
                     </el-select>
                   </el-form-item>
                 </span>
-                <span class="comTravelLeft">套餐</span>
+                <!-- <span class="comTravelLeft">套餐</span>
                 <span>
                   <el-select :disabled="isOpenGroup" class='w160' :placeholder="$t('pub.pleaseSel')" filterable v-model="subItemObj.childItem.MealId"
                     @visible-change="getDinnerMealList($event)" @change="changeDinnerMealList()">
@@ -40,18 +40,18 @@
                     <el-option v-for="item in QDinnerMealList" :label='item.MealName' :value='item.Id' :key='item.Id'>
                     </el-option>
                   </el-select>
-                </span>
+                </span> -->
               </div>
               <div class="TDmealTime">
                 <label class="TDhotelDiner">用餐时段</label>
                 <el-checkbox-group v-model="Diner.UseDinerCked">
-                  <el-checkbox v-for="item in Diner.UseDinnerType" :disabled="isOpenGroup||!varCanChecked(item)" :label="item.Id"
+                  <el-checkbox v-for="item in Diner.UseDinnerType" style="margin-left:5px;" :disabled="isOpenGroup||!varCanChecked(item)" :label="item.Id"
                     :key='item.Id'>{{item.Name}}</el-checkbox>
                 </el-checkbox-group>
                 <span class="comTravelLeft">用餐时间</span>
-                <el-input :disabled="isOpenGroup" type="text" class="w120" v-model="subItemObj.childItem.UseTimeHour"
+                <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeHour"
                   @keyup.native="checkInteger(subItemObj.childItem,'UseTimeHour')"></el-input>&nbsp;&nbsp;小时
-                <el-input :disabled="isOpenGroup" type="text" class="w120" v-model="subItemObj.childItem.UseTimeMinutes"
+                <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.UseTimeMinutes"
                   @keyup.native="checkInteger(subItemObj.childItem,'UseTimeMinutes')"></el-input>&nbsp;&nbsp;分钟
               </div>
             </div>
@@ -186,7 +186,7 @@ export default {
         narrative: true //叙述,
       },
       //是否显示编辑框
-      isShowEdit: false,
+      isShowEdit: true,
       dspNone: false,
       initialIndex: 0,
       //text框placeholder

src/components/newTravelmanager/oldTravelGroupControl/freedomTrip.vue

@@ -119,7 +119,7 @@
           narrative: true //叙述,
         },
         //是否显示编辑框
-        isShowEdit:false,
+        isShowEdit:true,
         dspNone:false,
         initialIndex:0,
         //text框placeholder

src/components/newTravelmanager/oldTravelGroupControl/hotelTrip_Direct.vue

@@ -199,7 +199,7 @@ export default {
       //不选中
       UnCheckedVaule: 0,
       //是否显示编辑框
-      isShowEdit: false,
+      isShowEdit: true,
       //text框placeholder
       placeholder: "请输入酒店信息",
       //酒店含餐

src/components/newTravelmanager/oldTravelGroupControl/scienTrip_Direct.vue

@@ -40,7 +40,7 @@
                 </el-select>
               </el-form-item>
             </span>
-            <span class="comTravelLeft">门票</span>
+            <!-- <span class="comTravelLeft">门票</span>
             <span>
               <el-select :disabled="isOpenGroup" class='w160' filterable :placeholder="$t('pub.pleaseSel')" v-model="subItemObj.childItem.CouponsTicketId"
                 @visible-change="getTicketList($event)" @change="changeTicketList()">
@@ -48,13 +48,13 @@
                 <el-option v-for="item in QTicketList" :label='item.TicketName' :value='item.Id' :key='item.Id'>
                 </el-option>
               </el-select>
-            </span>
+            </span> -->
           </div>
           <div class="TDRightPlan">
             <label class="comTravelLeft">游玩时间</label>
-            <el-input :disabled="isOpenGroup" type="text" class="w120" v-model="subItemObj.childItem.PlayTimeHour"
+            <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeHour"
               @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeHour')" maxlength="2"></el-input>&nbsp;&nbsp;小时
-            <el-input :disabled="isOpenGroup" type="text" class="w120" v-model="subItemObj.childItem.PlayTimeMinutes"
+            <el-input :disabled="isOpenGroup" type="text" class="w60" v-model="subItemObj.childItem.PlayTimeMinutes"
               @keyup.native="checkInteger(subItemObj.childItem,'PlayTimeMinutes')" maxlength="2"></el-input>&nbsp;&nbsp;分钟
           </div>
         </div>
@@ -185,7 +185,7 @@
         QTicketList: [],
         DefaultSelectValue: 0,
         //是否显示编辑框
-        isShowEdit: false,
+        isShowEdit: true,
         dspNone: false,
         initialIndex: 0,
         //text框placeholder

src/components/newTravelmanager/oldTravelGroupControl/titleTrip.vue

@@ -24,7 +24,7 @@
           narrative: true //叙述,
         },
         //是否显示编辑框
-        isShowEdit:false,
+        isShowEdit:true,
         //text框placeholder
         placeholder:'请输入行程大点信息'
       };

src/components/newTravelmanager/oldTravelGroupControl/trifficTrip.vue

@@ -230,7 +230,7 @@ export default {
       //不用车
       UnCheckedVaule: 0,
       //是否显示编辑框
-      isShowEdit: false,
+      isShowEdit: true,
       //text框placeholder
       placeholder: "请输入交通信息",
       //交通验证

src/components/newTravelmanager/oldTravelGroupControl/warmtipTrip.vue

@@ -47,7 +47,7 @@ export default {
         narrative: true //叙述,
       },
       //是否显示编辑框
-      isShowEdit:false,
+      isShowEdit:true,
       //text框placeholder
       placeholder:'请输入提示信息',
     };