refs #6681 - PR3 - Resolve conflicts #166

Merged
alexm merged 88 commits from hyervoni-PR-3 into dev 2024-01-29 08:29:45 +00:00
1 changed files with 3 additions and 9 deletions
Showing only changes of commit 9d4d3bf84d - Show all commits

View File

@ -117,9 +117,10 @@ const toCustomerCreditCreate = () => {
<QTr :props="props" class="cursor-pointer">
<component
:is="tableColumnComponents[props.col.name].component"
class="col-content"
v-bind="tableColumnComponents[props.col.name].props(props)"
@click="tableColumnComponents[props.col.name].event(props)"
class="rounded-borders q-pa-sm"
style="border: 1px solid red"
v-bind="tableColumnComponents[props.col.name].props(props)"
>
{{ props.value }}
<WorkerDescriptorProxy :id="workerId" />
@ -138,13 +139,6 @@ const toCustomerCreditCreate = () => {
</QPageSticky>
</template>
<style lang="scss" scoped>
.col-content {
border-radius: 4px;
padding: 6px;
}
</style>
<i18n>
es:
Since: Desde