diff --git a/src/views/baseInfo/supplier/supplier/supplierAdd.vue b/src/views/baseInfo/supplier/supplier/supplierAdd.vue index 217f842..5f529a8 100644 --- a/src/views/baseInfo/supplier/supplier/supplierAdd.vue +++ b/src/views/baseInfo/supplier/supplier/supplierAdd.vue @@ -14,61 +14,108 @@
*供应商名称
- +
*供应商简称
- +
*供应商编码
- +
*供应商类型
- - + +
*供应商电话
- +
传真
- +
详细地址
-
- +
+ - + - + - +
@@ -76,79 +123,131 @@
联系人
- +
联系电话
- - - + +
邮编
- +
电子邮件
- +
网址
- +
*开票公司名称
- +
税号
- +
法人
- +
采购员
- +
*开票类型
- - + +
*税率
- +
备注
- +
@@ -235,14 +334,14 @@ sortNo: '', billingTypeKey: '', billingTypeValue: '', - useOrgSid: '', createOrgName: '', createOrgSid: '', taxRate: '', remarks: '', baseSupplierBankList: [], orgPath: window.sessionStorage.getItem('defaultDeptSid'), - userSid: window.sessionStorage.getItem('userSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), + userSid: window.sessionStorage.getItem('userSid') }, rules: { supplierName: [{ @@ -303,7 +402,7 @@ } }) req.selSupplierType({ - orgPath: window.sessionStorage.getItem('defaultOrgPath') + orgPath: window.sessionStorage.getItem('orgSid') }).then((res) => { if (res.success) { this.supplierType_list = res.data @@ -505,14 +604,14 @@ sortNo: '', billingTypeKey: '', billingTypeValue: '', - useOrgSid: '', createOrgName: '', createOrgSid: '', taxRate: '', remarks: '', baseSupplierBankList: [], orgPath: window.sessionStorage.getItem('defaultDeptSid'), - userSid: window.sessionStorage.getItem('userSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), + userSid: window.sessionStorage.getItem('userSid') } this.submitdisabled = false this.$emit('doback') diff --git a/src/views/baseInfo/supplier/suppliertype/suppliertype.vue b/src/views/baseInfo/supplier/suppliertype/suppliertype.vue index 3bb76ee..44da114 100644 --- a/src/views/baseInfo/supplier/suppliertype/suppliertype.vue +++ b/src/views/baseInfo/supplier/suppliertype/suppliertype.vue @@ -138,6 +138,7 @@ supplierTypeName: '', supplierTypeCode: '', orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), } } @@ -232,6 +233,7 @@ supplierTypeName: '', supplierTypeCode: '', orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), } }, @@ -242,6 +244,7 @@ supplierTypeName: row.supplierTypeName, supplierTypeCode: row.supplierTypeCode, orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), } }, @@ -255,6 +258,7 @@ return } this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.formobj.orgSid = window.sessionStorage.getItem('orgSid') req.saveOrUpdate(this.formobj).then((res) => { if (res.success) { this.dialogVisible = false diff --git a/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue b/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue index a75b665..e3a3e9d 100644 --- a/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue +++ b/src/views/baseInfo/warehouses/goodsShelves/goodsShelvesAdd.vue @@ -70,6 +70,7 @@ locationSid: '', remarks: '', orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), }, warehouseList: [], @@ -123,6 +124,7 @@ locationSid: '', remarks: '', orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), } this.$emit('doback') diff --git a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue index 0e474d5..c9c93e1 100644 --- a/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue +++ b/src/views/baseInfo/warehouses/warehouse/warehouseAdd.vue @@ -106,6 +106,7 @@ remarks: '', warehouseType: "0", orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), }, } @@ -151,6 +152,7 @@ remarks: '', warehouseType: "0", orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), } this.$emit('doback') diff --git a/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue b/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue index ee9460f..ed8a633 100644 --- a/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue +++ b/src/views/baseInfo/warehouses/warehouseArea/warehouseAreaAdd.vue @@ -82,6 +82,7 @@ areaTypeSid: "", areaTypeName: "", orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), }, warehouseList: [], @@ -135,6 +136,7 @@ areaTypeSid: "", areaTypeName: "", orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), } diff --git a/src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue b/src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue index d883f28..614d3ee 100644 --- a/src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue +++ b/src/views/baseInfo/warehouses/warehouseAreaType/warehouseAreaTypeAdd.vue @@ -45,6 +45,7 @@ warehouseAreaTypeName: '', remarks: '', orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), }, @@ -76,8 +77,8 @@ warehouseAreaTypeName: '', remarks: '', orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), - } this.$emit('doback') }, diff --git a/src/views/goods/brands/brandsAdd.vue b/src/views/goods/brands/brandsAdd.vue index 2c1cf74..a7faa0c 100644 --- a/src/views/goods/brands/brandsAdd.vue +++ b/src/views/goods/brands/brandsAdd.vue @@ -122,8 +122,8 @@ letter: '', image: "", orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), - }, hideUploadBtn: false, hideUploadBtn2: false, @@ -229,6 +229,7 @@ letter: '', image: "", orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), } this.$emit('doback') diff --git a/src/views/goods/category/categoryAdd.vue b/src/views/goods/category/categoryAdd.vue index 24a5ce8..0c66349 100644 --- a/src/views/goods/category/categoryAdd.vue +++ b/src/views/goods/category/categoryAdd.vue @@ -174,8 +174,8 @@ sortNo: '', remarks: '', orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), - }, goodsTypeList: [], outStockRuleList: [], @@ -302,6 +302,7 @@ sortNo: '', remarks: '', orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), } this.$emit('doback') diff --git a/src/views/goods/factory/factoryAdd.vue b/src/views/goods/factory/factoryAdd.vue index e519e4d..e574993 100644 --- a/src/views/goods/factory/factoryAdd.vue +++ b/src/views/goods/factory/factoryAdd.vue @@ -95,6 +95,7 @@ sortNo: '', remarks: "", orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), }, rules: { @@ -179,6 +180,7 @@ sortNo: '', remarks: "", orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), } this.$emit('doback') diff --git a/src/views/goods/goods/goodsAdd.vue b/src/views/goods/goods/goodsAdd.vue index 69bbd90..269a98b 100644 --- a/src/views/goods/goods/goodsAdd.vue +++ b/src/views/goods/goods/goodsAdd.vue @@ -792,6 +792,7 @@ }, baseGoodsSkus: [], orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), }, brandList: [], @@ -881,6 +882,7 @@ }, baseGoodsSkus: [], orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), } this.$emit('doback') diff --git a/src/views/goods/unit/unitAdd.vue b/src/views/goods/unit/unitAdd.vue index 72cfc7f..b36ab52 100644 --- a/src/views/goods/unit/unitAdd.vue +++ b/src/views/goods/unit/unitAdd.vue @@ -63,6 +63,7 @@ unitName: '', remarks: '', orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), }, rules: { @@ -118,6 +119,7 @@ unitName: '', remarks: '', orgPath: window.sessionStorage.getItem('defaultDeptSid'), + useOrgSid: window.sessionStorage.getItem('defaultDeptSid'), userSid: window.sessionStorage.getItem('userSid'), } this.$emit('doback') diff --git a/src/views/system/menuManage/menuManage.vue b/src/views/system/menuManage/menuManage.vue index 81426bf..b6572a6 100644 --- a/src/views/system/menuManage/menuManage.vue +++ b/src/views/system/menuManage/menuManage.vue @@ -62,14 +62,18 @@ --> - - - + + + + + + +
@@ -77,16 +81,35 @@ - + + + + + + + - --> + - + @@ -96,36 +119,41 @@ - + - + + + + + - + - - + + - + @@ -158,7 +186,7 @@ - +
资源名称类型分类 - + + 目录 + 菜单 + 按钮 +
菜单路由路由路径
菜单图片路径路由名称 + +
菜单图片
前端页面名称组件路径
前端页面路径
权限标识 - +
类型分类是否手机端权限 - - 目录 - 菜单 - 按钮 + + 否 + 是
@@ -174,6 +202,32 @@ + + + + + + + + - + + + + + - + - + - - + + - + @@ -251,7 +310,8 @@ saveMenusInfo, putMenusInfo, delMenus, - IsEnable + IsEnable, + sourceMenuTree, } from '@/api/system/menu/index.js' export default { @@ -263,7 +323,7 @@ dialogTitle: '', checked: '', form: { - pname: '顶级菜单', + pname: '', iconUrl: '', isShow: '1', menuName: '', @@ -275,10 +335,11 @@ psid: '', remarks: '', sortNo: 0, + cid: '', sourceName: 'wms', + phoneFunction: "0", sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33' }, - formBackup: Object.assign({}, this.form), tableData: [], page: { current: 1, @@ -296,8 +357,18 @@ isadd: false, editShow: '1', addShow: '1', - addMenuType: '1', - editMenuType: '1', + addMenuType: '0', + editMenuType: '0', + addPhoneFunction: "0", + editPhoneFunction: "0", + // 树形 + loading: false, + defaultProps: { + children: 'children', + label: 'name' + }, + checkedId: [], // 菜单授权 已选中 + treedata: [], // 菜单授权 } }, mounted() { @@ -309,6 +380,31 @@ // }) }, methods: { + departmentClick(data) { + console.log("departmentClick", data); + this.form.psid = data.sid + this.form.pname = data.name + this.$refs.Tree.visible = false + }, + checkchange(data, checked) { + console.log("checkchange", data); + console.log("checkchange", checked); + if (checked) { + this.form.psid = data.sid + this.form.pname = data.name + + let arr = [] + arr = [data.sid]; + this.$refs.Tree.setCheckedKeys(arr); + + console.log("checkchange", this.form.pname); + console.log("checkchange", this.form.psid); + + return; + } + + }, + menuTypeChangeRadio(val) { console.log('menuTypeChangeRadio', val) this.form.menuType = val @@ -325,6 +421,14 @@ console.log('changeRadio2', val) this.form.isShow = val }, + changeRadio3(val) { + console.log('changeRadio', val) + this.form.phoneFunction = val + }, + changeRadio4(val) { + console.log('changeRadio2', val) + this.form.phoneFunction = val + }, pagination(val) { // 分页 this.page.current = val.pageNum this.page.size = val.pageSize @@ -341,12 +445,14 @@ const treedata = res.data console.log('菜单列表', res) this.tableData = treedata + this.treedata = treedata this.page.total = res.data.total }) }, // 资源名称 getsourceList() { const params = {} + console.log() sourceList(params).then(res => { this.sourceNameData = res.data this.loading = false @@ -355,14 +461,14 @@ handleClick(tab, event) { if (tab.name == 'addrole') { this.dialogTitle = '新增' - this.form = Object.assign({}, this.formBackup) this.form.isShow = '1' - this.form.menuType = '1' + this.form.menuType = '0' // this.form.psid = row.sid || 0 - this.form.pname = '顶级菜单' this.form.sourceName = 'wms' this.form.sourceSid = 'd936f1ba-03c3-11ec-bf08-48452053aa33' - this.form.psid = 0 + this.form.pname = '' + this.form.psid = '0' + // this.sourceMenus() } else { this.getPageList() } @@ -376,11 +482,11 @@ // } // this.dialogTitle = '新增' // this.editDialog = true - this.form = Object.assign({}, this.formBackup) this.form.isShow = '1' - this.form.menuType = '1' + this.form.menuType = '0' // this.form.psid = row.sid || 0 - this.form.pname = row.name || '顶级菜单' + this.form.pname = '' + this.form.psid = '' this.form.sourceName = row.sourceName this.form.sourceSid = row.sourceSid if (row.isSource == '1') { @@ -406,6 +512,7 @@ putMenusInfo(this.form).then(res => { this.editDialog = false this.getPageList() + this.rest() this.$message({ message: res.msg, type: 'success' @@ -415,12 +522,35 @@ saveMenusInfo(this.form).then(res => { this.activeName = 'roleList' this.getPageList() + this.rest() this.$message({ message: res.msg, type: 'success' }) }) } + + }, + + rest() { + this.form = { + pname: '', + iconUrl: '', + isShow: '1', + menuName: '', + menuUrl: '', + pageAliasName: '', + pageName: '', + pageUrl: '', + pageUrlRedirect: '', + psid: '', + remarks: '', + cid: '', + sortNo: 0, + sourceName: 'wms', + phoneFunction: "0", + sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33' + } }, deleteRow(row) { this.$confirm('确定要删除该菜单吗, 是否继续?', '提示', { diff --git a/src/views/system/userManage/userManageAdd.vue b/src/views/system/userManage/userManageAdd.vue index 07bc5e5..261b2ed 100644 --- a/src/views/system/userManage/userManageAdd.vue +++ b/src/views/system/userManage/userManageAdd.vue @@ -114,7 +114,9 @@ }, methods: { getRoleList() { - var param = {} + var param = { + orgSid: window.sessionStorage.getItem('orgSid') + } roleList(param).then(res => { if (res.code === '200') { this.roleListAll = res.data diff --git a/src/views/system/userManage/userManageList.vue b/src/views/system/userManage/userManageList.vue index 48d124c..fd87af0 100644 --- a/src/views/system/userManage/userManageList.vue +++ b/src/views/system/userManage/userManageList.vue @@ -384,7 +384,9 @@ this.getOrgUserList() }, getRoleList() { - var param = {} + var param = { + orgSid: window.sessionStorage.getItem('orgSid') + } roleList(param).then(res => { if (res.code === '200') { this.roleListAll = res.data
上级菜单 + + + + + + + +
类型分类 + + 目录 + 菜单 + 按钮 + +
菜单名称 @@ -181,36 +235,41 @@
菜单路由路由路径 + +
路由名称
菜单图片路径菜单图片
前端页面名称组件路径
前端页面路径
权限标识 - +
类型分类是否手机端权限 - - 目录 - 菜单 - 按钮 + + 否 + 是