所有类型订单 申请订单页调整

src/components/myOrdersAllType/components/OrderList.vue

@@ -644,7 +644,7 @@ export default {
 
       if (row.OrderType == 1) {
         if (
-          this.pagesTitle == "销售" ||
+          this.pagesTitle == "销售"|| this.pagesTitle == "申请" ||
           (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)
         ) {
           data[0].path = "myCustomerOrderAllType";
@@ -662,7 +662,7 @@ export default {
         let name = "";
         if (row.OrderType == 6) {
           if (
-            this.pagesTitle == "销售" ||
+            this.pagesTitle == "销售"|| this.pagesTitle == "申请" ||
             (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)
           ) {
             name = "VisaProductEditOrder";
@@ -675,7 +675,7 @@ export default {
         } else if (row.OrderType == 2) {
           //跟团 一日游
           if (
-            this.pagesTitle == "销售" ||
+            this.pagesTitle == "销售"|| this.pagesTitle == "申请" ||
             (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)
           ) {
             if (row.IsOneDayOrder == 1) {
@@ -689,7 +689,7 @@ export default {
         } else if (row.OrderType == 3) {
           //酒店
           if (
-            this.pagesTitle == "销售" ||
+            this.pagesTitle == "销售"|| this.pagesTitle == "申请" ||
             (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)
           ) {
             name = "singleProductHotelOrder";
@@ -699,7 +699,7 @@ export default {
         } else if (row.OrderType == 4) {
           //门票
           if (
-            this.pagesTitle == "销售" ||
+            this.pagesTitle == "销售"|| this.pagesTitle == "申请" ||
             (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)
           ) {
             name = "SingleticketOrderList";
@@ -711,7 +711,7 @@ export default {
           if (row.CarType == "" || row.CarType == null) {
             this.GetAdminCarOrderPageList(row, url, href, data);
           } else {
-            if (this.pagesTitle == "销售") {
+            if (this.pagesTitle == "销售"|| this.pagesTitle == "申请") {
               name = "CharterOrderList";
             } else {
               name = "CharterOrderListOP";
@@ -768,7 +768,7 @@ export default {
             OrderType = pageData[0].OrderType;
           }
           if (
-            this.pagesTitle == "销售" ||
+            this.pagesTitle == "销售"||this.pagesTitle == "申请" ||
             (!this.S_CheckBranchOrder && !this.S_CheckAllOrder)
           ) {
             name = "CharterOrderList";

src/components/myOrdersAllType/components/allList.vue

@@ -177,10 +177,9 @@
                   </span>
                 </li>
 
-
                 <li v-if="Title!='审核'">
                   <span>
-                    <em>报名时间</em>
+                    <em>{{Title=='申请'?'出发时间':'报名时间'}}</em>
                     <el-date-picker
                       style="height: 34px;"
                       value-format="yyyy-MM-dd"
@@ -676,8 +675,14 @@
             this.msg.EndTime = this.getBeforeDate(0, new Date())
             this.DatelistBM = [new Date(this.msg.StartTime),new Date()]
           }else{
-            this.msg.DepartSTime = this.getBeforeDate(200, new Date())
-            this.msg.DepartETime = this.getBeforeDate(0, new Date())
+            var now = new Date();
+            var month = now.getMonth();//js获取到的是月份是 0-11 所以要加1
+            var year = now.getFullYear();
+            var nextMonthFirstDay = new Date([year,month + 1,1].join('-')).getTime();
+            var oneDay = 1000 * 24 * 60 * 60;
+            var monthLast = new Date(nextMonthFirstDay - oneDay).getDate()
+            this.msg.DepartSTime = [year,month,1].join('-');
+            this.msg.DepartETime = [year,month,monthLast].join('-');
             this.DatelistBM = [this.msg.DepartSTime,this.msg.DepartETime]
             this.msg.Q_IsCollect = '2'
           }