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

This commit is contained in:
zhaokaiyao@91isoft.com
2021-11-29 09:58:22 +08:00
3 changed files with 14 additions and 38 deletions
@@ -14,6 +14,7 @@
:data="standardReleaseList"
tooltip-effect="dark"
border
style="cursor:pointer;"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
style="width: 100%">
<el-table-column
@@ -14,6 +14,7 @@
:data="domesticDynamics"
tooltip-effect="dark"
border
style="cursor:pointer;"
:header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
style="width: 100%">
<el-table-column
@@ -155,71 +155,45 @@
align="center">
</el-table-column>
<el-table-column
width="150px"
width="180px"
align="center"
prop="projectNumber"
prop="productId"
label="项目编号">
</el-table-column>
<el-table-column
width="150px"
width="180px"
align="center"
prop="projectName"
prop="productName"
label="项目名称">
</el-table-column>
<el-table-column
width="110px"
align="center"
prop="projectGroup"
label="项目群">
</el-table-column>
<el-table-column
width="110px"
align="center"
prop="productLine"
prop="productLineId"
label="产品线">
</el-table-column>
<el-table-column
width="110px"
align="center"
width="110"
prop="uname"
label="产品线责任人">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standNumber"
label="标准编号">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standName"
label="标准名称">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="standardItem"
label="条款号">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop="clauseName"
label="条款名称">
</el-table-column>
<el-table-column
width="150px"
align="center"
prop=""
label="合规评估结果">
<template slot-scope="scope">
<el-button @click="changeState(scope.row)">符合性状态</el-button>
<!-- <div class="table-jump" @click="changeState(scope.row)">-->
<!-- <div v-if="scope.row.sarState === 1">符合</div>-->
<!-- <div v-if="scope.row.sarState === 2">不符合</div>-->
<!-- <div v-if="scope.row.sarState === 3"></div>-->
<!-- </div>-->
<!-- <el-button @click="changeState(scope.row)">符合性状态</el-button>-->
<div class="table-jump" @click="changeState(scope.row)">
<div v-if="scope.row.sarState === 1">符合</div>
<div v-if="scope.row.sarState === 2">不符合</div>
<div v-if="scope.row.sarState === 3"></div>
</div>
</template>
</el-table-column>
</el-table>