Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
zhutianqi
2021-08-03 14:49:16 +08:00
4 changed files with 79 additions and 62 deletions
@@ -189,6 +189,16 @@
{{ formatIssueDate(scope.row.issueTime) }}
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
sortable="putTime"
width="150px"
label="实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
prop="XCXSSRQ"
sortable="custom"