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

This commit is contained in:
zhutianqi
2021-12-05 18:13:40 +08:00
72 changed files with 40617 additions and 860 deletions
@@ -1061,7 +1061,6 @@
@selection-change="selectConfigStandChange">
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
@@ -1076,14 +1075,14 @@
<el-table-column
prop="standName"
label="标准名称"
width="200"
width="500"
align="center">
</el-table-column>
<el-table-column
prop="issueTime"
label="发布日期"
sortable="custom"
width="200"
width="120"
align="center">
<template slot-scope="scope">
{{ formatIssueDate(scope.row.issueTime) }}
@@ -1093,7 +1092,7 @@
prop="XCXSSRQ"
label="实施日期"
sortable="custom"
width="200"
width="120"
align="center">
<template slot-scope="scope">
<span>{{ formatText(scope.row.XCXSSRQ) }}</span>
@@ -1102,7 +1101,7 @@
<el-table-column
prop="textStatus"
label="文本状态"
width="200"
width="100"
align="center">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>