diff --git a/jshERP-web/src/views/bill/mixins/BillModalMixin.js b/jshERP-web/src/views/bill/mixins/BillModalMixin.js index acb5de857..880951bf5 100644 --- a/jshERP-web/src/views/bill/mixins/BillModalMixin.js +++ b/jshERP-web/src/views/bill/mixins/BillModalMixin.js @@ -39,7 +39,13 @@ export const BillModalMixin = { billStatus: '0', minWidth: 1100, isCanCheck: true, - isTenant: false, + quickBtn: { + vendor: false, + customer: false, + member: false, + account: false, + depot: false + }, billPrintFlag: false, /* 是否显示打印按钮 */ isShowPrintBtn: true, @@ -68,8 +74,6 @@ export const BillModalMixin = { }; }, created () { - let userInfo = Vue.ls.get(USER_INFO) - this.isTenant = userInfo.id === userInfo.tenantId? true:false let realScreenWidth = window.screen.width this.width = realScreenWidth<1500?'1200px':'1550px' this.minWidth = realScreenWidth<1500?1150:1500 @@ -1020,6 +1024,21 @@ export const BillModalMixin = { this.billPrintFlag = res.data.platformValue==='1'?true:false } }) + }, + //加载快捷按钮:供应商、客户、会员、结算账户、仓库 + initQuickBtn() { + let btnStrList = Vue.ls.get('winBtnStrList') //按钮功能列表 JSON字符串 + if (btnStrList) { + for (let i = 0; i < btnStrList.length; i++) { + if (btnStrList[i].btnStr) { + this.quickBtn.vendor = btnStrList[i].url === '/system/vendor'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.vendor + this.quickBtn.customer = btnStrList[i].url === '/system/customer'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.customer + this.quickBtn.member = btnStrList[i].url === '/system/member'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.member + this.quickBtn.account = btnStrList[i].url === '/system/account'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.account + this.quickBtn.depot = btnStrList[i].url === '/system/depot'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.depot + } + } + } } } } \ No newline at end of file diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue index bd335262a..8505c995e 100644 --- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue +++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue @@ -64,8 +64,8 @@ @@ -222,6 +222,7 @@ this.initSystemConfig() this.initDepot() this.initPlatform() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue index f34cc91bd..3b04f4c0d 100644 --- a/jshERP-web/src/views/bill/modules/AssembleModal.vue +++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue @@ -63,8 +63,8 @@ @@ -220,6 +220,7 @@ this.initSystemConfig() this.initDepot() this.initPlatform() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue index b3839e5e1..b1eddd8d7 100644 --- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue +++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue @@ -63,8 +63,8 @@ @@ -219,6 +219,7 @@ this.initSystemConfig() this.initDepot() this.initPlatform() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue index cf37228a8..2a51eea56 100644 --- a/jshERP-web/src/views/bill/modules/OtherInModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue @@ -27,7 +27,7 @@
-
新增供应商
@@ -86,8 +86,8 @@ @@ -274,6 +274,7 @@ this.initSupplier(0) this.initDepot() this.initPlatform() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue index a2b8bdc2d..71bfb841e 100644 --- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue @@ -27,7 +27,7 @@
-
新增客户
@@ -86,8 +86,8 @@ @@ -274,6 +274,7 @@ this.initCustomer(0) this.initDepot() this.initPlatform() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue b/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue index b95f6cae5..9ec1c9893 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseApplyModal.vue @@ -241,6 +241,7 @@ } this.initSystemConfig() this.initPlatform() + this.initQuickBtn() }, /** 整理成formData */ classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index 2a48ac7c4..fa0439f92 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -27,7 +27,7 @@
-
新增供应商
@@ -83,8 +83,8 @@ @@ -124,7 +124,7 @@
-
新增结算账户
@@ -346,6 +346,7 @@ this.initDepot() this.initAccount(0) this.initPlatform() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 9967f9d18..a5d1d6f0a 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -31,7 +31,7 @@
-
新增供应商
@@ -98,8 +98,8 @@ @@ -144,7 +144,7 @@
-
新增结算账户
@@ -395,6 +395,7 @@ this.initDepot() this.initAccount(0) this.initPlatform() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index 6f525c9c1..8014aef70 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -31,7 +31,7 @@
-
新增供应商
@@ -139,7 +139,7 @@
-
新增结算账户
@@ -353,6 +353,7 @@ this.initSupplier(0) this.initAccount(0) this.initPlatform() + this.initQuickBtn() }, /** 整理成formData */ classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index 080409498..b88bc1e11 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -27,7 +27,7 @@
-
新增会员
@@ -85,8 +85,8 @@ @@ -133,7 +133,7 @@
-
新增结算账户
@@ -328,6 +328,7 @@ this.initDepot() this.initAccount(0) this.initPlatform() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue index 48a144801..b118cff18 100644 --- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue @@ -31,7 +31,7 @@
-
新增会员
@@ -95,8 +95,8 @@ @@ -148,7 +148,7 @@
-
新增结算账户
@@ -338,6 +338,7 @@ this.initDepot() this.initAccount(0) this.initPlatform() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index 9a82a060f..da342330a 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -27,7 +27,7 @@
-
新增客户
@@ -83,8 +83,8 @@ @@ -124,7 +124,7 @@
-
新增结算账户
@@ -354,6 +354,7 @@ this.initDepot() this.initAccount(0) this.initPlatform() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue index 8f41c9314..67bac0f5f 100644 --- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue @@ -32,7 +32,7 @@
-
新增客户
@@ -132,7 +132,7 @@
-
新增结算账户
@@ -329,6 +329,7 @@ this.initSalesman() this.initAccount(0) this.initPlatform() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index f554ff9a4..9afe80a0d 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -32,7 +32,7 @@
-
新增客户
@@ -99,8 +99,8 @@ @@ -145,7 +145,7 @@
-
新增结算账户
@@ -413,6 +413,7 @@ this.initDepot() this.initAccount(0) this.initPlatform() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js index 77ae8ef4f..0baa1ada1 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js @@ -17,7 +17,9 @@ export const FinancialModalMixin = { accountList: [], billStatus: '0', isCanCheck: true, - isTenant: false, + quickBtn: { + person: false + }, /* 原始审核是否开启 */ checkFlag: true, spans: { @@ -36,8 +38,6 @@ export const FinancialModalMixin = { }; }, created () { - let userInfo = Vue.ls.get(USER_INFO) - this.isTenant = userInfo.id === userInfo.tenantId? true:false let realScreenWidth = window.screen.width this.width = realScreenWidth<1500?'1200px':'1550px' this.minWidth = realScreenWidth<1500?1150:1500 @@ -327,5 +327,19 @@ export const FinancialModalMixin = { this.$message.warning('请先保存单据后再提交流程!'); } }, + //加载快捷按钮:供应商、客户、结算账户、经手人 + initQuickBtn() { + let btnStrList = Vue.ls.get('winBtnStrList') //按钮功能列表 JSON字符串 + if (btnStrList) { + for (let i = 0; i < btnStrList.length; i++) { + if (btnStrList[i].btnStr) { + this.quickBtn.vendor = btnStrList[i].url === '/system/vendor'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.vendor + this.quickBtn.customer = btnStrList[i].url === '/system/customer'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.customer + this.quickBtn.account = btnStrList[i].url === '/system/account'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.account + this.quickBtn.person = btnStrList[i].url === '/system/person'?btnStrList[i].btnStr.indexOf(1)>-1:this.quickBtn.person + } + } + } + } } } \ No newline at end of file diff --git a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue index 53c0bf908..6860ceffd 100644 --- a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue +++ b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue @@ -46,7 +46,7 @@
-
新增经手人
@@ -207,6 +207,7 @@ this.initRetail() this.initPerson() this.initDetailAccount() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/financial/modules/GiroModal.vue b/jshERP-web/src/views/financial/modules/GiroModal.vue index 5b112fc91..77c919369 100644 --- a/jshERP-web/src/views/financial/modules/GiroModal.vue +++ b/jshERP-web/src/views/financial/modules/GiroModal.vue @@ -36,7 +36,7 @@
-
新增经手人
@@ -75,7 +75,7 @@
-
新增结算账户
@@ -218,6 +218,7 @@ this.initPerson() this.initAccount() this.initDetailAccount() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue index 5cb942458..ee866e43b 100644 --- a/jshERP-web/src/views/financial/modules/ItemInModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue @@ -46,7 +46,7 @@
-
新增经手人
@@ -83,7 +83,7 @@
-
新增结算账户
@@ -232,6 +232,7 @@ this.initPerson() this.initInOutItem('in') this.initAccount() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue index f73c49e5e..b5b4c3b4f 100644 --- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue @@ -46,7 +46,7 @@
-
新增经手人
@@ -83,7 +83,7 @@
-
新增结算账户
@@ -232,6 +232,7 @@ this.initPerson() this.initInOutItem('out') this.initAccount() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue index 7b374b9d9..2f4fa742e 100644 --- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue @@ -26,7 +26,7 @@
-
新增客户
@@ -52,7 +52,7 @@
-
新增经手人
@@ -104,7 +104,7 @@
-
新增结算账户
@@ -256,6 +256,7 @@ this.initCustomer() this.initPerson() this.initAccount() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) { diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue index 10e9a2fab..b7b293acc 100644 --- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue @@ -26,7 +26,7 @@
-
新增供应商
@@ -52,7 +52,7 @@
-
新增经手人
@@ -104,7 +104,7 @@
-
新增结算账户
@@ -259,6 +259,7 @@ this.initSupplier() this.initPerson() this.initAccount() + this.initQuickBtn() }, //提交单据时整理成formData classifyIntoFormData(allValues) {