From cf886b1e9b0977cfc87ed2fd8342791091922ddc Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Wed, 31 Jul 2024 10:49:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E3=80=81=E7=99=BB=E5=BD=95=E3=80=81=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E3=80=81=E8=A7=92=E8=89=B2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Sidebar/index.vue | 21 ++++++- src/views/login/login.vue | 4 ++ src/views/purchase/purchaseOrder/index.vue | 22 +++++-- src/views/purchase/purchaseReview/index.vue | 21 ++++++- src/views/system/menuManage/menuManage.vue | 62 ++++++++++++++++--- .../system/roleAdminister/roleAdminister.vue | 22 +++++-- 6 files changed, 133 insertions(+), 19 deletions(-) diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index d2198e4..65576f2 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -47,15 +47,34 @@ // return this.$router.options.routes // }, activeMenu() { + // console.log('aaaaaaaaaaa', this.$route) + // console.log("val>>>>>>>>>>>>>>>>.", this.$route.query.index); // 页面获取 + // this.$route.query.index = [{ + // sid: '11', + // name: "ssss" + // }, { + // sid: '22', + // name: "aaa" + // }, { + // sid: '33', + // name: "bbb" + // }] const route = this.$route const { meta, - path + path, + // query, } = route + + // this.$route.query = { + // index: '1' + // } + // if set path, the sidebar will highlight the path you set if (meta.activeMenu) { return meta.activeMenu } + // console.log('bbbbbbb', path) return path }, showLogo() { diff --git a/src/views/login/login.vue b/src/views/login/login.vue index 2bbdf68..93fe65a 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -529,6 +529,8 @@ window.sessionStorage.setItem('defaultOrgPathName', response.data.defaultOrgPathName) window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data .pNameAndDepartmentNameAndPostName) + } else { + loading.close() } }).catch(() => { @@ -578,6 +580,8 @@ window.sessionStorage.setItem('defaultOrgPathName', response.data.defaultOrgPathName) window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data .pNameAndDepartmentNameAndPostName) + } else { + loading.close() } }).catch(() => { diff --git a/src/views/purchase/purchaseOrder/index.vue b/src/views/purchase/purchaseOrder/index.vue index cb70117..312b696 100644 --- a/src/views/purchase/purchaseOrder/index.vue +++ b/src/views/purchase/purchaseOrder/index.vue @@ -105,7 +105,8 @@ - + + @@ -644,8 +645,21 @@ toSubmit() { if (this.sids.length > 0) { + for (var i = 0; i < this.selectionList.length; i++) { + var item = this.selectionList[i] + + if (item.state != "未审核") { + this.$message({ + type: 'warning', + showClose: true, + message: '请勿选择已提交的记录进行操作' + }) + return + } + + } + req.submit(this.sids).then((resp) => { - loading.close() if (resp.success) { this.$message({ type: 'success', @@ -656,9 +670,7 @@ } else { // 根据resp.code进行异常情况处理 } - }).catch(e => { - loading.close() - }) + }).catch(e => {}) } else { this.$message({ diff --git a/src/views/purchase/purchaseReview/index.vue b/src/views/purchase/purchaseReview/index.vue index edf3704..ee6751a 100644 --- a/src/views/purchase/purchaseReview/index.vue +++ b/src/views/purchase/purchaseReview/index.vue @@ -205,7 +205,7 @@ - + @@ -615,6 +615,22 @@ }, toSubmit() { if (this.sids.length > 0) { + + for (var i = 0; i < this.selectionList.length; i++) { + var item = this.selectionList[i] + + if (item.state != "审核中") { + this.$message({ + type: 'warning', + showClose: true, + message: '请勿选择已审核的记录进行操作' + }) + return + } + + } + + this.dialogVisible = true } else { this.$message({ @@ -710,6 +726,9 @@ } }).catch(e => {}) + }, + handleDialogClose() { + this.dialogVisible = false } } diff --git a/src/views/system/menuManage/menuManage.vue b/src/views/system/menuManage/menuManage.vue index af7e52e..2753ff3 100644 --- a/src/views/system/menuManage/menuManage.vue +++ b/src/views/system/menuManage/menuManage.vue @@ -142,6 +142,12 @@ + + 按钮Key + + + + 权限标识 @@ -258,10 +264,16 @@ + + 按钮Key + + + + 权限标识 - + @@ -336,9 +348,10 @@ remarks: '', sortNo: 0, cid: '', + btnKey: "", sourceName: 'wms', phoneFunction: "0", - sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33' + sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44' }, tableData: [], page: { @@ -349,7 +362,7 @@ name: '', psid: '', sourceName: 'wms', - sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33' + sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44' } }, rank: '1', @@ -414,10 +427,16 @@ menuTypeChangeRadio(val) { console.log('menuTypeChangeRadio', val) + if (val != '2') { + this.form.btnKey = "" + } this.form.menuType = val }, menuTypeChangeRadio2(val) { console.log('menuTypeChangeRadio2', val) + if (val != '2') { + this.form.btnKey = "" + } this.form.menuType = val }, changeRadio(val) { @@ -446,6 +465,7 @@ }, getPageList() { // 获取列表 this.loading = true + this.page.params.orgSid = window.sessionStorage.getItem('orgSid') pageList(this.page).then((res) => { this.loading = false console.log('这里是条件查询', this.page) @@ -467,12 +487,13 @@ }, handleClick(tab, event) { if (tab.name == 'addrole') { + this.form = {} this.dialogTitle = '新增' this.form.isShow = '1' this.form.menuType = '0' // this.form.psid = row.sid || 0 this.form.sourceName = 'wms' - this.form.sourceSid = 'd936f1ba-03c3-11ec-bf08-48452053aa33' + this.form.sourceSid = 'd936f1ba-03c3-11ec-bf08-48452053aa44' this.form.pname = '' this.form.psid = '0' // this.sourceMenus() @@ -492,8 +513,8 @@ this.form.isShow = '1' this.form.menuType = '0' // this.form.psid = row.sid || 0 - this.form.pname = '' - this.form.psid = '' + this.form.pname = row.name + this.form.psid = row.sid this.form.sourceName = row.sourceName this.form.sourceSid = row.sourceSid if (row.isSource == '1') { @@ -501,6 +522,10 @@ } else { this.form.psid = row.sid } + let arr = [] + arr = [row.sid]; + this.$refs.Tree.setCheckedKeys(arr); + }, editRow(row) { console.log("editRow", row); @@ -510,11 +535,34 @@ this.editShow = this.form.isShow this.editMenuType = this.form.menuType + let arr = [] + arr = [row.sid]; + this.$refs.Tree.setCheckedKeys(arr); // this.form.isShow = 1 this.form.pname = row.psid == '0' ? '顶级菜单' : row.pname }, save() { + if (this.form.name == '') { + this.$message({ + message: '菜单名称不能为空', + type: 'warning' + }) + return + } + + if (this.form.menuType == '2') { + + if (this.form.btnKey == '') { + this.$message({ + message: '按钮Key不能为空', + type: 'warning' + }) + return + } + + } + if (this.form.sid) { putMenusInfo(this.form).then(res => { this.editDialog = false @@ -556,7 +604,7 @@ sortNo: 0, sourceName: 'wms', phoneFunction: "0", - sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33' + sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa44' } }, deleteRow(row) { diff --git a/src/views/system/roleAdminister/roleAdminister.vue b/src/views/system/roleAdminister/roleAdminister.vue index 9c9305e..d73d71b 100644 --- a/src/views/system/roleAdminister/roleAdminister.vue +++ b/src/views/system/roleAdminister/roleAdminister.vue @@ -212,14 +212,18 @@ - + @@ -227,7 +231,8 @@ @@ -235,7 +240,7 @@
角色名称 - +
+ + 父子级联动 +
+
+ :default-checked-keys="checkedId" :props="defaultProps" @check-change="checkchange" + :check-strictly="!checkStrictly">
保 存 - 关 闭 + 关 闭