Commit 6ff5d4d3 authored by youjie's avatar youjie

no message

parent f483e6dc
...@@ -177,9 +177,9 @@ ...@@ -177,9 +177,9 @@
</span> </span>
</li> </li>
<li v-if="Title!='审核'"> <li v-if="Title!='申请'&&Title!='审核'">
<span> <span>
<em>{{Title=='申请'?'出发时间':'报名时间'}}</em> <em>报名时间</em>
<el-date-picker <el-date-picker
style="height: 34px;" style="height: 34px;"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
...@@ -191,6 +191,20 @@ ...@@ -191,6 +191,20 @@
</el-date-picker> </el-date-picker>
</span> </span>
</li> </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!='审核'"> <li style="line-height: 30px; padding-left: 30px;" v-if="Title!='申请'&&Title!='审核'">
<el-popover width="350" trigger="click"> <el-popover width="350" trigger="click">
<div class="groupSuperSearchLayer"> <div class="groupSuperSearchLayer">
...@@ -538,22 +552,12 @@ ...@@ -538,22 +552,12 @@
}, },
getDatesBM(){ getDatesBM(){
if(this.DatelistBM){ if(this.DatelistBM){
if(this.Title=='申请'){ this.msg.StartTime = this.DatelistBM[0]
this.msg.DepartSTime = this.DatelistBM[0]
this.msg.DepartETime = this.DatelistBM[1]
}else{
this.msg.StartTime = this.DatelistBM[0]
this.msg.EndTime = this.DatelistBM[1] this.msg.EndTime = this.DatelistBM[1]
}
}if(!this.DatelistBM){ }if(!this.DatelistBM){
if(this.Title=='申请'){ this.msg.StartTime = ''
this.msg.DepartSTime = ''
this.msg.DepartETime = ''
}else{
this.msg.StartTime = ''
this.msg.EndTime = '' this.msg.EndTime = ''
}
} }
}, },
getDatesUse(){ getDatesUse(){
...@@ -698,7 +702,7 @@ ...@@ -698,7 +702,7 @@
this.msg.DepartETime = [year,month,monthLast].join('-'); this.msg.DepartETime = [year,month,monthLast].join('-');
// this.msg.DepartSTime = this.getBeforeDate(200, new Date()) // this.msg.DepartSTime = this.getBeforeDate(200, new Date())
// this.msg.DepartETime = this.getBeforeDate(0, 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' this.msg.Q_IsCollect = '2'
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment