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

This commit is contained in:
yanyizhou
2021-11-19 09:49:48 +08:00
3 changed files with 4 additions and 3 deletions
+1
View File
@@ -11,6 +11,7 @@
ref="attributeEO"
class="label-input-form"
:inline="true"
@submit.native.prevent
>
<el-form-item class="form-item-disabled" style="margin: 10px;">
<el-input
@@ -82,7 +82,7 @@
align="center"
>
<template slot-scope="scope">
{{ scope.row.prcName || getPrcName(scope.row.prcType) }}
<a @click="dealWith(scope.row)" class="table-jump">{{ scope.row.prcName|| getPrcName(scope.row.prcType) }}</a>
</template>
</el-table-column>
<!-- <el-table-column-->