diff --git a/src/components/ADempiere/Form/BarcodeReader/fieldsList.js b/src/components/ADempiere/Form/BarcodeReader/fieldsList.js new file mode 100644 index 00000000..9b88afe6 --- /dev/null +++ b/src/components/ADempiere/Form/BarcodeReader/fieldsList.js @@ -0,0 +1,19 @@ +export default [ + // Product Code + { + elementColumnName: 'ProductValue', + isFromDictionary: true, + value: '', + overwriteDefinition: { + size: 24, + sequence: 10, + cssClassName: 'price-inquiry', + inputSize: 'large', + handleFocusGained: true, + handleFocusLost: true, + handleActionKeyPerformed: true, + isDisplayed: true, + isReadOnly: true + } + } +] diff --git a/src/components/ADempiere/Form/BarcodeReader/index.vue b/src/components/ADempiere/Form/BarcodeReader/index.vue new file mode 100644 index 00000000..06fe422a --- /dev/null +++ b/src/components/ADempiere/Form/BarcodeReader/index.vue @@ -0,0 +1,300 @@ + + + + + + diff --git a/src/components/ADempiere/Form/PriceChecking/fieldsList.js b/src/components/ADempiere/Form/PriceChecking/fieldsList.js index 12fc03e5..a65b3c73 100644 --- a/src/components/ADempiere/Form/PriceChecking/fieldsList.js +++ b/src/components/ADempiere/Form/PriceChecking/fieldsList.js @@ -13,6 +13,7 @@ export default [ handleActionKeyPerformed: true, isDisplayed: true, isReadOnly: false + // componentPath: 'FieldSelect' } } ] diff --git a/src/components/ADempiere/Form/PriceChecking/index.vue b/src/components/ADempiere/Form/PriceChecking/index.vue index cec51640..12999d86 100644 --- a/src/components/ADempiere/Form/PriceChecking/index.vue +++ b/src/components/ADempiere/Form/PriceChecking/index.vue @@ -2,11 +2,12 @@
@@ -101,6 +102,9 @@ export default { defaultImage() { return require('@/image/ADempiere/priceChecking/no-image.jpg') }, + defaultImageLogo() { + return require('@/image/ADempiere/priceChecking/todoagro.png') + }, backgroundForm() { if (this.isEmptyValue(this.currentImageOfProduct)) { return this.organizationBackground @@ -154,7 +158,7 @@ export default { subscribeChanges() { return this.$store.subscribe((mutation, state) => { // console.log(mutation.type.length) - if ((mutation.type === 'updateValueOfField' || mutation.type === 'addFocusGained') && mutation.payload.columnName === 'ProductValue') { + if ((mutation.type === 'updateValueOfField' || mutation.type === 'addActionKeyPerformed') && mutation.payload.columnName === 'ProductValue') { // cleans all values except column name 'ProductValue' this.search = mutation.payload.value if (this.search.length >= 6) { diff --git a/src/components/ADempiere/Form/index.vue b/src/components/ADempiere/Form/index.vue index 7079e409..b2a429c1 100644 --- a/src/components/ADempiere/Form/index.vue +++ b/src/components/ADempiere/Form/index.vue @@ -21,6 +21,21 @@ export default { switch (this.metadata.fileName) { case 'PriceChecking': form = import('@/components/ADempiere/Form/PriceChecking') + this.$store.dispatch('settings/changeSetting', { + key: 'showNavar', + value: true + }) + this.$store.dispatch('settings/changeSetting', { + key: 'showMenu', + value: false + }) + this.$store.dispatch('settings/changeSetting', { + key: 'tagsView', + value: false + }) + break + case 'BarcodeReader': + form = import('@/components/ADempiere/Form/BarcodeReader') break case 'VPOS': form = import('@/components/ADempiere/Form/VPOS') diff --git a/src/image/ADempiere/priceChecking/todoagro.png b/src/image/ADempiere/priceChecking/todoagro.png new file mode 100644 index 00000000..ba8395e7 Binary files /dev/null and b/src/image/ADempiere/priceChecking/todoagro.png differ diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue index fc553161..d1c900fb 100644 --- a/src/layout/components/Settings/index.vue +++ b/src/layout/components/Settings/index.vue @@ -18,6 +18,11 @@
+
+ show Title + +
+
{{ $t('settings.fixedHeader') }} @@ -63,6 +68,14 @@ export default { return {} }, computed: { + isShowTitleForm: { + get() { + return this.$store.getters.getIsShowTitleForm + }, + set(val) { + this.$store.commit('changeShowTitleForm', val) + } + }, isShowJob() { return this.$store.getters.language === 'zh' }, @@ -148,6 +161,9 @@ export default { } }, methods: { + changeDisplatedTitle() { + this.$store.commit('changeShowTitleForm', !this.isShowTitleForm) + }, themeChange(val) { this.$store.dispatch('settings/changeSetting', { key: 'theme', diff --git a/src/router/modules/ADempiere/staticRoutes.js b/src/router/modules/ADempiere/staticRoutes.js index 91fffa18..88b54673 100644 --- a/src/router/modules/ADempiere/staticRoutes.js +++ b/src/router/modules/ADempiere/staticRoutes.js @@ -64,6 +64,38 @@ const staticRoutes = [ } } ] + }, + { + path: '/PriceChecking', + component: Layout, + hidden: true, + children: [ + { + path: '/PriceChecking', + component: () => import('@/views/ADempiere/Form'), + name: 'PriceChecking', + meta: { + title: 'PriceChecking', + isIndex: true + } + } + ] + }, + { + path: '/BarcodeReader', + component: Layout, + hidden: false, + children: [ + { + path: '/BarcodeReader', + component: () => import('@/views/ADempiere/Form'), + name: 'BarcodeReader', + meta: { + title: 'BarcodeReader', + isIndex: true + } + } + ] } ] diff --git a/src/store/modules/user.js b/src/store/modules/user.js index bc73a92e..109a39d1 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -117,9 +117,7 @@ const actions = { reject(logInResponse) return } - const { result: token } = logInResponse - commit('SET_TOKEN', token) setToken(token) diff --git a/src/views/ADempiere/Form/index.vue b/src/views/ADempiere/Form/index.vue index 55bed74d..78aed375 100644 --- a/src/views/ADempiere/Form/index.vue +++ b/src/views/ADempiere/Form/index.vue @@ -2,7 +2,7 @@ - - + + @@ -101,6 +102,9 @@ export default { formTitle() { return this.formMetadata.name || this.$route.meta.title }, + fromFileName() { + return this.formMetadata.fileName || this.$route.meta.title + }, getterForm() { return this.$store.getters.getForm(this.formUuid) }, @@ -115,6 +119,9 @@ export default { }) } }, + showNavar() { + return this.$store.state.settings.showNavar + }, isShowTitleForm() { return this.$store.getters.getIsShowTitleForm } @@ -172,8 +179,13 @@ export default { .view-base { height: 100%; min-height: calc(100vh - 84px); + overflow: hidden; + } + .show-header-view-base { + height: 100%; + min-height: calc(100vh - 26px); + overflow: hidden; } - .view-loading { padding: 100px 100px; height: 100%;