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

This commit is contained in:
zhaokaiyao@91isoft.com
2021-09-03 13:53:36 +08:00
5 changed files with 178 additions and 59 deletions
@@ -298,7 +298,6 @@
show-overflow-tooltip
prop="standName"
label="中文名称"
width="180px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
@@ -308,7 +307,6 @@
show-overflow-tooltip
prop="standEnName"
label="英文名称"
width="180px"
>
<template slot-scope="scope">
<a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standEnName }}</a>
@@ -353,10 +351,8 @@
{{scope.row.standStatusShow}}
</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="50" fixed="right">
<el-table-column label="操作" align="center" width="80">
<template slot-scope="scope">
<div @click.stop style="display: inline-block">
<el-dropdown trigger="click" @command="handleCommand">