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

This commit is contained in:
super_liu
2021-07-27 14:39:29 +08:00
13 changed files with 610 additions and 635 deletions
@@ -188,22 +188,21 @@
</template>
</el-table-column>
<el-table-column
prop="xcxssrq"
prop="XCXSSRQ"
sortable="custom"
width="150px"
label="新车型实施日期">
<template slot-scope="scope">
<span>{{ formatText(scope.row.XCXSSRQ) }}</span>
<span>{{ scope.row.XCXSSRQ ? scope.row.XCXSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
prop="zccssrq"
prop="ZCCSSRQ"
sortable="custom"
width="150px"
label="在产车实施日期">
<template slot-scope="scope">
<span>{{ formatText(scope.row.ZCCSSRQ) }}</span>
<span>{{ scope.row.ZCCSSRQ ? scope.row.ZCCSSRQ.substring(0,10) : '-' }}</span>
</template>
</el-table-column>
<el-table-column
@@ -2516,7 +2515,6 @@ export default {
console.log(item, 'itemitemitemitem')
const formFieldList = this.formFieldList
this.sarStandardsInfoEO = JSON.parse(JSON.stringify(item))
console.log(item.attrInfoCaseMap, 'gggg大大大滴滴答答')
if(this.sarStandardsInfoEO.standSystem){
this.defaultCheckedKeys = [this.sarStandardsInfoEO.standSystem];
}