diff --git a/klp-ui/src/App.vue b/klp-ui/src/App.vue index 3192caa9..4804eb47 100644 --- a/klp-ui/src/App.vue +++ b/klp-ui/src/App.vue @@ -18,8 +18,8 @@ export default { this.$store.dispatch('category/getProductMap'); this.$store.dispatch('category/getRawMaterialMap'); this.$store.dispatch('category/getBomMap'); + this.$store.dispatch('finance/getFinancialAccounts'); } - console.log(this.$store) }, metaInfo() { return { diff --git a/klp-ui/src/components/KLPService/AmountSelect/index.vue b/klp-ui/src/components/KLPService/AmountSelect/index.vue index e69de29b..ae06dd33 100644 --- a/klp-ui/src/components/KLPService/AmountSelect/index.vue +++ b/klp-ui/src/components/KLPService/AmountSelect/index.vue @@ -0,0 +1,46 @@ + + + \ No newline at end of file diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue index 24c4b60a..f734f3f3 100644 --- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue +++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue @@ -52,7 +52,6 @@ export default { }, mounted() { this.options = this.rawMaterialList; - console.log(this.options, this.rawMaterialList); }, computed: { ...mapGetters(['rawMaterialList']) diff --git a/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue b/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue index 6e5580cb..3f998ec2 100644 --- a/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue +++ b/klp-ui/src/components/KLPService/Renderer/ProductInfo.vue @@ -63,7 +63,6 @@ export default { productId: { handler(newVal) { const res = this.productMap[this.productId] ? this.productMap[this.productId] : {}; - console.log(res) this.product = res; }, immediate: true diff --git a/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue b/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue index 00f76682..aab7da5b 100644 --- a/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue +++ b/klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue @@ -48,7 +48,6 @@ export default { materialId: { handler: function (newVal) { const res = this.materialMap[this.materialId] ? this.materialMap[this.materialId] : {}; - console.log(res) this.material = res; }, immediate: true diff --git a/klp-ui/src/components/VditorEditor.vue b/klp-ui/src/components/VditorEditor.vue index 54e7c2a8..f9692248 100644 --- a/klp-ui/src/components/VditorEditor.vue +++ b/klp-ui/src/components/VditorEditor.vue @@ -44,7 +44,6 @@ export default { } this.vditor = new Vditor('vditor', config); if (this.readonly) { - console.log(this.vditor) this.vditor.vditor.disabled() } }, diff --git a/klp-ui/src/store/getters.js b/klp-ui/src/store/getters.js index ca50b716..ee1a9b21 100644 --- a/klp-ui/src/store/getters.js +++ b/klp-ui/src/store/getters.js @@ -18,6 +18,7 @@ const getters = { sidebarRouters:state => state.permission.sidebarRouters, productList: state => state.category.productList, rawMaterialList: state => state.category.rawMaterialList, - bomMap: state => state.category.bomMap + bomMap: state => state.category.bomMap, + financialAccounts: state => state.finance.financialAccounts, } export default getters diff --git a/klp-ui/src/store/index.js b/klp-ui/src/store/index.js index ba1a9e56..ea914faf 100644 --- a/klp-ui/src/store/index.js +++ b/klp-ui/src/store/index.js @@ -7,6 +7,7 @@ import tagsView from './modules/tagsView' import permission from './modules/permission' import settings from './modules/settings' import category from './modules/category' +import finance from './modules/finance' import getters from './getters' Vue.use(Vuex) @@ -19,7 +20,8 @@ const store = new Vuex.Store({ tagsView, permission, settings, - category + category, + finance }, getters }) diff --git a/klp-ui/src/store/modules/finance.js b/klp-ui/src/store/modules/finance.js new file mode 100644 index 00000000..1174f9f3 --- /dev/null +++ b/klp-ui/src/store/modules/finance.js @@ -0,0 +1,26 @@ +import { listAccount } from "@/api/finance/account"; + +const state = { + financialAccounts: [], +} + +const mutations = { + SET_FINANCIAL_ACCOUNTS(state, financialAccounts) { + state.financialAccounts = financialAccounts; + }, +} + +const actions = { + getFinancialAccounts({ commit }) { + listAccount().then(response => { + commit('SET_FINANCIAL_ACCOUNTS', response.data); + }); + } +} + +export default { + namespaced: true, + state, + mutations, + actions +} \ No newline at end of file diff --git a/klp-ui/src/views/finance/document/components/Voucher.vue b/klp-ui/src/views/finance/document/components/Voucher.vue index 93a77aef..ceea9538 100644 --- a/klp-ui/src/views/finance/document/components/Voucher.vue +++ b/klp-ui/src/views/finance/document/components/Voucher.vue @@ -6,15 +6,12 @@ - - - + + @@ -29,29 +26,19 @@ @@ -61,12 +48,8 @@ @@ -96,193 +79,232 @@