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

src/components/SalesVisa/VisaProductEditOrder.vue

@@ -118,6 +118,7 @@
 				<th width="8%">平台税金</th>
 				<th width="8%">预计提成</th>
 				<th width="8%">报名日期</th>
+				<th width="8%">状态</th>
 				<th width="10%">操作</th>
 			</tr>
 			<tbody v-for='item in dataList'>
@@ -143,6 +144,7 @@
 					<span class="peopleNum">￥{{moneyFormat(item.commission)}}</span>
 				</td>
 				<td>{{item.createTime}}</td>
+				<td>{{item.visaOrderStatus==1?"正常":"取消"}}</td>
 				   <td class="groupTourOrderIcon">
 				   	<el-button-group>
 					    <el-tooltip   v-if="item.income<=0&&item.visaOrderStatus==1&&item.visaStatus==1" class="item" effect="dark" content="修改" placement="top-start">
@@ -162,7 +164,7 @@
 					   
 			</tr>
 			<tr>
-				<td colspan="11" class="RL_Order" style="height:40px;">
+				<td colspan="12" class="RL_Order" style="height:40px;">
 				<span class="VD-remarkTitle">名单:</span>
 				<span class="VD-redType VD-remarkCon" v-if="item.guestList.length>0">
 					<span v-for="(childItem) in item.guestList" style="margin-right:10px;">{{childItem.userName}}</span>
@@ -173,7 +175,7 @@
 				</td>
           </tr>
 			<tr>
-				<td colspan="7" class="groupTourOrder_remarks" style="height: 40px;">
+				<td colspan="8" class="groupTourOrder_remarks" style="height: 40px;">
 					<div>
 						<div>
 							<span class="VD-remarkTitle">备注：</span>
@@ -181,7 +183,7 @@
 						</div>
 					</div>
 				</td>
-					<td colspan="7" class="groupTourOrder_tickets" style="height: 40px;">
+					<td colspan="8" class="groupTourOrder_tickets" style="height: 40px;">
 						<div>
 							<div>
 								<span>财务单据：</span>
@@ -197,7 +199,7 @@
 			</tr>
 			</tbody>
 			<tr v-show="dataList.length==0">
-					<td v-show="dataList.length==0" colspan="7" align="center">暂无数据</td>
+					<td v-show="dataList.length==0" colspan="12" align="center">暂无数据</td>
 			</tr>
 		</table>
      

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -927,12 +927,12 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="商务舱" prop="ESeatNum">
-              <el-input v-model='addMsg.ESeatNum' @keyup.native="checkInteger(addMsg,'ESeatNum')"></el-input>
+              <el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="头等舱" prop="FSeatNum">
-              <el-input v-model='addMsg.FSeatNum' @keyup.native="checkInteger(addMsg,'FSeatNum')"></el-input>
+              <el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -1198,12 +1198,12 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label="商务舱" prop="ESeatNum">
-              <el-input v-model='addMsg.ESeatNum' @keyup.native="checkInteger(addMsg,'ESeatNum')"></el-input>
+              <el-input v-model='addMsg.ESeatNum' :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">
             <el-form-item label="头等舱" prop="FSeatNum">
-              <el-input v-model='addMsg.FSeatNum' @keyup.native="checkInteger(addMsg,'FSeatNum')"></el-input>
+              <el-input v-model='addMsg.FSeatNum' :disabled="true"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="4">

src/components/newTravelmanager/TravelGroupControl/TravelTemp/travelFeature3.vue

@@ -1410,9 +1410,9 @@
         }
         let json = this.FeatureData.FeatureHtmlJson ? JSON.parse(JSON.stringify(this.FeatureData.FeatureHtmlJson)) : '';
         // console.log("jsonjsonjson",json)
-        this.hotelObj.title = json.hotelObj.title.first ? json.hotelObj.title : this.hotelObj.title;
-        this.restaurantObj.title = json.restaurantObj.title ? json.restaurantObj.title : this.restaurantObj.title;
-        this.viewSpotObj.title = json.viewSpotObj.title ? json.viewSpotObj.title : this.viewSpotObj.title;
+        this.hotelObj.title = json.hotelObj ? json.hotelObj.title : this.hotelObj.title;
+        this.restaurantObj.title = json.restaurantObj ? json.restaurantObj.title : this.restaurantObj.title;
+        this.viewSpotObj.title = json.viewSpotObj ? json.viewSpotObj.title : this.viewSpotObj.title;
       },
       // 酒店图片拖拽
       onHotelDragstop(x,y){

src/components/newTravelmanager/TravelTripPreview/threedayList.vue

@@ -253,11 +253,15 @@
 
     },
     created() {
-        this.scenicArray.forEach(x=>{
-            if(!x.ScenicJson){
-                x.ScenicJson={ x:0, y:0 };
-            }
-        });
+        // this.scenicArray.forEach(x=>{
+        //     if(!x.ScenicJson){
+        //         x.ScenicJson= x.ScenicJsonStr ? JSON{ x:0, y:0 };
+        //     }
+        // });
+      this.scenicArray.forEach(x=>{
+        x.ScenicJson = typeof(x.ScenicJsonStr) === 'string' ? JSON.parse(x.ScenicJsonStr) : { x:0, y:0 };
+        console.log(typeof(x.ScenicJsonStr) === 'string')
+      })
     },
     components: {
       DMCchooseImg,

src/components/newTravelmanager/travelLineTrip/travelDaysTrip.vue

@@ -301,6 +301,9 @@
     methods: {
       //非直采切换
       NoDirectScenicCheck(number) {
+        // this.dayObj.ScenicArray.forEach(x=>{
+        //   x.ScenicJson = x.ScenicJsonStr ? JSON.parse(x.ScenicJsonStr) : { x:0, y:0 };
+        // })
         if (this.dayObj.ScenicArray == null) {
           this.dayObj.ScenicArray = [];
         }