提交 e44508dc authored 作者: lidongxu's avatar lidongxu

refactor(promotion): 修改部分时间去掉时分秒,修改上传修改按钮的名字和顺序颜色

同上
上级 33188c76
...@@ -145,19 +145,19 @@ ...@@ -145,19 +145,19 @@
<el-upload class="upload-demo" <el-upload class="upload-demo"
action="#" action="#"
accept=".xls,.xlsx" accept=".xls,.xlsx"
:http-request="uploadChangeFile" :http-request="uploadFile"
:show-file-list="false"> :show-file-list="false">
<template #trigger> <template #trigger>
<el-button type="success">批量修改计划</el-button> <el-button type="primary">{{ cityManagerPrivilege ? '城市经理' : '职能角色' }}-新增计划上传</el-button>
</template> </template>
</el-upload> </el-upload>
<el-upload class="upload-demo" <el-upload class="upload-demo"
action="#" action="#"
accept=".xls,.xlsx" accept=".xls,.xlsx"
:http-request="uploadFile" :http-request="uploadChangeFile"
:show-file-list="false"> :show-file-list="false">
<template #trigger> <template #trigger>
<el-button type="primary">{{ cityManagerPrivilege ? '城市经理' : '职能角色' }}-上传计划</el-button> <el-button type="primary">修改计划上传</el-button>
</template> </template>
</el-upload> </el-upload>
</el-col> </el-col>
...@@ -652,7 +652,9 @@ getPlanList() ...@@ -652,7 +652,9 @@ getPlanList()
const formatter = (row, col, value) => { const formatter = (row, col, value) => {
if (col.property === 'planStatus') { if (col.property === 'planStatus') {
return value == 0 ? '未执行' : '执行' return value == 0 ? '未执行' : '执行'
} else if (col.property === 'modifyTime' || col.property === 'date' || col.property === 'clockInTime' || col.property === 'clockOutTime') { } else if (col.property === 'modifyTime' || col.property === 'date') {
return parseTime(value, '{y}-{m}-{d}')
} else if (col.property === 'clockInTime' || col.property === 'clockOutTime') {
return parseTime(value) return parseTime(value)
} else { } else {
return value return value
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论