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

This commit is contained in:
yanyizhou
2021-09-14 11:20:18 +08:00
@@ -189,7 +189,11 @@
width="110px" width="110px"
label="发布日期"> label="发布日期">
<template slot-scope="scope"> <template slot-scope="scope">
{{ formatIssueDate(scope.row.issueTime) }} <div>
<a>
{{ formatIssueDate(scope.row.issueTime) }}
</a>
</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -199,7 +203,7 @@
label="实施日期"> label="实施日期">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- {{ formatIssueDate(scope.row.putTime) }}--> <!-- {{ 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> </template>
</el-table-column> </el-table-column>
@@ -209,7 +213,7 @@
width="150px" width="150px"
label="新车型实施日期"> label="新车型实施日期">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -218,7 +222,7 @@
width="150px" width="150px"
label="在产车实施日期"> label="在产车实施日期">
<template slot-scope="scope"> <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> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
@@ -232,7 +236,7 @@
<!-- </el-tooltip>--> <!-- </el-tooltip>-->
<!-- </template>--> <!-- </template>-->
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span> <a>{{ textStatusMap[scope.row.textStatus] }}</a>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right"> <el-table-column label="操作" align="center" width="50" fixed="right">