diff --git a/jshERP-web/src/components/page/GlobalLayout.vue b/jshERP-web/src/components/page/GlobalLayout.vue index ea6f10b7..e5fca5c2 100644 --- a/jshERP-web/src/components/page/GlobalLayout.vue +++ b/jshERP-web/src/components/page/GlobalLayout.vue @@ -92,6 +92,7 @@ import { triggerWindowResizeEvent } from '@/utils/util' import { mapState, mapActions } from 'vuex' import { mixin, mixinDevice } from '@/utils/mixin.js' + import Vue from 'vue' export default { name: 'GlobalLayout', @@ -157,6 +158,7 @@ // update-begin-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常 let storeKey = 'route:title:' + this.activeMenu.url this.$ls.set(storeKey, this.activeMenu.text) + Vue.ls.set('funId', this.activeMenu.id, 7 * 24 * 60 * 60 * 1000); // update-end-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常 }, findMenuBykey(menus,key){ diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index 354802e6..f3dcf3a4 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -51,7 +51,9 @@ export const JeecgListMixin = { /** 高级查询拼接方式 */ superQueryMatchType: 'and', /** 是否加载时就执行 */ - disableMixinCreated: false + disableMixinCreated: false, + /* 按钮权限 */ + btnEnableList: '', } }, created() { @@ -60,6 +62,8 @@ export const JeecgListMixin = { this.loadData(); //初始化字典配置 在自己页面定义 this.initDictConfig(); + //初始化按钮权限 + this.initActiveBtnStr(); } }, methods:{ @@ -342,6 +346,21 @@ export const JeecgListMixin = { let url = getFileAccessHttpUrl(text) window.open(url); }, + /* 按钮权限 */ + initActiveBtnStr() { + let funId = Vue.ls.get('funId'); //功能id + let btnStrList = Vue.ls.get('winBtnStrList'); //按钮功能列表 JSON字符串 + this.btnEnableList = ""; //按钮列表 + if (funId && btnStrList) { + for (let i = 0; i < btnStrList.length; i++) { + if (btnStrList[i].funId == funId) { + if (btnStrList[i].btnStr) { + this.btnEnableList = btnStrList[i].btnStr; + } + } + } + } + } } } \ No newline at end of file diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue index 4a570250..a1e99174 100644 --- a/jshERP-web/src/views/bill/AllocationOutList.vue +++ b/jshERP-web/src/views/bill/AllocationOutList.vue @@ -38,10 +38,10 @@
- 新增 + 新增 - 删除 + 删除 批量操作 @@ -63,10 +63,10 @@ @change="handleTableChange"> 查看 - - 编辑 - - + + 编辑 + + 删除 diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue index dd57b9b9..13fe1f87 100644 --- a/jshERP-web/src/views/bill/AssembleList.vue +++ b/jshERP-web/src/views/bill/AssembleList.vue @@ -38,10 +38,10 @@
- 新增 + 新增 - 删除 + 删除 批量操作 @@ -63,10 +63,10 @@ @change="handleTableChange"> 查看 - - 编辑 - - + + 编辑 + + 删除 diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue index aa0c6b01..7a2bcffd 100644 --- a/jshERP-web/src/views/bill/DisassembleList.vue +++ b/jshERP-web/src/views/bill/DisassembleList.vue @@ -38,10 +38,10 @@
- 新增 + 新增 - 删除 + 删除 批量操作 @@ -63,10 +63,10 @@ @change="handleTableChange"> 查看 - - 编辑 - - + + 编辑 + + 删除 diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue index ea3050b2..0a16aa1a 100644 --- a/jshERP-web/src/views/bill/OtherInList.vue +++ b/jshERP-web/src/views/bill/OtherInList.vue @@ -38,10 +38,10 @@
- 新增 + 新增 - 删除 + 删除 批量操作 @@ -63,10 +63,10 @@ @change="handleTableChange"> 查看 - - 编辑 - - + + 编辑 + + 删除 diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue index 1e21045e..dce11730 100644 --- a/jshERP-web/src/views/bill/OtherOutList.vue +++ b/jshERP-web/src/views/bill/OtherOutList.vue @@ -38,10 +38,10 @@
- 新增 + 新增 - 删除 + 删除 批量操作 @@ -63,10 +63,10 @@ @change="handleTableChange"> 查看 - - 编辑 - - + + 编辑 + + 删除 diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue index 204aab5c..cc18a4d9 100644 --- a/jshERP-web/src/views/bill/PurchaseBackList.vue +++ b/jshERP-web/src/views/bill/PurchaseBackList.vue @@ -38,10 +38,10 @@
- 新增 + 新增 - 删除 + 删除 批量操作 @@ -63,10 +63,10 @@ @change="handleTableChange"> 查看 - - 编辑 - - + + 编辑 + + 删除 diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index 72fee33f..45184c76 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -38,10 +38,10 @@
- 新增 + 新增 - 删除 + 删除 批量操作 @@ -63,10 +63,10 @@ @change="handleTableChange"> 查看 - - 编辑 - - + + 编辑 + + 删除 diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index d0d14d82..1dd693eb 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -38,12 +38,12 @@
- 新增 + 新增 - 删除 - 审核 - 反审核 + 删除 + 审核 + 反审核 批量操作 @@ -65,10 +65,10 @@ @change="handleTableChange"> 查看 - - 编辑 - - + + 编辑 + + 删除 @@ -91,6 +91,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { BillListMixin } from './mixins/BillListMixin' import JDate from '@/components/jeecg/JDate' + import Vue from 'vue' export default { name: "PurchaseOrderList", mixins:[JeecgListMixin,BillListMixin], @@ -166,6 +167,9 @@ } } }, + created() { + this.removeStatusColumn() + }, computed: { }, diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue index 19a3e962..efe1bea6 100644 --- a/jshERP-web/src/views/bill/RetailBackList.vue +++ b/jshERP-web/src/views/bill/RetailBackList.vue @@ -38,10 +38,10 @@
- 新增 + 新增 - 删除 + 删除 批量操作 @@ -63,10 +63,10 @@ @change="handleTableChange"> 查看 - - 编辑 - - + + 编辑 + + 删除 diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue index 960ee26a..20d8fa38 100644 --- a/jshERP-web/src/views/bill/RetailOutList.vue +++ b/jshERP-web/src/views/bill/RetailOutList.vue @@ -38,10 +38,10 @@
- 新增 + 新增 - 删除 + 删除 批量操作 @@ -63,10 +63,10 @@ @change="handleTableChange"> 查看 - - 编辑 - - + + 编辑 + + 删除 diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index 8ef223ef..2c1ef6f8 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -38,10 +38,10 @@
- 新增 + 新增 - 删除 + 删除 批量操作 @@ -63,10 +63,10 @@ @change="handleTableChange"> 查看 - - 编辑 - - + + 编辑 + + 删除 diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index 17a54900..145743df 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -38,12 +38,12 @@
- 新增 + 新增 - 删除 - 审核 - 反审核 + 删除 + 审核 + 反审核 批量操作 @@ -65,10 +65,10 @@ @change="handleTableChange"> 查看 - - 编辑 - - + + 编辑 + + 删除 @@ -166,6 +166,9 @@ } } }, + created() { + this.removeStatusColumn() + }, computed: { }, diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index a14b0a9f..b7174bd7 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -38,10 +38,10 @@
- 新增 + 新增 - 删除 + 删除 批量操作 @@ -63,10 +63,10 @@ @change="handleTableChange"> 查看 - - 编辑 - - + + 编辑 + + 删除 diff --git a/jshERP-web/src/views/bill/dialog/BillDetail.vue b/jshERP-web/src/views/bill/dialog/BillDetail.vue index b41d40ea..9dc2e7f2 100644 --- a/jshERP-web/src/views/bill/dialog/BillDetail.vue +++ b/jshERP-web/src/views/bill/dialog/BillDetail.vue @@ -11,6 +11,9 @@ wrapClassName="ant-modal-cust-warp" style="top:5%;height: 100%;overflow-y: hidden">