diff --git a/src/components/ADempiere/Form/ProductInfo/index.vue b/src/components/ADempiere/Form/ProductInfo/index.vue index 6e929042faa..81436ea8592 100644 --- a/src/components/ADempiere/Form/ProductInfo/index.vue +++ b/src/components/ADempiere/Form/ProductInfo/index.vue @@ -19,6 +19,7 @@
@@ -28,7 +29,6 @@ * This component is made to be the prototype of the Product Info search field */ import ProductInfoList from './productList' -import fieldMixin from '@/components/ADempiere/Field/mixin/mixinField.js' import staticReportRoutes from '@/utils/ADempiere/constants/zoomReport' import { formatPrice, @@ -40,9 +40,20 @@ export default { components: { ProductInfoList }, - mixins: [ - fieldMixin - ], + props: { + containerManager: { + type: Object, + default: () => ({ + actionPerformed: () => {}, + changeFieldShowedFromUser: () => {}, + getFieldsLit: () => {}, + isDisplayedField: () => { return true }, + isMandatoryField: () => { return true }, + isReadOnlyField: () => { return false }, + setDefaultValues: () => {} + }) + } + }, data() { return { timeOut: null, @@ -88,7 +99,7 @@ export default { created() { // if (this.isEmptyValue(this.currentPos)) { this.$store.dispatch('listPointOfSalesFromServer') - this.findProcess(this.process) + // this.findProcess(this.process) // } }, methods: { diff --git a/src/components/ADempiere/Form/ProductInfo/productList.vue b/src/components/ADempiere/Form/ProductInfo/productList.vue index e4529962993..29882d8dba6 100644 --- a/src/components/ADempiere/Form/ProductInfo/productList.vue +++ b/src/components/ADempiere/Form/ProductInfo/productList.vue @@ -114,7 +114,7 @@ {{ formatPrice(getTaxAmount(scope.row.priceStandard, scope.row.taxRate.rate) + scope.row.priceStandard, scope.row.currency.iSOCode) }} - @@ -124,6 +124,7 @@ {{ $t('form.pos.tableProduct.options') }} + {{ scope.row.product.name }} @@ -135,7 +136,7 @@ - + --> { - const findProcess = this.$store.getters.getProcess(element.uuid) - if (!this.isEmptyValue(findProcess)) { - return { - ...element, - name: findProcess.name, - id: findProcess.id - } - } - return [] - }) - return process - } - return [] - }, + // process() { + // if (!this.isEmptyValue(this.reportAsociated)) { + // const process = this.reportAsociated.map(element => { + // const findProcess = this.$store.getters.getProcess(element.uuid) + // if (!this.isEmptyValue(findProcess)) { + // return { + // ...element, + // name: findProcess.name, + // id: findProcess.id + // } + // } + // return [] + // }) + // return process + // } + // return [] + // }, isMobile() { return this.$store.state.app.device === 'mobile' } diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 68a3b9f1bab..ad248359661 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -67,12 +67,12 @@ export default { const router = this.permission_routes.map(menu => { if (menu.path === '/PriceChecking') { return { - ...menu, - hidden: false + ...viewSearch, + hidden: !this.$store.state['user'].role.isAllowInfoProduct } } else if (menu.path === '/ProductInfo') { return { - ...viewSearch, + ...menu, hidden: !this.$store.state['user'].role.isAllowInfoProduct } } diff --git a/src/router/modules/ADempiere/menu.js b/src/router/modules/ADempiere/menu.js index bda8441cb6f..f71a5f77626 100644 --- a/src/router/modules/ADempiere/menu.js +++ b/src/router/modules/ADempiere/menu.js @@ -195,7 +195,7 @@ function hidenStactiRoutes({ staticRoutes, permiseRole }) { return { ...route, // is hidden by default, change to be visible - hidden: !isAllowInfoProduct + hidden: false } } return {