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

This commit is contained in:
zhaokaiyao@91isoft.com
2021-09-29 17:19:48 +08:00
@@ -101,7 +101,7 @@
<el-popover trigger="hover" placement="top">
{{scope.row.institutionName}}
<div slot="reference" class="name-wrapper">
<p v-if="scope.row.institutionName ==null || scope.row.institutionName.length<15">
<p v-if="!scope.row.institutionName || scope.row.institutionName.length<15">
{{scope.row.institutionName}}
</p>
<p v-else> {{scope.row.institutionName.substring(0,15)}}...</p>
@@ -116,7 +116,7 @@
<el-popover trigger="hover" placement="top">
{{scope.row.NameList}}
<div slot="reference" class="name-wrapper">
<p v-if="scope.row.institutionName ==null ||scope.row.NameList.length<15">
<p v-if="!scope.row.institutionName ||scope.row.NameList.length<15">
{{scope.row.NameList}}
</p>
<p v-else> {{scope.row.NameList.substring(0,15)}}...</p>