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

src/components/myOrdersAllType/components/allList.vue

@@ -177,9 +177,9 @@
                   </span>
                 </li>
 
-                <li v-if="Title!='审核'">
+                <li v-if="Title!='申请'&&Title!='审核'">
                   <span>
-                    <em>{{Title=='申请'?'出发时间':'报名时间'}}</em>
+                    <em>报名时间</em>
                     <el-date-picker
                       style="height: 34px;"
                       value-format="yyyy-MM-dd"
@@ -191,6 +191,20 @@
                       </el-date-picker>
                   </span>
                 </li>
+                <li v-if="Title=='申请'">
+                  <span>
+                    <em>出发时间</em>
+                    <el-date-picker
+                      style="height: 34px;"
+                      value-format="yyyy-MM-dd"
+                      v-model="DatelistUse"
+                      type="daterange"
+                      :range-separator="$t('OrderList.zhi')"
+                      :start-placeholder="$t('OrderList.star')"
+                      :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
+                      </el-date-picker>
+                  </span>
+                </li>
                 <li style="line-height: 30px; padding-left: 30px;" v-if="Title!='申请'&&Title!='审核'">
                   <el-popover width="350" trigger="click">
                     <div class="groupSuperSearchLayer">
@@ -539,10 +553,11 @@
           getDatesBM(){
             if(this.DatelistBM){
               this.msg.StartTime = this.DatelistBM[0]
-              this.msg.EndTime = this.DatelistBM[1]
+                this.msg.EndTime = this.DatelistBM[1]
+
             }if(!this.DatelistBM){
               this.msg.StartTime	= ''
-              this.msg.EndTime	 = ''
+                this.msg.EndTime	 = ''
             }
           },
           getDatesUse(){
@@ -687,7 +702,7 @@
             this.msg.DepartETime = [year,month,monthLast].join('-');
             // this.msg.DepartSTime = this.getBeforeDate(200, new Date())
             // this.msg.DepartETime = this.getBeforeDate(0, new Date())
-            this.DatelistBM = [this.msg.DepartSTime,this.msg.DepartETime]
+            this.DatelistUse = [this.msg.DepartSTime,this.msg.DepartETime]
             this.msg.Q_IsCollect = '2'
           }