|
|
@@ -76,23 +76,13 @@
|
|
|
<el-table-column label="创建人" align="center" prop="createBy" />
|
|
|
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
|
|
<template #default="scope">
|
|
|
-<<<<<<< HEAD
|
|
|
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
-=======
|
|
|
- <!-- <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span> -->
|
|
|
- <span>{{scope.row.createTime}}</span>
|
|
|
->>>>>>> liuqiang
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="更新人" align="center" prop="updateBy" />
|
|
|
<el-table-column label="更新时间" align="center" prop="updateTime" width="180">
|
|
|
<template #default="scope">
|
|
|
-<<<<<<< HEAD
|
|
|
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
-=======
|
|
|
- <!-- <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span> -->
|
|
|
- <span>{{ scope.row.updateTime }}</span>
|
|
|
->>>>>>> liuqiang
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column label="备注" align="center" prop="remark" />
|
