Commit bd0fef39 authored by chenwei's avatar chenwei

Merge branch 'feature/099_customer_filter' into 'dev'

礼品操作时间支持到天

See merge request !4
parents 960a90c9 a2c56020
......@@ -104,7 +104,7 @@
<el-form-item :label="$t('活动时间')" prop="dateRangeCreateTime">
<el-date-picker
:disabled="isDisable"
type="datetimerange"
type="daterange"
clearable
placement="bottom-start"
v-model="queryParams.dateRangeCreateTime"
......
......@@ -162,14 +162,14 @@
>
</template>
</el-table-column>
<el-table-column width="160" :label="$t('开始日期')">
<el-table-column width="100" :label="$t('开始日期')">
<template v-slot="{ row }">
{{ parseTime(row.createTime) || "/" }}
{{ parseTime(row.createTime, "{y}-{m}-{d}") || "/" }}
</template>
</el-table-column>
<el-table-column width="160" :label="$t('结束日期')">
<el-table-column width="100" :label="$t('结束日期')">
<template v-slot="{ row }">
{{ parseTime(row.endTime) || "/" }}
{{ parseTime(row.endTime, "{y}-{m}-{d}") || "/" }}
</template>
</el-table-column>
<el-table-column
......
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