Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
@@ -970,7 +970,7 @@
|
|||||||
.bzjdStep3 {
|
.bzjdStep3 {
|
||||||
.itemsTextBox {
|
.itemsTextBox {
|
||||||
min-height: 300px;
|
min-height: 300px;
|
||||||
max-height: 500px;
|
max-height: 835px;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
line-height: 20px;
|
line-height: 20px;
|
||||||
/deep/ td {
|
/deep/ td {
|
||||||
|
|||||||
@@ -316,7 +316,7 @@
|
|||||||
<el-table-column
|
<el-table-column
|
||||||
prop="createTime"
|
prop="createTime"
|
||||||
label="创建时间"
|
label="创建时间"
|
||||||
align="center"
|
align="center">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
|
<span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
Reference in New Issue
Block a user