Commit 41ded704 by caoyanzhi

Merge branch 'bugfix/迭代bug'

parents fd50a24b da3f76f6
...@@ -53,9 +53,9 @@ ...@@ -53,9 +53,9 @@
<el-table-column prop="" label="状态" show-overflow-tooltip> <el-table-column prop="" label="状态" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.effectiveStatus == '1' ? '有效' : '失效' }}</template> <template slot-scope="scope">{{ scope.row.effectiveStatus == '1' ? '有效' : '失效' }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="覆盖人数" show-overflow-tooltip> <!-- <el-table-column prop="" label="覆盖人数" show-overflow-tooltip>
<template slot-scope="scope">{{ scope.row.memberCount || 0 }}人</template> <template slot-scope="scope">{{ scope.row.memberCount || 0 }}人</template>
</el-table-column> </el-table-column> -->
<el-table-column prop="" label="到期时间" show-overflow-tooltip> <el-table-column prop="" label="到期时间" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="line-18">{{ scope.row.effectiveDate | timeStampToYmd }}</div> <div class="line-18">{{ scope.row.effectiveDate | timeStampToYmd }}</div>
......
...@@ -388,8 +388,8 @@ export default { ...@@ -388,8 +388,8 @@ export default {
title: this.conditionObj.title title: this.conditionObj.title
}; };
if (Array.isArray(this.conditionObj.date) && this.conditionObj.date.length == 2) { if (Array.isArray(this.conditionObj.date) && this.conditionObj.date.length == 2) {
para.createTimeStart = `${this.conditionObj.date[0]} 00:00:00`; para.createTimeStart = this.conditionObj.date[0];
para.createTimeEnd = `${this.conditionObj.date[1]} 23:59:59`; para.createTimeEnd = this.conditionObj.date[1];
} }
postExcel('/haoban-app-tel-task-three-web/task/export-store-view-clerk-list', para) postExcel('/haoban-app-tel-task-three-web/task/export-store-view-clerk-list', para)
.then(res => { .then(res => {
......
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