|
|
|
|
@ -34,8 +34,8 @@
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div v-else-if="column.type=='dateRange'">
|
|
|
|
|
{{dateRange}}
|
|
|
|
|
<!-- {{scope.row["start_time"]+"-"+changeEndTime(scope.row["end_time"])}} -->
|
|
|
|
|
<!-- {{dateRange}} -->
|
|
|
|
|
{{scope.row["start_time"]+"-"+changeEndTime(scope.row["end_time"])}}
|
|
|
|
|
</div>
|
|
|
|
|
<div v-else-if="column.type=='status'">
|
|
|
|
|
<el-tag v-if="scope.row['status']==1" type="" effect="dark">
|
|
|
|
|
@ -168,6 +168,7 @@
|
|
|
|
|
style="width:100%"
|
|
|
|
|
v-model="dateRange"
|
|
|
|
|
type="datetimerange"
|
|
|
|
|
value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
|
range-separator="至"
|
|
|
|
|
start-placeholder="活动开始日期"
|
|
|
|
|
end-placeholder="活动结束日期">
|
|
|
|
|
|