Commit 431497c2 authored by dragondean@qq.com's avatar dragondean@qq.com

小bug

parent d097dc8f
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
<el-dialog :title="$t('延期活动时间')" :visible="!!updateEndtimeItem" :before-close="() => updateEndtimeItem=null"> <el-dialog :title="$t('延期活动时间')" :visible="!!updateEndtimeItem" :before-close="() => updateEndtimeItem=null">
<div v-if="updateEndtimeItem"> <div v-if="updateEndtimeItem">
{{$t('优惠活动“{name}”的当前结束时间:{time}',{ {{$t('优惠活动“{name}”的当前结束时间:{time}',{
name: updateEndtimeItem.name, name: $l(updateEndtimeItem, 'title'),
time: updateEndtimeItem.endTime || $t('永久有效') time: updateEndtimeItem.endTime || $t('永久有效')
})}} })}}
</div> </div>
......
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
@keyup.enter.native="handleQuery" clearable /> @keyup.enter.native="handleQuery" clearable />
</el-form-item> </el-form-item>
<el-form-item :label="$t('审核状态')" prop="status"> <el-form-item :label="$t('审核状态')" prop="status">
<dict-selector :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE" v-model="queryParams.auditResult" <dict-selector :type="DICT_TYPE.ECW_ORDER_APPROVAL_TYPE" v-model="queryParams.auditType"
@keyup.enter.native="handleQuery" clearable /> @keyup.enter.native="handleQuery" clearable />
</el-form-item> </el-form-item>
...@@ -597,11 +597,11 @@ export default { ...@@ -597,11 +597,11 @@ export default {
if(!this.ids.length){ if(!this.ids.length){
return this.$message.error(this.$t('请勾选需要导出的订单')) return this.$message.error(this.$t('请勾选需要导出的订单'))
} }
return this.exportExcel(exportOrderExcel, {orderIdList: this.ids}) return this.exportExcel(exportOrderExcel, {orderIdList: this.ids}, this.$t("导出勾选"))
}, },
// 导出搜索 // 导出搜索
exportSearch(){ exportSearch(){
return this.exportExcel(exportOrderExcel, this.combinedQueryParams) return this.exportExcel(exportOrderExcel, this.combinedQueryParams, this.$t("导出搜索"))
}, },
// 通用导出函数 // 通用导出函数
exportExcel(func, params, fileName = null){ exportExcel(func, params, fileName = null){
......
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