diff --git a/src/views/modules/eam/eamWorkPlanForMaintenance.vue b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
index 80cb82a..9f8b231 100644
--- a/src/views/modules/eam/eamWorkPlanForMaintenance.vue
+++ b/src/views/modules/eam/eamWorkPlanForMaintenance.vue
@@ -564,13 +564,23 @@
     </el-dialog>
 
     <!-- 机修人员清单 -->
-    <el-dialog title="执行人员清单" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
+    <el-dialog title="执行人员清单" @close="closeDialog" :close-on-click-modal="false" v-drag :visible.sync="operatorModelFlag" width="820px">
       <div class="rq">
         <el-form :inline="true" label-position="top" :model="operatorData">
-          <el-form-item :label="'人员编码'">
+          <el-form-item :label="'所属角色'">
+          <el-select value="roleName" v-model="operatorData.roleName" clearable placeholder="请选择" style="width: 120px">
+            <el-option
+              v-for = "i in roleList"
+              :key = "i.roleID"
+              :label = "i.roleName"
+              :value = "i.roleName">
+            </el-option>
+          </el-select>
+        </el-form-item>
+          <el-form-item :label="'用户账号'">
             <el-input v-model="operatorData.adminID" style="width: 120px"></el-input>
           </el-form-item>
-          <el-form-item :label="'人员姓名'">
+          <el-form-item :label="'用户名称'">
             <el-input v-model="operatorData.adminName" style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
@@ -781,6 +791,7 @@
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {userFavoriteList, saveUserFavorite, removeUserFavorite} from '@/api/userFavorite.js'
+  import role from "../sys/role.vue";
   export default {
     components: {
       Chooselist
@@ -1414,6 +1425,8 @@
         operatorData: {
           site: '',
           bu: '',
+          roleID: '',
+          roleName: '',
           adminID: '',
           adminName: ''
         },
@@ -1476,7 +1489,7 @@
             columnProp: 'adminID',
             headerAlign: "center",
             align: "center",
-            columnLabel: '编码',
+            columnLabel: '用户账号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1488,31 +1501,7 @@
             columnProp: 'adminName',
             headerAlign: "center",
             align: "center",
-            columnLabel: '名称',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            columnProp: 'phone',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: '手机号',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            columnProp: 'department',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: '部门',
+            columnLabel: '用户名称',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1533,34 +1522,10 @@
             fixed: '',
           },
           {
-            columnProp: 'tel',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: '座机号',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            columnProp: 'adminLevelDesc',
-            headerAlign: "center",
-            align: "center",
-            columnLabel: '等级',
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-          },
-          {
-            columnProp: 'mesUser',
+            columnProp: 'phone',
             headerAlign: "center",
             align: "center",
-            columnLabel: 'MES账号',
+            columnLabel: '手机号',
             columnHidden: false,
             columnImage: false,
             columnSortable: false,
@@ -1569,6 +1534,7 @@
             fixed: '',
           },
         ],
+        roleList: [],
         operatorList: [],
         updateObjectList: [],
         updateDetailData: {
@@ -1783,6 +1749,8 @@
       // 获取机修人员列表
       getOperatorList () {
         this.operatorData.bu = this.modalData.bu
+        this.operatorData.site = this.$store.state.user.site
+        this.getRoleNameList()
         getOperatorList(this.operatorData).then(({data}) => {
           if (data && data.code === 0) {
             this.operatorList = data.rows
@@ -1797,6 +1765,32 @@
         })
       },
 
+      // 获取数据列表
+      getRoleNameList () {
+        this.dataListLoading = true
+        this.$http({
+          url: this.$http.adornUrl('/sys/role/list'),
+          method: 'get',
+          params: this.$http.adornParams({
+            'page': this.pageIndex,
+            'limit': this.pageSize,
+          })
+        }).then(({data}) => {
+          let temp = []
+          if (data && data.code === 0) {
+            this.roleList = data.page.list
+            temp = this.roleList[0]
+            this.roleList[0] = this.roleList[1]
+            this.roleList[1] = temp
+            this.totalPage = data.page.totalCount
+          } else {
+            this.roleList = []
+            this.totalPage = 0
+          }
+          this.dataListLoading = false
+        })
+      },
+
       // 获取审核人员
       getCheckerList () {
         this.checkerData.bu = this.modalData.bu
@@ -2686,6 +2680,15 @@
         })
       },
 
+      closeDialog () {
+        this.operatorData = {
+          site: '',
+          roleName: '',
+          adminName: '',
+          adminID: '',
+        }
+      },
+
       // 获取 tableDefault 列
       async getColumnList(tableId, columnId) {
         let queryTable = {
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index 2f250db..39e6ff3 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -694,7 +694,7 @@ export default {
   },
   computed:{
     adminUser(){
-      return this.$store.state.user.id === 1 || this.$store.state.role.name
+      return this.$store.state.user.id === 1
     }
   },
   methods: {