diff --git a/package.json b/package.json
index 58a4c6b..df20fad 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "gulp-shell": "0.8.0",
     "jspdf": "^2.5.2",
     "lodash": "4.17.5",
-    "mammoth": "^1.8.0",
+    "mammoth": "^1.9.0",
     "moment": "^2.30.1",
     "node-sass": "4.13.1",
     "npm": "^6.14.6",
diff --git a/src/api/base/site.js b/src/api/base/site.js
index 2e32a6d..f961bf5 100644
--- a/src/api/base/site.js
+++ b/src/api/base/site.js
@@ -168,3 +168,6 @@ export const searchAccessBuList = data => createAPI(`/base/searchAccessBuList`,'
 export const saveAccessBU = data => createAPI(`/base/saveAccessBU`,'post',data)
 
 export const saveBusinessRole = data => createAPI(`/base/saveBusinessRole`,'post',data)
+
+
+export const getRoleUserList = data => createAPI(`/base/getRoleUserList`,'post',data)
diff --git a/src/views/modules/sys/role.vue b/src/views/modules/sys/role.vue
index 6337d76..5736caa 100644
--- a/src/views/modules/sys/role.vue
+++ b/src/views/modules/sys/role.vue
@@ -43,9 +43,10 @@
         fixed="right"
         header-align="center"
         align="center"
-        width="150"
+        width="180"
         :label="buttons.cz||'操作'">
         <template slot-scope="scope">
+          <a  type="text" size="small" @click="getRoleUsers(scope.row)">{{'查看用户'}}</a>
           <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)">{{ buttons.edit || '修改' }}</a>
 <!--          <a v-if="adminUser" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">{{ buttons.edit || '修改' }}</a>-->
@@ -77,6 +78,52 @@
 
     </authCustomerReport>
 
+    <el-dialog title="用户列表" :close-on-click-modal="false" v-drag :visible.sync="modalFlag" width="600px">
+      <el-form :inline="true" label-position="top"  style="margin-left: 7px;margin-top: -5px;">
+
+        <el-form-item label="角色名称" >
+            <el-input v-model="modalData.roleName" disabled style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="用户账号" >
+          <el-input v-model="modalData.username"  style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label="用户名" >
+          <el-input v-model="modalData.userDisplay"  style="width: 120px"></el-input>
+        </el-form-item>
+        <el-form-item label=" ">
+          <el-button type="primary" @click="getRoleUserList()">{{'查询' }}</el-button>
+
+        </el-form-item>
+      </el-form>
+      <el-table
+        height="300"
+        :data="modelList"
+        border
+        style="width: 100%;">
+        <el-table-column
+          prop="username"
+          header-align="center"
+          align="center"
+          :label="'用户账号'">
+        </el-table-column>
+        <el-table-column
+          prop="userDisplay"
+          header-align="center"
+          align="center"
+          :label="'用户名'">
+        </el-table-column>
+        <el-table-column
+          prop="workShopName"
+          header-align="center"
+          align="center"
+          :label="'车间'">
+        </el-table-column>
+      </el-table>
+      <el-footer style="height:40px;margin-top: 10px;text-align:center">
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -86,6 +133,10 @@ import {
   searchFunctionButtonList,
   saveButtonList,
 } from "@/api/sysLanguage.js"
+
+import {
+  getRoleUserList
+} from "@/api/base/site.js"
   import AddOrUpdate from './role-add-or-update'
   import authCustomerReport from '../report/com_auth_customer_report' /**/
 
@@ -124,6 +175,14 @@ import row from "element-ui/packages/row";
         authUpdate: false,
         authDelete: false,
         menuId: this.$route.meta.menuId,
+        modalFlag:false,
+        modalData:{
+          roleId:'',
+          roleName:'',
+          username:'',
+          userDisplay:'',
+        },
+        modelList:[],
       }
     },
     components: {
@@ -288,6 +347,22 @@ import row from "element-ui/packages/row";
         this.authUpdate = !updateFlag
         this.authDelete = !deleteFlag
       },
+      getRoleUsers(row){
+        this.modalData.roleId=row.roleId
+        this.modalData.roleName=row.roleName
+        this.modalData.username='';
+        this.modalData.userDisplay='';
+        this.getRoleUserList()
+        this.modalFlag=true
+      },
+      getRoleUserList(){
+        getRoleUserList(this.modalData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.modelList=data.rows
+
+          }
+        })
+      },
     },
     created () {
       this.getFunctionButtonList()