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

src/components/Restaurant/FoodOrder.vue

@@ -133,7 +133,7 @@ export default {
         AirTicketId: 0,
         AirOrderId: 0,
         status: 0,
-        startDate: moment().format("YYYY-MM-DD"),
+        startDate:"",
         endDate: "",
         searchKey:"",
         rbBranchId:-1,

src/components/SalesVisa/VisaProductOrder.vue

@@ -100,6 +100,15 @@
 	                                  </el-option>
 							 </el-select>	  
 					</span></li>
+					<li>	
+				<span>
+						<em>订单状态</em><el-select  v-model='msg.VisaOrderStatus'>   
+							 <el-option label="不限" value="0" key='0'></el-option> 
+							 <el-option label="正常" value="1" key='1'></el-option> 
+							 <el-option label="取消" value="2" key='2'></el-option> 
+							 <el-option label="待付款" value="3" key='3'></el-option> 
+							</el-select>
+					</span></li>
 				<li><span><em>报入日期</em><el-date-picker v-model='msg.StartTime'  class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> -
 			                            <el-date-picker v-model='msg.EndTime'  class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker>
 			            </span>
@@ -171,7 +180,9 @@
 					<span>￥{{moneyFormat(item.ZaiTu)}}</span>
 				</td>
 				<td>
-					{{item.VisaOrderStatus==1?"正常":"已取消"}}</br>
+					<span v-if="item.VisaOrderStatus==1">正常</span>
+					<span v-if="item.VisaOrderStatus==2">取消</span>
+					<span v-if="item.VisaOrderStatus==3">待付款</span>
 					<span class="fz12" v-if="item.VisaOrderStatus==2">操作：{{item.UpdateName}}</span>
 				</td>
 				<td>
@@ -278,6 +289,7 @@ export default {
                 EndTime:'',
                 Pid:'',
 				EmId:'-1',
+				VisaOrderStatus:"0",
             },
 			 dataList:[],
 			 EmployeeList:[],

src/components/scenicSpot/ScenTicketOrder.vue

@@ -71,6 +71,7 @@
           <th>客户信息</th>
           <th>联系人信息</th>
           <th>订单状态</th>
+          <th>创建日期</th>          
           <th>退款状态</th>
         </tr>
         <tr>
@@ -102,6 +103,7 @@
               <span v-if="item.status==2">取消</span>
               <span v-if="item.status==3">待付款</span>
           </td>
+          <td>{{item.createDate}}</td>    
           <td>
               <p v-if="item.RefundStatus!=1">
                   <span v-if="item.RefundStatus==2">退款中</span>
@@ -185,7 +187,7 @@ export default {
         AirTicketId: 0,
         AirOrderId: 0,
         status: 0,
-        startDate: moment().format("YYYY-MM-DD"),
+        startDate: "",
         endDate: "",
         searchKey:"",
         rbBranchId:-1,