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

This commit is contained in:
zhaokaiyao@91isoft.com
2021-09-15 09:45:03 +08:00
60 changed files with 2473 additions and 159 deletions
@@ -191,7 +191,11 @@
width="110"
label="发布日期">
<template slot-scope="scope">
{{ formatIssueDate(scope.row.issueTime) }}
<div>
<a>
{{ formatIssueDate(scope.row.issueTime) }}
</a>
</div>
</template>
</el-table-column>
<el-table-column
@@ -201,7 +205,7 @@
label="实施日期">
<template slot-scope="scope">
<!-- {{ formatIssueDate(scope.row.putTime) }}-->
<span>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</span>
<a>{{ scope.row.SSRQ ? scope.row.SSRQ.substring(0,10) : '-' }}</a>
</template>
</el-table-column>
@@ -211,7 +215,7 @@
width="150"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
<a>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</a>
</template>
</el-table-column>
<el-table-column
@@ -220,7 +224,7 @@
width="150px"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
<a>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</a>
</template>
</el-table-column>
<el-table-column
@@ -234,7 +238,7 @@
<!-- </el-tooltip>-->
<!-- </template>-->
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
<a>{{ textStatusMap[scope.row.textStatus] }}</a>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right">