Merge branch 'dev-role' into dev

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别处登录

src/views/modules/workSys/role/role.vue

@@ -242,7 +242,7 @@ export default {
     },
 
     diaClose () {
-      this.$refs.ref_form.resetData()
+
       this.formShow = false
 
     },

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: ''
 
       }
     },