diff --git a/src/views/modules/eam/eamFamily.vue b/src/views/modules/eam/eamFamily.vue
index 8783a16..ce8194a 100644
--- a/src/views/modules/eam/eamFamily.vue
+++ b/src/views/modules/eam/eamFamily.vue
@@ -586,7 +586,7 @@ export default {
     updateModal (row) {
       this.modalData = {
         flag:'2',
-        bu: row.site + '-' + row.buNo,
+        bu: row.site + '_' + row.buNo,
         site: row.site,
         familyID:row.familyID,
         familyDesc:row.familyDesc,
diff --git a/src/views/modules/eam/eamMaintenanceModel.vue b/src/views/modules/eam/eamMaintenanceModel.vue
index 1b84b31..bdc2dd5 100644
--- a/src/views/modules/eam/eamMaintenanceModel.vue
+++ b/src/views/modules/eam/eamMaintenanceModel.vue
@@ -422,7 +422,6 @@
           userName: this.$store.state.user.name,
           codeNo: '',
           codeDesc: '',
-          active: '',
           active:'Y',
           functionType:'B',
           isUse: '',
@@ -1000,6 +999,7 @@
         this.modalData = {
           site: this.$store.state.user.site,
           flag: '2',
+          bu: row.site + '_' + row.buNo,
           codeNo: row.codeNo,
           codeDesc: row.codeDesc,
           active: row.active,
diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index 1d9a5b3..ff436bb 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -82,7 +82,9 @@ export default {
   },
 
   methods: {
-    init(id) {
+    init(row) {
+      // this.dataForm.roleName = row.roleName
+      let id = row ? row.roleId : 0
       this.getFunctionButtonList()
       this.dataForm.id = id || 0
       this.$http({
diff --git a/src/views/modules/sys/role.vue b/src/views/modules/sys/role.vue
index 7e4b5d0..c4fffa6 100644
--- a/src/views/modules/sys/role.vue
+++ b/src/views/modules/sys/role.vue
@@ -11,7 +11,7 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="getDataList()">{{buttons.search ||'查询' }}</el-button>
-        <el-button v-if="isAuth('sys:role:save')" type="primary" @click="addOrUpdateHandle()"> {{buttons.add|| '新增'}}</el-button>
+        <el-button type="primary" @click="addOrUpdateHandle()"> {{buttons.add|| '新增'}}</el-button>
      </el-form-item>
     </el-form>
     <el-table
@@ -47,11 +47,13 @@
         :label="buttons.cz||'操作'">
         <template slot-scope="scope">
           <a v-if="!adminUser && scope.row.roleName === '系统管理员'" type="text" size="small" style="pointer-events:none;color: #8a979e">{{ buttons.edit || '修改' }}</a>
-          <a v-if="!adminUser && scope.row.roleName !== '系统管理员'" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">{{ buttons.edit || '修改' }}</a>
-          <a v-if="adminUser" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">{{ buttons.edit || '修改' }}</a>
+          <a v-if="!adminUser && scope.row.roleName !== '系统管理员'" type="text" size="small" @click="addOrUpdateHandle(scope.row)">{{ buttons.edit || '修改' }}</a>
+<!--          <a v-if="adminUser" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">{{ buttons.edit || '修改' }}</a>-->
           <a v-if="!adminUser && scope.row.roleName === '系统管理员'" type="text" size="small" style="pointer-events:none;color: #8a979e">{{ buttons.delete || '删除' }}</a>
-          <a v-if="!adminUser && scope.row.roleName !== '系统管理员'" type="text" size="small" @click="deleteHandle(scope.row.userId)">{{ buttons.delete || '删除' }}</a>
-          <a v-if="adminUser" type="text" size="small" @click="deleteHandle(scope.row.userId)">{{ buttons.delete || '删除' }}</a>
+          <a v-if="!adminUser && scope.row.roleName !== '系统管理员'" type="text" size="small" @click="deleteHandle(scope.row.roleId)">{{ buttons.delete || '删除' }}</a>
+<!--          <a v-if="adminUser" type="text" size="small" @click="deleteHandle(scope.row.userId)">{{ buttons.delete || '删除' }}</a>-->
+          <a v-if="isAuth('sys:role:update') && adminUser" type="text" size="small" @click="addOrUpdateHandle(scope.row)">{{buttons.edit||'修改'}}</a>
+          <a v-if="isAuth('sys:role:delete') && adminUser" type="text" size="small" @click="deleteHandle(scope.row.roleId)">{{buttons.delete|| '删除'}}</a>
 <!--          <a type="text" size="small" @click="showAuthCustomerReportModal(scope.row)">{{buttons.reportRole || '报表赋权'}}</a>-->
         </template>
       </el-table-column>
@@ -86,6 +88,7 @@ import {
   import authCustomerReport from '../report/com_auth_customer_report' /**/
 
 import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
+import row from "element-ui/packages/row";
 
   export default {
     data () {
@@ -229,10 +232,11 @@ import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/user
         this.dataListSelections = val
       },
       // 新增 / 修改
-      addOrUpdateHandle (id) {
+      addOrUpdateHandle (row) {
+
         this.addOrUpdateVisible = true
         this.$nextTick(() => {
-          this.$refs.addOrUpdate.init(id)
+          this.$refs.addOrUpdate.init(row)
         })
       },
       // 删除