Skip to content
This repository has been archived by the owner on Nov 25, 2024. It is now read-only.

Commit

Permalink
fix: Product search table columns. (#2058)
Browse files Browse the repository at this point in the history
  • Loading branch information
@EdwinBetanc0urt
EdwinBetanc0urt authored Apr 2, 2024
1 parent 0a3af62 commit 9dad06e
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 86 deletions.
6 changes: 4 additions & 2 deletions ...nents/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/index.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
:label="$t('field.product.name')"
/>
</el-col>
<!-- <el-col :span="6">
<!--
<el-col :span="6">
<text-field
:uuid-form="uuidForm"
attribute-key="upc"
Expand All @@ -64,7 +65,8 @@
attribute-key="sku"
:label="$t('field.product.sku')"
/>
</el-col> -->
</el-col>
-->
<el-col :span="8">
<warehouse-field
:uuid-form="uuidForm"
Expand Down
171 changes: 87 additions & 84 deletions src/components/ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/tableRecords.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
header-align="center"
width="220"
/>

<template v-if="isPriceAmounts">
<el-table-column
prop="standard_price"
Expand All @@ -68,6 +69,42 @@
</span>
</el-table-column>

<!--
<el-table-column
prop="list_price"
:label="$t('field.product.listPrice')"
sortable
header-align="center"
width="122"
>
<span slot-scope="scope" class="cell-align-right">
{{ formatQuantity({ value: scope.row.list_price }) }}
</span>
</el-table-column>

<el-table-column
prop="limit_price"
:label="$t('field.product.limitPrice')"
sortable
header-align="center"
width="118"
>
<span slot-scope="scope" class="cell-align-right">
{{ formatQuantity({ value: scope.row.limit_price }) }}
</span>
</el-table-column>
<el-table-column
prop="margin"
:label="$t('field.product.margin')"
sortable
header-align="center"
width="110"
>
<span slot-scope="scope" class="cell-align-right">
{{ formatQuantity({ value: scope.row.margin }) }}
</span>
</el-table-column>
-->
</template>

<el-table-column
Expand All @@ -88,6 +125,7 @@
{{ convertBooleanToTranslationLang(scope.row.is_stocked) }}
</span>
</el-table-column>

<template v-if="isStockQuantities">
<el-table-column
prop="available_quantity"
Expand All @@ -100,8 +138,6 @@
{{ formatQuantity({ value: scope.row.available_quantity }) }}
</span>
</el-table-column>
</template>
<template v-if="isStockQuantities">
<el-table-column
prop="on_hand_quantity"
:label="$t('field.product.onHandQuantity')"
Expand All @@ -113,89 +149,8 @@
{{ formatQuantity({ value: scope.row.on_hand_quantity }) }}
</span>
</el-table-column>
</template>

<el-table-column
prop="product_category"
:label="$t('field.product.productCategory')"
sortable
header-align="center"
width="165"
/>
<el-table-column
prop="product_group"
:label="$t('field.product.productGroup')"
sortable
header-align="center"
width="150"
/>
<el-table-column
prop="product_class"
:label="$t('field.product.productClass')"
sortable
header-align="center"
width="150"
/>
<el-table-column
prop="vendor"
:label="$t('field.product.vendor')"
sortable
header-align="center"
width="170"
/>
<!-- <el-table-column
prop="upc"
:label="$t('field.product.upcEan')"
sortable
header-align="center"
width="170"
/>
<el-table-column
prop="sku"
:label="$t('field.product.sku')"
sortable
header-align="center"
width="170"
/> -->

<!-- <template v-if="isPriceAmounts"> -->
<!-- <el-table-column
prop="list_price"
:label="$t('field.product.listPrice')"
sortable
header-align="center"
width="122"
>
<span slot-scope="scope" class="cell-align-right">
{{ formatQuantity({ value: scope.row.list_price }) }}
</span>
</el-table-column> -->

<!-- <el-table-column
prop="limit_price"
:label="$t('field.product.limitPrice')"
sortable
header-align="center"
width="118"
>
<span slot-scope="scope" class="cell-align-right">
{{ formatQuantity({ value: scope.row.limit_price }) }}
</span>
</el-table-column>
<el-table-column
prop="margin"
:label="$t('field.product.margin')"
sortable
header-align="center"
width="110"
>
<span slot-scope="scope" class="cell-align-right">
{{ formatQuantity({ value: scope.row.margin }) }}
</span>
</el-table-column> -->
<!-- </template> -->

<template v-if="isStockQuantities">
<!--
<el-table-column
prop="reserved_quantity"
:label="$t('field.product.reservedQuantity')"
Expand Down Expand Up @@ -240,8 +195,10 @@
{{ formatQuantity({ value: scope.row.unconfirmed_move_quantity }) }}
</span>
</el-table-column>
-->
</template>

<!--
<el-table-column
prop="is_instance_attribute"
:label="$t('field.product.instanceAttribute')"
Expand All @@ -253,6 +210,52 @@
{{ convertBooleanToTranslationLang(scope.row.is_instance_attribute) }}
</span>
</el-table-column>
-->

<el-table-column
prop="product_category"
:label="$t('field.product.productCategory')"
sortable
header-align="center"
width="165"
/>
<el-table-column
prop="product_group"
:label="$t('field.product.productGroup')"
sortable
header-align="center"
width="150"
/>
<el-table-column
prop="product_class"
:label="$t('field.product.productClass')"
sortable
header-align="center"
width="150"
/>
<el-table-column
prop="vendor"
:label="$t('field.product.vendor')"
sortable
header-align="center"
width="170"
/>
<!--
<el-table-column
prop="upc"
:label="$t('field.product.upcEan')"
sortable
header-align="center"
width="170"
/>
<el-table-column
prop="sku"
:label="$t('field.product.sku')"
sortable
header-align="center"
width="170"
/>
-->

</el-table>
</div>
Expand Down

0 comments on commit 9dad06e

Please sign in to comment.