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

This commit is contained in:
super_liu
2022-04-14 15:22:55 +08:00
2 changed files with 56 additions and 54 deletions
+1 -1
View File
@@ -14,7 +14,7 @@
} }
.el-drawer__body{ .el-drawer__body{
height: 100%; height: 100%;
overflow-y: auto; //overflow-y: auto;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
// 底部带 提交、取消按钮 // 底部带 提交、取消按钮
@@ -291,61 +291,63 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<el-table <div style="height: calc(100% - 65px); overflow: auto">
:data="sarAccessListDatas" <el-table
tooltip-effect="dark" :data="sarAccessListDatas"
style="width: 100%" tooltip-effect="dark"
border style="width: 100%"
class="table-height" border
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px', height="100%"
:header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
fontWeight: 'bold', height: '48px'}" fontWeight: 'bold', height: '48px'}"
@selection-change="selectListChange" @selection-change="selectListChange"
ref="selection" ref="selection"
>
<el-table-column
type="selection"
width="55"
align="center">
</el-table-column>
<el-table-column
prop="code"
align="center"
label="标准号">
<template slot-scope="scope">
<a v-if="scope.row.standYear" class="table-jump"
@click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
}}-{{ scope.row.standYear }}</a>
<a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
{{ scope.row.standNumber }}</a>
</template>
</el-table-column>
<el-table-column
prop="standName"
label="标准名称"
align="center"
min-width="280"
> >
<template slot-scope="scope"> <el-table-column
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a> type="selection"
</template> width="55"
</el-table-column> align="center">
<el-table-column </el-table-column>
prop="issueTime" <el-table-column
label="发布日期"> prop="code"
<template slot-scope="scope"> align="center"
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span> label="标准号">
</template> <template slot-scope="scope">
</el-table-column> <a v-if="scope.row.standYear" class="table-jump"
<el-table-column @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber
align="center" }}-{{ scope.row.standYear }}</a>
show-overflow-tooltip <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }}
prop="textStatus" {{ scope.row.standNumber }}</a>
label="文本状态"> </template>
<template slot-scope="scope"> </el-table-column>
<span>{{ textStatusMap[scope.row.textStatus] }}</span> <el-table-column
</template> prop="standName"
</el-table-column> label="标准名称"
</el-table> align="center"
min-width="280"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
</template>
</el-table-column>
<el-table-column
prop="issueTime"
label="发布日期">
<template slot-scope="scope">
<span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
</template>
</el-table-column>
<el-table-column
align="center"
show-overflow-tooltip
prop="textStatus"
label="文本状态">
<template slot-scope="scope">
<span>{{ textStatusMap[scope.row.textStatus] }}</span>
</template>
</el-table-column>
</el-table>
</div>
</div> </div>
<pagination <pagination
:page="page" :page="page"