fix conflicts
This commit is contained in:
@@ -5,6 +5,7 @@
|
||||
<CasesFilter
|
||||
:filters="filters"
|
||||
:title="$t('ID_DRAFT')"
|
||||
:icon="icon"
|
||||
@onRemoveFilter="onRemoveFilter"
|
||||
@onUpdateFilters="onUpdateFilters"
|
||||
/>
|
||||
@@ -49,10 +50,19 @@
|
||||
:options="optionsVueView"
|
||||
ref="vueCardView"
|
||||
>
|
||||
<div slot="detail" slot-scope="props">
|
||||
<div class="v-pm-card-info" @click="openCaseDetail(props.item)">
|
||||
<i class="fas fa-info-circle"></i>
|
||||
</div>
|
||||
<div slot="actions" slot-scope="props">
|
||||
<b-row>
|
||||
<b-col sm="12">
|
||||
<div class="v-pm-card-info" @click="openCaseDetail(props.item)">
|
||||
<i class="fas fa-info-circle"></i>
|
||||
</div>
|
||||
</b-col>
|
||||
<b-col sm="12">
|
||||
<div class="ellipsis-container" @click="updateDataEllipsis(props.row)">
|
||||
<ellipsis ref="ellipsis" v-if="dataEllipsis" :data="dataEllipsis"> </ellipsis>
|
||||
</div>
|
||||
</b-col>
|
||||
</b-row>
|
||||
</div>
|
||||
<div slot="case_number" slot-scope="props" class="v-card-text">
|
||||
<span class="v-card-text-highlight"
|
||||
@@ -106,10 +116,19 @@
|
||||
:options="optionsVueView"
|
||||
ref="vueListView"
|
||||
>
|
||||
<div slot="detail" slot-scope="props">
|
||||
<div class="v-pm-card-info" @click="openCaseDetail(props.item)">
|
||||
<i class="fas fa-info-circle"></i>
|
||||
</div>
|
||||
<div slot="actions" slot-scope="props">
|
||||
<b-row>
|
||||
<b-col sm="12">
|
||||
<div class="v-pm-card-info" @click="openCaseDetail(props.item)">
|
||||
<i class="fas fa-info-circle"></i>
|
||||
</div>
|
||||
</b-col>
|
||||
<b-col sm="12">
|
||||
<div class="ellipsis-container" @click="updateDataEllipsis(props.row)">
|
||||
<ellipsis ref="ellipsis" v-if="dataEllipsis" :data="dataEllipsis"> </ellipsis>
|
||||
</div>
|
||||
</b-col>
|
||||
</b-row>
|
||||
</div>
|
||||
<div slot="case_number" slot-scope="props" class="v-card-text">
|
||||
<span class="v-card-text-highlight"
|
||||
@@ -222,6 +241,7 @@ export default {
|
||||
"actions"
|
||||
],
|
||||
tableData: [],
|
||||
icon:"fas fa-edit",
|
||||
options: {
|
||||
filterable: false,
|
||||
headings: {
|
||||
@@ -568,5 +588,7 @@ export default {
|
||||
padding-left: 50px;
|
||||
padding-right: 50px;
|
||||
}
|
||||
|
||||
.ellipsis-container {
|
||||
margin-top: 5em;
|
||||
}
|
||||
</style>
|
||||
Reference in New Issue
Block a user