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

src/components/TravelManager/TravelGroupControl/AuditDan.vue

@@ -72,7 +72,7 @@
     </el-tabs>
     <div class="commonContent" v-loading="loading">
       <ul class="_content">
-        <li v-for="item in dataList" :key="item.subCode" :data-id='item.ID'>
+        <li v-for="item in dataList" :key="item.subCode" :data-id='item.ID' style="padding:0 15px;">
           <div class="Audit_left" style="width:80px">
             <div>
                 <el-tooltip popper-class="max-w250" effect="dark" :content="item.ID" placement="top-start">
@@ -155,7 +155,7 @@
             </div>
           </div>
           <div class="_rightAudit">
-            <div class="AuditUserInfo clearfix aa">
+            <div class="AuditUserInfo clearfix aa" style="width:165px;">
               <div class="AuditDanHeader">
                 <img v-if="item.CreateUserPhoto" :src="item.CreateUserPhoto" alt="">
                 <img v-else src="../../../assets/img/default_head_img.jpg" alt="">

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -95,7 +95,7 @@
     </div>
     <div class="commonContent" v-loading="loading">
       <ul class="_content">
-        <li v-for="item in dataList" :key="item.subCode" :data-id="item.ID">
+        <li v-for="item in dataList" :key="item.subCode" :data-id="item.ID" style="padding:0 10px;">
           <div class="_left" style="padding:0;flex:0.3;display:flex;">
             <div class="QT_CodeNum">
               {{$t('hotel.hotel_SerialNumber')}}：{{item.ID}}

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -150,7 +150,7 @@
           IsOpenHotel: 0, //0可以添加删除酒店，1-不能修改酒店信息
           DayNum: 0, //行程天数
           OfferId: 0, //报价单Id
-          OpenState:2,//1-已开团，2-未开团
+          OpenState: 2, //1-已开团，2-未开团
         },
         //行程
         FeatureData: {
@@ -347,7 +347,7 @@
         basicData.IsDirect = this.PostConfig.IsDirect;
         basicData.OpenTeamDescribe = this.PostConfig.OpenTeamDescribe;
         basicData.RemoveChild = this.PostConfig.RemoveChild;
-        basicData.OfferId=this.PostConfig.OfferId;
+        basicData.OfferId = this.PostConfig.OfferId;
 
         basicData.TeamType = this.PostConfig.TeamType;
 
@@ -735,13 +735,15 @@
                 this.PostConfig.IsDirect = tempData.IsDirect;
                 this.PostConfig.PriceIsDirect = tempData.PriceIsDirect;
                 this.PostConfig.OfferId = tempData.OfferId;
-                this.PostConfig.OpenState=tempData.OpenState;
                 if (this.$route.query.offerId) {
                   this.PostConfig.OfferId = this.$route.query.offerId;
                 }
+                this.PostConfig.OpenState = tempData.OpenState;
                 if (this.$route.query.openState) {
                   this.PostConfig.OpenState = this.$route.query.openState;
-                }   
+                }
+
+
 
                 //是否有报价单
                 this.IsHaveOffer = tempData.IsHaveOffer;
@@ -783,8 +785,8 @@
                 this.UseTypeArray = tempData.UseTypeArray;
                 this.AirPickUp = tempData.AirPickUp;
                 this.AirSend = tempData.AirSend;
-                this.PostConfig.OpenState = thtempData.OpenState;
-                if(this)
+
+
                 this.PostConfig.PDFAlias = tempData.PDFAlias;
               } else {
                 this.Error(res.data.message);