diff --git a/jshERP-web/src/mixins/JeecgListMixin.js b/jshERP-web/src/mixins/JeecgListMixin.js index ae3e9ea0..7e4767bc 100644 --- a/jshERP-web/src/mixins/JeecgListMixin.js +++ b/jshERP-web/src/mixins/JeecgListMixin.js @@ -427,15 +427,11 @@ export const JeecgListMixin = { initActiveBtnStr() { let btnStrList = Vue.ls.get('winBtnStrList'); //按钮功能列表 JSON字符串 this.btnEnableList = ""; //按钮列表 - let pathName = location.pathname - if(pathName.indexOf('/plugins')>-1) { - pathName = '/system' + pathName - } - if (pathName && btnStrList) { + if (this.urlPath && btnStrList) { for (let i = 0; i < btnStrList.length; i++) { - if (btnStrList[i].url === pathName) { + if (btnStrList[i].url === this.urlPath) { if (btnStrList[i].btnStr) { - this.btnEnableList = btnStrList[i].btnStr; + this.btnEnableList = btnStrList[i].btnStr } } } diff --git a/jshERP-web/src/views/bill/AllocationOutList.vue b/jshERP-web/src/views/bill/AllocationOutList.vue index e6d7a33e..a20b85f7 100644 --- a/jshERP-web/src/views/bill/AllocationOutList.vue +++ b/jshERP-web/src/views/bill/AllocationOutList.vue @@ -201,6 +201,7 @@ remark: "" }, prefixNo: 'DBCK', + urlPath: '/bill/allocation_out', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/AssembleList.vue b/jshERP-web/src/views/bill/AssembleList.vue index 36270725..fbf8a1e0 100644 --- a/jshERP-web/src/views/bill/AssembleList.vue +++ b/jshERP-web/src/views/bill/AssembleList.vue @@ -201,6 +201,7 @@ remark: "" }, prefixNo: 'ZZD', + urlPath: '/bill/assemble', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/DisassembleList.vue b/jshERP-web/src/views/bill/DisassembleList.vue index 229b8746..0866ca23 100644 --- a/jshERP-web/src/views/bill/DisassembleList.vue +++ b/jshERP-web/src/views/bill/DisassembleList.vue @@ -201,6 +201,7 @@ remark: "" }, prefixNo: 'CXD', + urlPath: '/bill/disassemble', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue index 3b120e54..b72af459 100644 --- a/jshERP-web/src/views/bill/OtherInList.vue +++ b/jshERP-web/src/views/bill/OtherInList.vue @@ -221,6 +221,7 @@ remark: "" }, prefixNo: 'QTRK', + urlPath: '/bill/other_in', //出入库管理开关,适合独立仓管场景 inOutManageFlag: false, labelCol: { diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue index 6d0bd371..b89a35ab 100644 --- a/jshERP-web/src/views/bill/OtherOutList.vue +++ b/jshERP-web/src/views/bill/OtherOutList.vue @@ -221,6 +221,7 @@ remark: "" }, prefixNo: 'QTCK', + urlPath: '/bill/other_out', //出入库管理开关,适合独立仓管场景 inOutManageFlag: false, labelCol: { diff --git a/jshERP-web/src/views/bill/PurchaseApplyList.vue b/jshERP-web/src/views/bill/PurchaseApplyList.vue index e31e31aa..8405e247 100644 --- a/jshERP-web/src/views/bill/PurchaseApplyList.vue +++ b/jshERP-web/src/views/bill/PurchaseApplyList.vue @@ -203,6 +203,7 @@ remark: "" }, prefixNo: 'QGD', + urlPath: '/bill/purchase_apply', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue index 2c519ea4..ee7eed57 100644 --- a/jshERP-web/src/views/bill/PurchaseBackList.vue +++ b/jshERP-web/src/views/bill/PurchaseBackList.vue @@ -234,6 +234,7 @@ remark: "" }, prefixNo: 'CGTH', + urlPath: '/bill/purchase_back', //出入库管理开关,适合独立仓管场景 inOutManageFlag: false, labelCol: { diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index a2a09570..431f9120 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -258,6 +258,7 @@ remark: "" }, prefixNo: 'CGRK', + urlPath: '/bill/purchase_in', //出入库管理开关,适合独立仓管场景 inOutManageFlag: false, labelCol: { diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index 4c47b3e0..9b14e78a 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -231,6 +231,7 @@ remark: "" }, prefixNo: 'CGDD', + urlPath: '/bill/purchase_order', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue index c4089620..926a4843 100644 --- a/jshERP-web/src/views/bill/RetailBackList.vue +++ b/jshERP-web/src/views/bill/RetailBackList.vue @@ -227,6 +227,7 @@ remark: "" }, prefixNo: 'LSTH', + urlPath: '/bill/retail_back', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue index 3fbd58fb..d1f1f7d4 100644 --- a/jshERP-web/src/views/bill/RetailOutList.vue +++ b/jshERP-web/src/views/bill/RetailOutList.vue @@ -225,6 +225,7 @@ remark: "" }, prefixNo: 'LSCK', + urlPath: '/bill/retail_out', labelCol: { span: 5 }, diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index 605a74b3..f2753549 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -244,6 +244,7 @@ remark: "" }, prefixNo: 'XSTH', + urlPath: '/bill/sale_back', //出入库管理开关,适合独立仓管场景 inOutManageFlag: false, labelCol: { diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index 45cc3348..f0fd717a 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -237,6 +237,7 @@ remark: "" }, prefixNo: 'XSDD', + urlPath: '/bill/sale_order', //以销定购开关 purchaseBySaleFlag: false, labelCol: { diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index 67fb5176..9190de93 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -268,6 +268,7 @@ remark: "" }, prefixNo: 'XSCK', + urlPath: '/bill/sale_out', //出入库管理开关,适合独立仓管场景 inOutManageFlag: false, labelCol: { diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue index 54b4ee27..722f4f1c 100644 --- a/jshERP-web/src/views/financial/AdvanceInList.vue +++ b/jshERP-web/src/views/financial/AdvanceInList.vue @@ -172,6 +172,7 @@ remark: "" }, prefixNo: 'SYF', + urlPath: '/financial/advance_in', // 表头 columns: [ { diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue index efe72860..f3ad2cf9 100644 --- a/jshERP-web/src/views/financial/GiroList.vue +++ b/jshERP-web/src/views/financial/GiroList.vue @@ -172,6 +172,7 @@ remark: "" }, prefixNo: 'ZZ', + urlPath: '/financial/giro', // 表头 columns: [ { diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue index 03612392..e004fdc1 100644 --- a/jshERP-web/src/views/financial/ItemInList.vue +++ b/jshERP-web/src/views/financial/ItemInList.vue @@ -192,6 +192,7 @@ remark: "" }, prefixNo: 'SR', + urlPath: '/financial/item_in', // 表头 columns: [ { diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue index 6cc6f5f4..b5d4a136 100644 --- a/jshERP-web/src/views/financial/ItemOutList.vue +++ b/jshERP-web/src/views/financial/ItemOutList.vue @@ -192,6 +192,7 @@ remark: "" }, prefixNo: 'ZC', + urlPath: '/financial/item_out', // 表头 columns: [ { diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue index b9b53a3c..a3051ae5 100644 --- a/jshERP-web/src/views/financial/MoneyInList.vue +++ b/jshERP-web/src/views/financial/MoneyInList.vue @@ -192,6 +192,7 @@ number: "" }, prefixNo: 'SK', + urlPath: '/financial/money_in', // 表头 columns: [ { diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue index 46908995..ab75ca66 100644 --- a/jshERP-web/src/views/financial/MoneyOutList.vue +++ b/jshERP-web/src/views/financial/MoneyOutList.vue @@ -191,6 +191,7 @@ number: "" }, prefixNo: 'FK', + urlPath: '/financial/money_out', // 表头 columns: [ { diff --git a/jshERP-web/src/views/material/MaterialAttributeList.vue b/jshERP-web/src/views/material/MaterialAttributeList.vue index e146e04a..8b915a85 100644 --- a/jshERP-web/src/views/material/MaterialAttributeList.vue +++ b/jshERP-web/src/views/material/MaterialAttributeList.vue @@ -89,6 +89,7 @@ attributeName:'', attributeValue:'' }, + urlPath: '/material/material_attribute', // 表头 columns: [ { diff --git a/jshERP-web/src/views/material/MaterialCategoryList.vue b/jshERP-web/src/views/material/MaterialCategoryList.vue index 3afab4f5..de17fb7f 100644 --- a/jshERP-web/src/views/material/MaterialCategoryList.vue +++ b/jshERP-web/src/views/material/MaterialCategoryList.vue @@ -130,6 +130,7 @@ export default { allTreeKeys:[], checkStrictly: true, form: this.$form.createForm(this), + urlPath: '/material/material_category', labelCol: { xs: {span: 24}, sm: {span: 5} diff --git a/jshERP-web/src/views/material/MaterialList.vue b/jshERP-web/src/views/material/MaterialList.vue index 4882e0f3..03e7581d 100644 --- a/jshERP-web/src/views/material/MaterialList.vue +++ b/jshERP-web/src/views/material/MaterialList.vue @@ -279,6 +279,7 @@ remark:'', mpList: getMpListShort(Vue.ls.get('materialPropertyList')) //扩展属性 }, + urlPath: '/material/material', ipagination:{ pageSizeOptions: ['10', '20', '30', '50', '100', '200'] }, diff --git a/jshERP-web/src/views/material/MaterialPropertyList.vue b/jshERP-web/src/views/material/MaterialPropertyList.vue index fe5ae967..5341d626 100644 --- a/jshERP-web/src/views/material/MaterialPropertyList.vue +++ b/jshERP-web/src/views/material/MaterialPropertyList.vue @@ -51,6 +51,7 @@ }, // 查询条件 queryParam: {name:'',type:''}, + urlPath: '/material/material_property', // 表头 columns: [ { diff --git a/jshERP-web/src/views/system/AccountList.vue b/jshERP-web/src/views/system/AccountList.vue index cf3c472e..14545d9e 100644 --- a/jshERP-web/src/views/system/AccountList.vue +++ b/jshERP-web/src/views/system/AccountList.vue @@ -106,6 +106,7 @@ }, // 查询条件 queryParam: {name:'',serialNo:'',remark:''}, + urlPath: '/system/account', // 表头 columns: [ { diff --git a/jshERP-web/src/views/system/CustomerList.vue b/jshERP-web/src/views/system/CustomerList.vue index 2a6455f4..a53ca6d9 100644 --- a/jshERP-web/src/views/system/CustomerList.vue +++ b/jshERP-web/src/views/system/CustomerList.vue @@ -128,6 +128,7 @@ telephone:'', phonenum:'' }, + urlPath: '/system/customer', customerFlag: '0', ipagination:{ pageSizeOptions: ['10', '20', '30', '100', '200'] diff --git a/jshERP-web/src/views/system/DepotList.vue b/jshERP-web/src/views/system/DepotList.vue index 6bba02f0..8e03e0c0 100644 --- a/jshERP-web/src/views/system/DepotList.vue +++ b/jshERP-web/src/views/system/DepotList.vue @@ -108,6 +108,7 @@ }, // 查询条件 queryParam: {name:'',remark:''}, + urlPath: '/system/depot', depotFlag: '0', quickBtn: { user: '' diff --git a/jshERP-web/src/views/system/InOutItemList.vue b/jshERP-web/src/views/system/InOutItemList.vue index 47721efd..decfbe16 100644 --- a/jshERP-web/src/views/system/InOutItemList.vue +++ b/jshERP-web/src/views/system/InOutItemList.vue @@ -100,6 +100,7 @@ }, // 查询条件 queryParam: {name:'',type:'',remark:''}, + urlPath: '/system/in_out_item', // 表头 columns: [ { diff --git a/jshERP-web/src/views/system/MemberList.vue b/jshERP-web/src/views/system/MemberList.vue index 30cd98ca..c40a2a48 100644 --- a/jshERP-web/src/views/system/MemberList.vue +++ b/jshERP-web/src/views/system/MemberList.vue @@ -122,6 +122,7 @@ telephone:'', phonenum:'' }, + urlPath: '/system/member', ipagination:{ pageSizeOptions: ['10', '20', '30', '100', '200'] }, diff --git a/jshERP-web/src/views/system/OrganizationList.vue b/jshERP-web/src/views/system/OrganizationList.vue index 8770ae7c..80ab2d94 100644 --- a/jshERP-web/src/views/system/OrganizationList.vue +++ b/jshERP-web/src/views/system/OrganizationList.vue @@ -132,6 +132,7 @@ export default { allTreeKeys:[], checkStrictly: true, form: this.$form.createForm(this), + urlPath: '/system/organization', labelCol: { xs: {span: 24}, sm: {span: 5} diff --git a/jshERP-web/src/views/system/PersonList.vue b/jshERP-web/src/views/system/PersonList.vue index 5d9a52a8..f0d518c5 100644 --- a/jshERP-web/src/views/system/PersonList.vue +++ b/jshERP-web/src/views/system/PersonList.vue @@ -95,6 +95,7 @@ }, // 查询条件 queryParam: {name:'',type:''}, + urlPath: '/system/person', // 表头 columns: [ { diff --git a/jshERP-web/src/views/system/RoleList.vue b/jshERP-web/src/views/system/RoleList.vue index 695e9636..2e3a1f9a 100644 --- a/jshERP-web/src/views/system/RoleList.vue +++ b/jshERP-web/src/views/system/RoleList.vue @@ -127,6 +127,7 @@ name: '', description: '', }, + urlPath: '/system/role', // 表头 columns: [ { diff --git a/jshERP-web/src/views/system/UnitList.vue b/jshERP-web/src/views/system/UnitList.vue index 86d366cc..d14118c6 100644 --- a/jshERP-web/src/views/system/UnitList.vue +++ b/jshERP-web/src/views/system/UnitList.vue @@ -86,6 +86,7 @@ }, // 查询条件 queryParam: {name:'',type:''}, + urlPath: '/system/unit', // 表头 columns: [ { diff --git a/jshERP-web/src/views/system/UserList.vue b/jshERP-web/src/views/system/UserList.vue index 0026fca2..28d71239 100644 --- a/jshERP-web/src/views/system/UserList.vue +++ b/jshERP-web/src/views/system/UserList.vue @@ -104,6 +104,7 @@ offset: 1 }, queryParam: {}, + urlPath: '/system/user', depotFlag: '0', customerFlag: '0', columns: [ diff --git a/jshERP-web/src/views/system/VendorList.vue b/jshERP-web/src/views/system/VendorList.vue index ba9c4cb8..cc0efa09 100644 --- a/jshERP-web/src/views/system/VendorList.vue +++ b/jshERP-web/src/views/system/VendorList.vue @@ -121,6 +121,7 @@ telephone:'', phonenum:'' }, + urlPath: '/system/vendor', ipagination:{ pageSizeOptions: ['10', '20', '30', '100', '200'] },