From a99d46ed527d5851c23d0539cbdfaef568a7888a Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 13 Jul 2022 15:09:19 +0800 Subject: [PATCH 1/3] 11 --- src/views/modules/workSys/role/role.vue | 2 +- src/views/modules/workSys/role/roleForm.vue | 26 ++++----------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue index f61225cd..c6b03d01 100644 --- a/src/views/modules/workSys/role/role.vue +++ b/src/views/modules/workSys/role/role.vue @@ -242,7 +242,7 @@ export default { }, diaClose () { - this.$refs.ref_form.resetData() + this.formShow = false }, diff --git a/src/views/modules/workSys/role/roleForm.vue b/src/views/modules/workSys/role/roleForm.vue index c7b4f185..753a1ce0 100644 --- a/src/views/modules/workSys/role/roleForm.vue +++ b/src/views/modules/workSys/role/roleForm.vue @@ -126,7 +126,7 @@ export default { await this.getMenuList() await this.getMenuShujuList() - this.$refs['ref_form'].resetFields(); + this.$refs.menuListTree.setCheckedKeys([]) this.$refs.menuListShujuTree.setCheckedKeys([]) @@ -297,31 +297,15 @@ export default { }, - - resetData () { this.roleId = '' - this.fileList = [] - this.hideUploadEdit = false this.formData = { - roleId: '', - agencyId: '',//当前网格所属组织Id - userId: '',//居民端小程序的用户id、数字社区的icResiUserId、其他情况无值 - userType: 'icresi',//居民端小程序的人：resi;数字社区的居民：icresi;导入的：import;同步的：synchro + id: '', name: '', - idCard: '', - mobile: '', - natTime: '', - natAddress: '', - natResult: '', - isSelChannel: false, - channel: [], - content: '', - - fileName: '',//附件名 - attachmentType: '',//附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） - attachmentUrl: '',//附件地址 + remark: '',//备注 + menuIdList: [], + customerId: '' } }, From 762773ff4c8e36b188b40a2d46a10df9aac7253d Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 13 Jul 2022 15:11:15 +0800 Subject: [PATCH 2/3] 11 --- src/router/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index a3c1e3f3..ad616091 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -380,7 +380,7 @@ router.beforeEach((to, from, next) => { // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); http - .get("gov/access/menu/navDigitalCommunity?tableName=data_menu") + .get("/gov/access/menu/nav?tableName=data_menu") .then(({ data: res }) => { if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 @@ -406,7 +406,7 @@ router.beforeEach((to, from, next) => { }); http - .get("gov/access/menu/navDigitalCommunity") + .get("/gov/access/menu/nav") .then(({ data: res }) => { if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 From 6c6eb0a1810ada99a7a2848beb36981b79158670 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 13 Jul 2022 15:13:00 +0800 Subject: [PATCH 3/3] 11 --- src/router/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index ad616091..a3c1e3f3 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -380,7 +380,7 @@ router.beforeEach((to, from, next) => { // fnAddDynamicMenuRoutes2(window.SITE_CONFIG["menuShujuList"]); http - .get("/gov/access/menu/nav?tableName=data_menu") + .get("gov/access/menu/navDigitalCommunity?tableName=data_menu") .then(({ data: res }) => { if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录 @@ -406,7 +406,7 @@ router.beforeEach((to, from, next) => { }); http - .get("/gov/access/menu/nav") + .get("gov/access/menu/navDigitalCommunity") .then(({ data: res }) => { if (res.code == 10005 || res.code == 10006 || res.code == 10007) { // 10005 token为空 10006登陆超时 10007别处登录