Feat: Add Field Product Search (#2197)

* Feat: Add Field Product Search * refactory
solop-develop · May 6, 2024 · 559ede1 · 559ede1
1 parent 7a8715e
commit 559ede1
Show file tree

Hide file tree

Showing 22 changed files with 1,701 additions and 521 deletions.
diff --git a/src/api/ADempiere/field/search/product.ts b/src/api/ADempiere/field/search/product.ts
@@ -281,6 +281,7 @@ export function requestListProducts({
   product_group_id,
   product_class_id,
   product_category_id,
+  product_classification_id,
   price_list_version_id,
   warehouse_id,
   attribute_set_id,
@@ -345,6 +346,7 @@ export function requestListProducts({
       product_group_id,
       product_class_id,
       product_category_id,
+      product_classification_id,
       price_list_version_id,
       warehouse_id,
       attribute_set_id,

diff --git a/src/components/ADempiere/DataTable/Components/CustomPagination.vue b/src/components/ADempiere/DataTable/Components/CustomPagination.vue
@@ -149,7 +149,7 @@ export default defineComponent({
 
     const currentPageNumber = computed(() => {
       if (!isEmptyValue(props.pageNumber)) {
-        return props.pageNumber
+        return Number(props.pageNumber)
       }
       return 1
     })

diff --git a/...mpiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/isStockedField.vue b/...mpiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/isStockedField.vue
@@ -22,6 +22,7 @@
   >
     <el-select
       v-model="currentValue"
+      clearable
     >
       <!-- :disabled="isDisabled" -->
       <el-option
@@ -43,7 +44,7 @@ import store from '@/store'
 import { YES_NO_OPTIONS_LIST } from '@/utils/ADempiere/dictionary/field/yesNo'
 
 // Utils and Helper Methods
-// import { isEmptyValue } from '@/utils/ADempiere/valueUtils'
+import { isEmptyValue } from '@/utils/ADempiere/valueUtils'
 
 export default defineComponent({
   name: 'IsStokedField',
@@ -58,7 +59,7 @@ export default defineComponent({
       default: undefined
     },
     containerUuid: {
-      required: true,
+      required: false,
       type: String
     }
   },
@@ -68,6 +69,7 @@ export default defineComponent({
 
     const currentValue = computed({
       set(newValue) {
+        if (isEmptyValue(newValue)) newValue = -1
         store.commit('setProductSearchFieldQueryFilterByAttribute', {
           containerUuid: props.uuidForm,
           attributeKey: ATTRIBUTE_KEY,

diff --git a/...FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/priceListVersionField.vue b/...FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/priceListVersionField.vue
@@ -23,6 +23,7 @@
     <el-select
       v-model="currentValue"
       filterable
+      clearable
       remote
       :remote-method="remoteSearch"
       @visible-change="loadPriceListVersions"
@@ -76,7 +77,7 @@ export default defineComponent({
       default: undefined
     },
     containerUuid: {
-      required: true,
+      required: false,
       type: String
     }
   },
@@ -131,6 +132,7 @@ export default defineComponent({
 
     const currentValue = computed({
       set(newValue) {
+        if (isEmptyValue(newValue)) newValue = -1
         store.commit('setProductSearchFieldQueryFilterByAttribute', {
           containerUuid: props.uuidForm,
           attributeKey: ATTRIBUTE_KEY,

diff --git a/.../FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/productCategoryField.vue b/.../FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/productCategoryField.vue
@@ -23,6 +23,7 @@
     <el-select
       v-model="currentValue"
       filterable
+      clearable
       remote
       :remote-method="remoteSearch"
       @visible-change="loadProductCategories"
@@ -51,6 +52,7 @@ import { requestListProductCategories } from '@/api/ADempiere/field/search/produ
 
 // Components and Mixins
 import EmptyOptionSelect from '@/components/ADempiere/FieldDefinition/FieldSelect/emptyOptionSelect.vue'
+import { isEmptyValue } from '@/utils/ADempiere'
 
 export default defineComponent({
   name: 'ProductCategoryField',
@@ -69,7 +71,7 @@ export default defineComponent({
       default: undefined
     },
     containerUuid: {
-      required: true,
+      required: false,
       type: String
     }
   },
@@ -81,6 +83,7 @@ export default defineComponent({
 
     const currentValue = computed({
       set(newValue) {
+        if (isEmptyValue(newValue)) newValue = -1
         store.commit('setProductSearchFieldQueryFilterByAttribute', {
           containerUuid: props.uuidForm,
           attributeKey: ATTRIBUTE_KEY,

diff --git a/...ere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/productClassField.vue b/...ere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/productClassField.vue
@@ -23,6 +23,7 @@
     <el-select
       v-model="currentValue"
       filterable
+      clearable
       remote
       :remote-method="remoteSearch"
       @visible-change="loadProductClasses"
@@ -51,6 +52,7 @@ import { requestListProductClasess } from '@/api/ADempiere/field/search/product.
 
 // Components and Mixins
 import EmptyOptionSelect from '@/components/ADempiere/FieldDefinition/FieldSelect/emptyOptionSelect.vue'
+import { isEmptyValue } from '@/utils/ADempiere'
 
 export default defineComponent({
   name: 'ProductClassField',
@@ -69,7 +71,7 @@ export default defineComponent({
       default: undefined
     },
     containerUuid: {
-      required: true,
+      required: false,
       type: String
     }
   },
@@ -81,6 +83,7 @@ export default defineComponent({
 
     const currentValue = computed({
       set(newValue) {
+        if (isEmptyValue(newValue)) newValue = -1
         store.commit('setProductSearchFieldQueryFilterByAttribute', {
           containerUuid: props.uuidForm,
           attributeKey: ATTRIBUTE_KEY,

diff --git a/...Definition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/productClassificationField.vue b/...Definition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/productClassificationField.vue
@@ -24,6 +24,7 @@
       v-model="currentValue"
       filterable
       remote
+      clearable
       :remote-method="remoteSearch"
       @visible-change="loadProductClassifications"
     >
@@ -51,6 +52,7 @@ import { requestListProductClassifications } from '@/api/ADempiere/field/search/
 
 // Components and Mixins
 import EmptyOptionSelect from '@/components/ADempiere/FieldDefinition/FieldSelect/emptyOptionSelect.vue'
+import { isEmptyValue } from '@/utils/ADempiere'
 
 export default defineComponent({
   name: 'ProductClassificationField',
@@ -69,7 +71,7 @@ export default defineComponent({
       default: undefined
     },
     containerUuid: {
-      required: true,
+      required: false,
       type: String
     }
   },
@@ -81,6 +83,7 @@ export default defineComponent({
 
     const currentValue = computed({
       set(newValue) {
+        if (isEmptyValue(newValue)) newValue = -1
         store.commit('setProductSearchFieldQueryFilterByAttribute', {
           containerUuid: props.uuidForm,
           attributeKey: ATTRIBUTE_KEY,

diff --git a/...ere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/productGroupField.vue b/...ere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/productGroupField.vue
@@ -23,6 +23,7 @@
     <el-select
       v-model="currentValue"
       filterable
+      clearable
       remote
       :remote-method="remoteSearch"
       @visible-change="loadProductGroups"
@@ -51,6 +52,7 @@ import { requestListProductGroups } from '@/api/ADempiere/field/search/product.t
 
 // Components and Mixins
 import EmptyOptionSelect from '@/components/ADempiere/FieldDefinition/FieldSelect/emptyOptionSelect.vue'
+import { isEmptyValue } from '@/utils/ADempiere'
 
 export default defineComponent({
   name: 'ProductGroupField',
@@ -69,7 +71,7 @@ export default defineComponent({
       default: undefined
     },
     containerUuid: {
-      required: true,
+      required: false,
       type: String
     }
   },
@@ -81,6 +83,7 @@ export default defineComponent({
 
     const currentValue = computed({
       set(newValue) {
+        if (isEmptyValue(newValue)) newValue = -1
         store.commit('setProductSearchFieldQueryFilterByAttribute', {
           containerUuid: props.uuidForm,
           attributeKey: ATTRIBUTE_KEY,

diff --git a/...ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/vendorField.vue b/...ADempiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/vendorField.vue
@@ -23,6 +23,7 @@
     <el-select
       v-model="currentValue"
       filterable
+      clearable
       remote
       :remote-method="remoteSearch"
       @visible-change="loadVendors"
@@ -51,6 +52,8 @@ import { requestListVendors } from '@/api/ADempiere/field/search/product.ts'
 
 // Components and Mixins
 import EmptyOptionSelect from '@/components/ADempiere/FieldDefinition/FieldSelect/emptyOptionSelect.vue'
+// Utils and Helper Methods
+import { isEmptyValue } from '@/utils/ADempiere/valueUtils'
 
 export default defineComponent({
   name: 'vendorField',
@@ -69,7 +72,7 @@ export default defineComponent({
       default: undefined
     },
     containerUuid: {
-      required: true,
+      required: false,
       type: String
     }
   },
@@ -81,6 +84,7 @@ export default defineComponent({
 
     const currentValue = computed({
       set(newValue) {
+        if (isEmptyValue(newValue)) newValue = -1
         store.commit('setProductSearchFieldQueryFilterByAttribute', {
           containerUuid: props.uuidForm,
           attributeKey: ATTRIBUTE_KEY,

diff --git a/...mpiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/warehouseField.vue b/...mpiere/FieldDefinition/FieldSearch/ProductInfo/PanelForm/QueryCriteria/warehouseField.vue
@@ -23,6 +23,7 @@
     <el-select
       v-model="currentValue"
       filterable
+      clearable
       remote
       :remote-method="remoteSearch"
       @visible-change="loadWarehouses"
@@ -51,6 +52,8 @@ import { requestListWarehouses } from '@/api/ADempiere/field/search/product.ts'
 
 // Components and Mixins
 import EmptyOptionSelect from '@/components/ADempiere/FieldDefinition/FieldSelect/emptyOptionSelect.vue'
+// Utils and Helper Methods
+import { isEmptyValue } from '@/utils/ADempiere/valueUtils'
 
 export default defineComponent({
   name: 'WarehouseField',
@@ -69,7 +72,7 @@ export default defineComponent({
       default: undefined
     },
     containerUuid: {
-      required: true,
+      required: false,
       type: String
     }
   },
@@ -81,6 +84,7 @@ export default defineComponent({
 
     const currentValue = computed({
       set(newValue) {
+        if (isEmptyValue(newValue)) newValue = -1
         store.commit('setProductSearchFieldQueryFilterByAttribute', {
           containerUuid: props.uuidForm,
           attributeKey: ATTRIBUTE_KEY,