diff --git a/src/api/base/field.js b/src/api/base/field.js
index c59fe45..800984a 100644
--- a/src/api/base/field.js
+++ b/src/api/base/field.js
@@ -7,3 +7,4 @@ export const searchAccessFieldListForField= data => createAPI(`/base/searchAcces
 export const saveAccessFieldForField= data => createAPI(`/base/saveAccessFieldForField`,'post',data)
 export const searchAccessFieldListByUser= data => createAPI(`/base/searchAccessFieldListByUser`,'post',data)
 export const saveAccessFieldListByUser= data => createAPI(`/base/saveAccessFieldListByUser`,'post',data)
+export const getUserAccessFieldFunctionInfoList= data => createAPI(`/base/getUserAccessFieldFunctionInfoList`,'post',data)
diff --git a/src/api/base/site.js b/src/api/base/site.js
index 309949d..90f15fe 100644
--- a/src/api/base/site.js
+++ b/src/api/base/site.js
@@ -50,3 +50,18 @@ export const saveAccessProject= data => createAPI(`/base/saveAccessProject`,'pos
 export const searchAccessSiteListBySite= data => createAPI(`/base/searchAccessSiteListBySite`,'post',data)
 
 export const  saveAccessSiteForSite= data => createAPI(`/base/saveAccessSiteForSite`,'post',data)
+
+// 获取用户工厂权限信息
+export const getUserAccessSiteInfoList = data => createAPI(`/base/getUserAccessSiteInfoList`,'post',data)
+
+// 获取用户BU权限信息
+export const getUserAccessBUInfoList = data => createAPI(`/base/getUserAccessBUInfoList`,'post',data)
+
+// 获取用户项目权限信息
+export const getUserAccessProjectInfoList = data => createAPI(`/base/getUserAccessProjectInfoList`,'post',data)
+
+export const getSiteList = data => createAPI(`/base/getSiteList`,'post',data)
+
+export const getDepartmentList = data => createAPI(`/base/getDepartmentList`,'post',data)
+
+export const getPostList = data => createAPI(`/base/getPostList`,'post',data)
diff --git a/src/api/user.js b/src/api/user.js
index 3246cec..fbad7aa 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -7,3 +7,7 @@ export const updateUserLanguage = data => createAPI(`sys/user/updateUserLanguage
 
 // 获取用户列表
 export const userList = data => createAPI(`sys/user/userList`,'Post',data)
+
+export const searchUserJobList = data => createAPI(`sys/userJob/searchUserJobList`,'Post',data)
+
+export const editUserJobInfo = data => createAPI(`sys/userJob/editUserJobInfo`,'Post',data)
diff --git a/src/views/modules/sys/role-add-or-update.vue b/src/views/modules/sys/role-add-or-update.vue
index 1d9a5b3..2926c46 100644
--- a/src/views/modules/sys/role-add-or-update.vue
+++ b/src/views/modules/sys/role-add-or-update.vue
@@ -6,12 +6,12 @@
     :close-on-click-modal="false"
     :visible.sync="visible">
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
-             label-width="80px">
-      <el-form-item :label="buttons.roleName||'角色名称'" prop="roleName">
-        <el-input style="width: 150px" v-model="dataForm.roleName"></el-input>
+             label-width="81px">
+      <el-form-item :label="buttons.roleName||'权限集名称'" prop="roleName">
+        <el-input style="width: 150px;margin-top: 3px" v-model="dataForm.roleName"></el-input>
       </el-form-item>
       <el-form-item :label="buttons.remark||'备注'" prop="remark">
-        <el-input style="width: 150px" v-model="dataForm.remark" placeholder="备注"></el-input>
+        <el-input style="width: 150px;margin-top: 3px" v-model="dataForm.remark" placeholder="备注"></el-input>
       </el-form-item>
       <el-form-item size="mini" :label="buttons.authorize||'授权'">
         <el-row>
@@ -64,7 +64,7 @@ export default {
         add: '添加',
         edit: '编辑',
         authorize: '授权',
-        roleName: '角色名称',
+        roleName: '权限集名称',
         remark: '备注',
       },
       dataForm: {
@@ -74,7 +74,7 @@ export default {
       },
       dataRule: {
         roleName: [
-          {required: true, message: '角色名称不能为空', trigger: 'blur'}
+          {required: true, message: '权限集名称不能为空', trigger: 'blur'}
         ]
       },
       tempKey: -666666 // 临时key, 用于解决tree半选中状态项不能传给后台接口问题. # 待优化
@@ -124,7 +124,7 @@ export default {
         }
       })
     },
-    // 点击获取角色权限 ,
+    // 点击获取权限集权限 ,
     getMenuInfo(node, data, value) {
       this.menuInfo.menuId = data.data.menuId
       this.menuInfo.name = data.data.name
diff --git a/src/views/modules/sys/role.vue b/src/views/modules/sys/role.vue
index f05504c..1e57443 100644
--- a/src/views/modules/sys/role.vue
+++ b/src/views/modules/sys/role.vue
@@ -2,7 +2,7 @@
   <div class="mod-role">
     <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
       <el-form-item>
-        <el-input v-model="dataForm.roleName" placeholder="角色名称" clearable></el-input>
+        <el-input v-model="dataForm.roleName" placeholder="权限集名称" clearable></el-input>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="getDataList()">{{buttons.search ||'查询' }}</el-button>
@@ -19,7 +19,7 @@
         prop="roleName"
         header-align="center"
         align="center"
-        :label="buttons.roleName||'角色名称'">
+        :label="buttons.roleName||'权限集名称'">
       </el-table-column>
       <el-table-column
         prop="remark"
@@ -90,7 +90,7 @@ import {
           edit: '编辑',
           delete: '删除',
           reportRole:'报表赋权',
-          roleName: '角色名称',
+          roleName: '权限集名称',
           remark: '备注',
           createTime: '创建时间',
         },
diff --git a/src/views/modules/sys/user-add-or-update.vue b/src/views/modules/sys/user-add-or-update.vue
index 8cd1d62..ec7feda 100644
--- a/src/views/modules/sys/user-add-or-update.vue
+++ b/src/views/modules/sys/user-add-or-update.vue
@@ -4,7 +4,8 @@
       width="530px"
       :title="!dataForm.id ?  buttons.add :buttons.edit"
       :close-on-click-modal="false"
-      :visible.sync="visible">
+      :visible.sync="visible"
+      @close="closeDataDialog">
       <!-- 取消    :rules="dataRule"-->
       <el-form :inline="true" :model="dataForm" label-position="top" ref="dataForm"
                @keyup.enter.native="dataFormSubmit()"
@@ -33,18 +34,58 @@
           </el-form-item>
         </el-form>
         <el-form>
-          <el-form-item >
-            <span slot="label" style="" @click="getBaseList(18)"><a herf="#">{{buttons.site||'工厂'}}</a></span>
-            <el-input v-model="dataForm.site" style="width: 150px;" placeholder="工厂"></el-input>
+          <el-form-item :label="'工厂'">
+            <el-select v-model="dataForm.siteID" clearable style="width: 150px;" placeholder="请选择" @change="getBUDepartmentPostList">
+              <el-option
+                :label="i.siteID + '-' + i.siteName"
+                :value="i.siteID"
+                v-for="i in siteList "
+                :key="i.siteID">
+              </el-option>
+            </el-select>
           </el-form-item>
+<!--          <el-form-item >-->
+<!--            <span slot="label" style="" @click="getBaseList(18)"><a herf="#">{{buttons.site||'工厂'}}</a></span>-->
+<!--            <el-input v-model="dataForm.site" style="width: 150px;" placeholder="工厂"></el-input>-->
+<!--          </el-form-item>-->
 <!--          <el-form-item :label="buttons.language||'语言'" prop="languageDefault">-->
 <!--            <el-select filterable v-model="dataForm.languageDefault" clearable style="width: 150px;">-->
 <!--              <el-option :label="item.languageName" :value="item.languageCode" v-for="(item,index) in languageList "-->
 <!--                         :key="index"></el-option>-->
 <!--            </el-select>-->
 <!--          </el-form-item>-->
+          <el-form-item :label="'BU'">
+            <el-select v-model="dataForm.buNo" clearable style="width: 150px;" placeholder="请选择">
+              <el-option
+                :label="i.buNo + '-' + i.buDesc"
+                :value="i.buNo"
+                v-for="i in buList "
+                :key="i.buNo">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item :label="buttons.department||'部门'" prop="department">
+            <el-select v-model="dataForm.departmentNo" clearable style="width: 150px;" placeholder="请选择">
+              <el-option
+                :label="i.departmentNo + '-' + i.departmentName"
+                :value="i.departmentNo"
+                v-for="i in departmentList "
+                :key="i.departmentNo">
+              </el-option>
+            </el-select>
+          </el-form-item>
         </el-form>
         <el-form>
+          <el-form-item :label="buttons.post||'岗位'" prop="post">
+            <el-select v-model="dataForm.postNo" clearable style="width: 150px;" placeholder="请选择">
+              <el-option
+                :label="i.postNo + '-' + i.postName"
+                :value="i.postNo"
+                v-for="i in postList "
+                :key="i.postNo">
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="角色" size="mini" prop="roleIdList">
             <el-checkbox-group v-model="dataForm.roleIdList">
               <el-checkbox v-for="role in roleList" :key="role.roleId" :label="role.roleId">{{
@@ -53,8 +94,6 @@
               </el-checkbox>
             </el-checkbox-group>
           </el-form-item>
-        </el-form>
-        <el-form>
           <el-form-item label="状态" size="mini" prop="status">
             <el-radio-group v-model="dataForm.status">
               <el-radio :label="0">{{buttons.disable||'禁用'}}</el-radio>
@@ -65,7 +104,7 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
          <el-button type="primary" @click="dataFormSubmit()">{{buttons.submit||'确定'}}</el-button>
-         <el-button @click="visible = false">{{buttons.close||'取消'}}</el-button>
+         <el-button type="primary" @click="visible = false">{{buttons.close||'取消'}}</el-button>
     </span>
     </el-dialog>
 
@@ -81,6 +120,7 @@ import {searchSysLanguage} from "@/api/sysLanguage.js"
   import {
     searchFunctionButtonList,
   } from "@/api/sysLanguage.js"
+  import {getBUList, getDepartmentList, getPostList, getSiteList} from '../../../api/base/site'
 export default {
   components: {
     Chooselist
@@ -92,6 +132,10 @@ export default {
       roleList: [],
       factorys: [],
       languageList: [],
+      siteList:[],
+      buList:[],
+      departmentList:[],
+      postList:[],
       dataForm: {
         id: 0,
         userName: '',
@@ -101,9 +145,20 @@ export default {
         salt: '',
         email: '',
         mobile: '',
+        buNo: '',
+        buDesc: '',
+        department:'',
+        departmentNo:'',
+        departmentName:'',
+        post:'',
+        postNo:'',
+        postName:'',
         roleIdList: [],
         status: 1,
         site: '',
+        siteID: '',
+        bu:'',
+        siteName:'',
         userDisplay: ''
       },
       buttons: {
@@ -113,6 +168,9 @@ export default {
         userDisplay: '用户名',
         email: '邮箱',
         mobile: '手机号',
+        bu:'BU',
+        department:'部门',
+        post:'岗位',
         status: '状态',
         disable: '禁用',
         normal: '正常',
@@ -120,12 +178,65 @@ export default {
         comfirmPassword:'确认密码',
         submit: '确定',
         close: '取消',
-        site: '工厂',
+        siteID: '工厂',
+        siteName:'工厂名称',
         language: '语言',
       },
     }
   },
   methods: {
+    getSiteList () {
+      getSiteList().then(({data}) => {
+        this.siteList = data.rows
+        // let list = data.rows.map(item=>{
+        //   return {
+        //     site:item.siteID,
+        //     siteName:item.siteName
+        //   }
+        // })
+        // console.log(list)
+      })
+    },
+    getBUDepartmentPostList () {
+      let tempData ={
+        site:this.dataForm.siteID
+      }
+      this.dataForm.buNo = ''
+      this.dataForm.buDesc = ''
+      this.dataForm.departmentNo = ''
+      this.dataForm.departmentName = ''
+      this.dataForm.postNo = ''
+      this.dataForm.postName = ''
+      getBUList(tempData).then(({data}) => {
+        this.buList = data.rows
+        this.dataForm.buDesc = data.rows.buDesc
+      })
+      getDepartmentList(tempData).then(({data}) => {
+        this.departmentList = data.rows
+        this.dataForm.departmentName = data.rows.departmentName
+      })
+      getPostList(tempData).then(({data}) => {
+        this.postList = data.rows
+        this.dataForm.postName = data.rows.postName
+      })
+    },
+    getBDPList () {
+      let tempData ={
+        site:this.dataForm.siteID
+      }
+      getBUList(tempData).then(({data}) => {
+        this.buList = data.rows
+        this.dataForm.buDesc = data.rows.buDesc
+      })
+      getDepartmentList(tempData).then(({data}) => {
+        this.departmentList = data.rows
+        this.dataForm.departmentName = data.rows.departmentName
+      })
+      getPostList(tempData).then(({data}) => {
+        this.postList = data.rows
+        this.dataForm.postName = data.rows.postName
+      })
+    },
     getFunctionButtonList() {
       let queryButton = {
         functionId: this.$route.meta.menuId,
@@ -194,10 +305,43 @@ export default {
               this.dataForm.roleIdList = data.user.roleIdList
               this.dataForm.status = data.user.status
               this.dataForm.languageDefault = data.user.languageDefault
-              this.dataForm.site = data.user.site.toString()
               this.dataForm.userDisplay = data.user.userDisplay
+              this.dataForm.siteID = data.user.site
+              this.dataForm.buNo = data.user.buNo
+              this.dataForm.buDesc = data.user.buDesc
+              this.dataForm.department = data.user.department
+              this.dataForm.departmentNo = data.user.departmentNo
+              this.dataForm.departmentName = data.user.departmentName
+              this.dataForm.post = data.user.post
+              this.dataForm.postNo = data.user.postNo
+              this.getBDPList()
             }
           })
+        } else {
+          this.dataForm = {
+            buNo: '',
+            buDesc: '',
+            userName: '',
+            password: '',
+            comfirmPassword: '',
+            languageDefault: '',
+            salt: '',
+            email: '',
+            mobile: '',
+            bu:'',
+            department:'',
+            departmentNo:'',
+            departmentName:'',
+            post:'',
+            postNo:'',
+            postName:'',
+            roleIdList: [],
+            status: 1,
+            site: '',
+            siteID: '',
+            siteName:'',
+            userDisplay: ''
+          }
         }
       })
     },
@@ -218,8 +362,11 @@ export default {
               'status': this.dataForm.status,
               'roleIdList': this.dataForm.roleIdList,
               'languageDefault': this.dataForm.languageDefault,
-              'site': this.dataForm.site,
+              'site': this.dataForm.siteID,
               'userDisplay': this.dataForm.userDisplay,
+              'buNo': this.dataForm.buNo,
+              'departmentNo': this.dataForm.departmentNo,
+              'postNo': this.dataForm.postNo,
             })
           }).then(({data}) => {
             if (data && data.code === 0) {
@@ -232,10 +379,38 @@ export default {
           })
         }
       })
+    },
+    // 关闭弹窗
+    closeDataDialog() {
+      this.dataForm = {
+        buNo: '',
+        buDesc: '',
+        userName: '',
+        password: '',
+        comfirmPassword: '',
+        languageDefault: '',
+        salt: '',
+        email: '',
+        mobile: '',
+        bu:'',
+        department:'',
+        departmentNo:'',
+        departmentName:'',
+        post:'',
+        postNo:'',
+        postName:'',
+        roleIdList: [],
+        status: 1,
+        site: '',
+        siteID: '',
+        siteName:'',
+        userDisplay: ''
+      }
     }
   },
   created() {
     this.getFunctionButtonList()
+    this.getSiteList()
   }
 }
 </script>
diff --git a/src/views/modules/sys/user.vue b/src/views/modules/sys/user.vue
index ca4c910..0ed00ee 100644
--- a/src/views/modules/sys/user.vue
+++ b/src/views/modules/sys/user.vue
@@ -55,6 +55,24 @@
         align="center"
         :label="buttons.userDisplay||'用户名'">
       </el-table-column>
+      <el-table-column
+        prop="buDesc"
+        header-align="center"
+        align="center"
+        :label="'BU'">
+      </el-table-column>
+      <el-table-column
+        prop="departmentName"
+        header-align="center"
+        align="center"
+        :label="'部门'">
+      </el-table-column>
+      <el-table-column
+        prop="postName"
+        header-align="center"
+        align="center"
+        :label="'岗位'">
+      </el-table-column>
       <el-table-column
         prop="email"
         header-align="center"
@@ -92,6 +110,7 @@
         :label="buttons.cz||'操作'">
         <template slot-scope="scope">
 <!--          <a type="text" size="small" @click="generateData(scope.row)">{{ buttons.auth || '审核' }}</a>-->
+          <a type="text" size="small" @click="permissionList(scope.row)">权限清单</a>
           <a v-if="isAuth('sys:user:update')" type="text" size="small"
              @click="addOrUpdateHandle(scope.row.userId)">{{ buttons.edit || '修改' }}</a>
           <a v-if="isAuth('sys:user:delete')" type="text" size="small"
@@ -108,6 +127,176 @@
       :total="totalPage"
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
+    <!-- 权限清单 -->
+    <el-dialog title="权限清单" @close="closeDataDialog" @open="getUserAccessSiteInfoList" :close-on-click-modal="false" v-drag :visible.sync="permissionFlag" width="900px">
+      <el-form label-position="top" style="margin-top: 1px; margin-left: 0px;">
+        用户：   <el-input v-model="selectUser.username" style="width: 130px" readonly></el-input>
+        名称：   <el-input v-model="selectUser.userDisplay" style="width: 130px" readonly></el-input>
+        <el-tabs v-model="activeTable" style="margin-top: 0; width: 100%; min-height: 350px;box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);border: 2px;" @tab-click="tabClick" class="customer-tab">
+          <!-- 工厂权限页签 -->
+          <el-tab-pane label="工厂权限" name="factory_information" style="height: 350px;">
+            <el-table
+              :data="userSiteList"
+              border
+              style="width: 100%;height: 500px">
+              <el-table-column
+                prop="siteID"
+                header-align="center"
+                align="center"
+                min-width="50"
+                label="工厂编码">
+              </el-table-column>
+              <el-table-column
+                prop="siteName"
+                header-align="center"
+                align="center"
+                min-width="100"
+                label="工厂名称">
+              </el-table-column>
+              <el-table-column
+                prop="address"
+                header-align="center"
+                align="center"
+                min-width="100"
+                label="地址">
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+          <!-- BU权限页签 -->
+          <el-tab-pane label="BU权限" name="BU_information" style="height: 350px;">
+            <el-table
+              :data="userBUList"
+              border
+              style="width: 100%;height: 500px">
+              <el-table-column
+                prop="site"
+                header-align="center"
+                align="center"
+                min-width="50"
+                label="工厂编码">
+              </el-table-column>
+              <el-table-column
+                prop="buNo"
+                header-align="center"
+                align="center"
+                min-width="100"
+                label="部门编码">
+              </el-table-column>
+              <el-table-column
+                prop="buDesc"
+                header-align="center"
+                align="center"
+                min-width="100"
+                label="部门名称">
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+          <!-- 项目权限页签 -->
+          <el-tab-pane label="项目权限" name="project_information" style="height: 350px;">
+            <el-table
+              :data="userProjectList"
+              border
+              style="width: 100%;height: 500px">
+              <el-table-column
+                prop="site"
+                header-align="center"
+                align="center"
+                min-width="50"
+                label="工厂编码">
+              </el-table-column>
+              <el-table-column
+                prop="buDesc"
+                header-align="center"
+                align="center"
+                min-width="100"
+                label="部门名称">
+              </el-table-column>
+              <el-table-column
+                prop="projectId"
+                header-align="center"
+                align="center"
+                min-width="50"
+                label="项目号">
+              </el-table-column>
+              <el-table-column
+                prop="status"
+                header-align="center"
+                align="center"
+                min-width="100"
+                label="项目状态">
+              </el-table-column>
+              <el-table-column
+                prop="needDate"
+                header-align="center"
+                align="center"
+                min-width="100"
+                label="要求完成时间">
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+          <!-- 字段权限页签 -->
+          <el-tab-pane label="字段权限" name="field_function_information" style="height: 350px;">
+            <el-table
+              :data="userFieldList"
+              border
+              style="width: 100%;height: 500px">
+              <el-table-column
+                prop="functionName"
+                header-align="center"
+                align="center"
+                min-width="50"
+                label="功能名称">
+              </el-table-column>
+              <el-table-column
+                prop="functionGroup"
+                header-align="center"
+                align="center"
+                min-width="100"
+                label="功能分组">
+              </el-table-column>
+              <el-table-column
+                prop="fieldDesc"
+                header-align="center"
+                align="center"
+                min-width="50"
+                label="字段名称">
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+          <!-- 特殊权限页签 -->
+          <el-tab-pane label="特殊权限" name="security_information" style="height: 350px;">
+            <el-table
+              :data="securityList"
+              border
+              v-loading="dataListLoading"
+              style="width: 100%;height: 500px">
+              <el-table-column
+                v-for="(item,index) in columnList" :key="index"
+                :sortable="item.columnSortable"
+                :prop="item.columnProp"
+                :header-align="item.headerAlign"
+                :show-overflow-tooltip="item.showOverflowTooltip"
+                :align="item.align"
+                :fixed="item.fixed==''?false:item.fixed"
+                :min-width="item.columnWidth"
+                :label="item.columnLabel">
+                <template slot-scope="scope">
+                  <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+                  <span v-if="item.columnHidden">
+              <el-checkbox v-model="scope.row[item.columnProp] "></el-checkbox>
+            </span>
+                  <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]"
+                                                     style="width: 100px; height: 80px"/></span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+        </el-tabs>
+      </el-form>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button @click="permissionFlag = false" type="primary">关闭</el-button>
+      </el-footer>
+    </el-dialog>
     <!-- 弹窗, 新增 / 修改 -->
     <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
     <!--  审核权限   -->
@@ -169,7 +358,8 @@
       :title="'工厂授权'"
       :visible.sync="siteVisible"
       width="518px"
-      :append-to-body="true">
+      :append-to-body="true"
+      @close="closeDataDialog">
       <el-transfer class="rq" filterable v-model="selectSitList" :data="siteList" :titles="['未授权工厂', '已授权工厂']"></el-transfer>
       <span slot="footer" class="dialog-footer">
         <div style="margin-top: 5px">
@@ -360,29 +550,37 @@
 <script>
 import {getUserAccessSiteList, saveUserAccessSiteList} from '@/api/factory/accessSite.js'
 import {getSiteList} from '@/api/factory/site.js'
-import {searchAccessBuList,saveAccessBU,searchAccessProjectForUser,saveAccessProject} from '@/api/base/site.js'
+import {searchAccessBuList,saveAccessBU,searchAccessProjectForUser,saveAccessProject, getUserAccessSiteInfoList, getUserAccessBUInfoList, getUserAccessProjectInfoList} from '@/api/base/site.js'
 import {
-  searchFieldFunctionList,searchAccessFieldListByUser,saveAccessFieldListByUser
+  searchFieldFunctionList,searchAccessFieldListByUser,saveAccessFieldListByUser,getUserAccessFieldFunctionInfoList
 } from "@/api/base/field.js"
 import AddOrUpdate from './user-add-or-update'
-import {getUserBusinessRoleList, saveUserBusinessRole,} from '@/api/auditManagement/auditType.js'
-
+import {getUserBusinessRoleList, saveUserBusinessRole} from '@/api/auditManagement/auditType.js'
 import {
 
   getUserSpecialSecurity,
   saveUserSpecialSecurity,
-  updateUserSpecialSecurity
+  updateUserSpecialSecurity,
 } from '@/api/factory/userSpecialSecurity.js'
 import {debounce, throttle} from "../../../utils/common";
 import {
   searchFunctionButtonList,
 } from "@/api/sysLanguage.js"
+import {
+  getBUList,
+  getDepartmentList,
+  getPostList,
+  saveAccessSiteForSite,
+  searchAccessSiteListBySite
+} from '../../../api/base/site'
 
 export default {
   data() {
     return {
-      projectRoleFlag:false,
-      projectRoleList:[],
+      accessSiteVisible: false,
+      projectRoleFlag: false,
+      projectRoleList: [],
+      accessSiteList: [],
       showButton: true,
       height: 200,
       securityHeight: 300,
@@ -393,8 +591,13 @@ export default {
       userId: this.$store.state.user.name,
       transferData: [],
       checked: [],
-      selectBUList:[],
-      buList:[],
+      selectBUList: [],
+      buList: [],
+      userSiteList: [],
+      userBUList:[],
+      userProjectList:[],
+      userFieldList:[],
+      userData: [],
       inputSearch1: '审核权限',
       //设置
       setUp: {
@@ -402,8 +605,29 @@ export default {
         saveButton: false,
       },
       dataForm: {
-        userName: ''
+        id: 0,
+        userName: '',
+        password: '',
+        comfirmPassword: '',
+        languageDefault: '',
+        salt: '',
+        email: '',
+        mobile: '',
+        buNo: '',
+        buDesc: '',
+        departmentNo:'',
+        departmentName:'',
+        postNo:'',
+        postName:'',
+        roleIdList: [],
+        status: 1,
+        site: '',
+        siteID: '',
+        siteName:'',
+        userDisplay: ''
       },
+      // 初始页签
+      activeTable: 'factory_information',
       columnList: [
         {
           userId: this.$store.state.user.name,
@@ -461,6 +685,7 @@ export default {
         cz: '操作',
         search: '查询',
         add: '添加',
+        permissionList: '权限清单',
         edit: '编辑',
         delete: '删除',
         specialCompetencies: '特殊权限',
@@ -479,6 +704,7 @@ export default {
         allAuth: '所有权限',
         currentAuth: '当前权限',
         fieldAuthorization:'字段授权',
+        role:'授权',
       },
       dataList: [],
       securityList: [],
@@ -498,6 +724,7 @@ export default {
       selectFieldList:[],
       fieldList:[],
       fieldFlag:false,
+      permissionFlag:false,
     }
   },
   components: {
@@ -527,6 +754,29 @@ export default {
         }
       })
     },
+    /**
+     * 列表表格选择替换
+     * @param tab
+     * @param event
+     */
+    tabClick (tab, event) {
+      // 刷新列表数据
+      this.refreshCurrentTabTable()
+    },
+    refreshCurrentTabTable() {
+      if (this.activeTable === 'factory_information') {
+        this.getUserAccessSiteInfoList()
+      }
+      if (this.activeTable === 'BU_information') {
+        this.getUserAccessBUInfoList()
+      }
+      if (this.activeTable === 'project_information'){
+        this.getUserAccessProjectInfoList()
+      }
+      if (this.activeTable === 'field_function_information'){
+        this.getUserAccessFieldFunctionInfoList()
+      }
+    },
     // 特殊权限
     specialAuthorize() {
       this.specialVisible = true
@@ -713,6 +963,7 @@ export default {
     },
     // 获取所有可用工厂
     searchSiteList() {
+      this.siteList=[]
       getSiteList({active: 'Y'}).then(({data}) => {
         if (data.code == 0) {
           this.siteList = data.dataList
@@ -837,6 +1088,60 @@ export default {
     selectionChangeHandle(val) {
       this.dataListSelections = val
     },
+    // 权限清单模态框
+    permissionList(row) {
+      this.activeTable = 'factory_information'
+      this.userData = row
+      this.permissionFlag = true
+    },
+    // 获取用户工厂权限信息
+    getUserAccessSiteInfoList () {
+      getUserAccessSiteInfoList(this.userData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.userSiteList = data.rows
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      })
+    },
+    // 获取用户BU权限信息
+    getUserAccessBUInfoList () {
+      getUserAccessBUInfoList(this.userData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.userBUList = data.rows
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      })
+    },
+    // 获取用户项目权限信息
+    getUserAccessProjectInfoList () {
+      getUserAccessProjectInfoList(this.userData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.userProjectList = data.rows
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      })
+    },
+    // 获取用户项目权限信息
+    getUserAccessFieldFunctionInfoList () {
+      getUserAccessFieldFunctionInfoList(this.userData).then(({data}) => {
+        if (data && data.code === 0) {
+          this.userFieldList = data.rows
+        } else {
+          this.$alert(data.msg, '错误', {
+            confirmButtonText: '确定'
+          })
+        }
+      })
+    },
     // 新增 / 修改
     addOrUpdateHandle(id) {
       this.addOrUpdateVisible = true
@@ -908,6 +1213,14 @@ export default {
         }
       })
     },
+    closeDataDialog() {
+      this.userSiteList=[];
+      this.userBUList=[];
+      this.userProjectList=[];
+      this.userFieldList=[];
+      this.siteList=[];
+      this.selectSitList=[];
+    },
   },
   created() {
     this.getFunctionButtonList()
diff --git a/src/views/modules/sys/userjob.vue b/src/views/modules/sys/userjob.vue
new file mode 100644
index 0000000..01883ee
--- /dev/null
+++ b/src/views/modules/sys/userjob.vue
@@ -0,0 +1,490 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="dataForm" @keyup.enter.native="search()">
+      <el-form-item>
+        <el-input v-model="dataForm.userName" placeholder="用户账号" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-input v-model="dataForm.userDisplay" placeholder="用户名" clearable></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="search()">{{buttons.search ||'查询' }}</el-button>
+     </el-form-item>
+    </el-form>
+    <el-table
+      :data="dataList"
+      border
+      v-loading="dataListLoading"
+      @selection-change="selectionChangeHandle"
+      highlight-current-row
+      style="width: 100%;height: 731px">
+      <el-table-column
+        prop="userName"
+        header-align="center"
+        align="center"
+        :label="buttons.userName||'用户账号'">
+      </el-table-column>
+      <el-table-column
+        prop="userDisplay"
+        header-align="center"
+        align="center"
+        :label="buttons.userDisplay||'用户名'">
+      </el-table-column>
+      <el-table-column
+        prop="purchaser"
+        header-align="center"
+        align="center"
+        width="110px"
+        :label="buttons.purchaser||'采购员'">
+<!--        <template slot-scope="scope">-->
+<!--          &lt;!&ndash; 如果数据为Y，显示勾选框，否则不勾选 &ndash;&gt;-->
+<!--          <el-checkbox v-model="scope.row.purchaser"  @change="changeCheck(scope.row,1)"></el-checkbox>-->
+<!--        </template>-->
+      </el-table-column>
+      <el-table-column
+        prop="insideSales"
+        header-align="center"
+        align="center"
+        width="110px"
+        :label="buttons.insideSales||'内部销售'">
+      </el-table-column>
+      <el-table-column
+        prop="externalSales"
+        header-align="center"
+        align="center"
+        width="110px"
+        :label="buttons.externalSales||'外部销售'">
+      </el-table-column>
+      <el-table-column
+        prop="procurementApplicant"
+        header-align="center"
+        align="center"
+        width="110px"
+        :label="buttons.procurementApplicant||'采购申请人'">
+      </el-table-column>
+      <el-table-column
+        prop="purchaseRequisitionApprover"
+        header-align="center"
+        align="center"
+        width="110px"
+        :label="buttons.purchaseRequisitionApprover||'采购申请单审批人'">
+      </el-table-column>
+      <el-table-column
+        prop="purchaseOrderApprover"
+        header-align="center"
+        align="center"
+        width="110px"
+        :label="buttons.purchaseOrderApprover||'采购订单审批人'">
+      </el-table-column>
+      <el-table-column
+        prop="salesOrderApprover"
+        header-align="center"
+        align="center"
+        width="110px"
+        :label="buttons.salesOrderApprover||'销售订单审批人'">
+      </el-table-column>
+      <el-table-column
+        prop="createTime"
+        header-align="center"
+        align="center"
+        width="180"
+        :label="buttons.createTime||'创建时间'">
+      </el-table-column>
+      <el-table-column
+        prop=""
+        header-align="center"
+        align="center"
+        min-width="30"
+        label="操作">
+        <template slot-scope="scope">
+          <a type="text" size="small" @click="UpdateHandle(scope.row)">修改</a>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      @size-change="sizeChangeHandle"
+      @current-change="currentChangeHandle"
+      :current-page="pageIndex"
+      :page-sizes="[20, 50, 100, 200,500]"
+      :page-size="pageSize"
+      :total="totalPage"
+      layout="total, sizes, prev, pager, next, jumper">
+    </el-pagination>
+    <el-dialog :title="modalData.title"
+               :close-on-click-modal="false"
+               v-drag
+               :visible.sync="modalFlag"
+               width="495px">
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="用户账号" prop="userName" :rules="rules.userName">
+          <el-input v-model="modalData.userName" style="width: 221px" readonly></el-input>
+        </el-form-item>
+        <el-form-item label="用户名" prop="userDisplay" :rules="rules.userDisplay">
+          <el-input v-model="modalData.userDisplay" style="width: 221px" readonly></el-input>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="采购员" prop="purchaser" :rules="rules.purchaser">
+          <el-select v-model="modalData.purchaser" style="width: 221px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="内部销售" prop="insideSales" :rules="rules.insideSales">
+          <el-select v-model="modalData.insideSales" style="width: 221px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="外部销售" prop="externalSales" :rules="rules.externalSales">
+          <el-select v-model="modalData.externalSales" style="width: 221px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="采购申请人" prop="procurementApplicant" :rules="rules.procurementApplicant">
+          <el-select v-model="modalData.procurementApplicant" style="width: 221px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="采购申请单审批人" prop="purchaseRequisitionApprover" :rules="rules.purchaseRequisitionApprover">
+          <el-select v-model="modalData.purchaseRequisitionApprover" style="width: 221px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="采购订单审批人" prop="purchaseOrderApprover" :rules="rules.purchaseOrderApprover">
+          <el-select v-model="modalData.purchaseOrderApprover" style="width: 221px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-form :inline="true" label-position="top" :model="modalData" :rules="rules" style="margin-left: 7px;margin-top: -5px;">
+        <el-form-item label="销售订单审批人" prop="salesOrderApprover" :rules="rules.salesOrderApprover">
+          <el-select v-model="modalData.salesOrderApprover" style="width: 221px">
+            <el-option label="是" value="Y"></el-option>
+            <el-option label="否" value="N"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <el-footer style="height:30px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="saveData()">保存</el-button>
+        <el-button type="primary" @click="modalFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
+
+  </div>
+</template>
+
+<script>
+import {
+  searchFunctionButtonList,
+} from "@/api/sysLanguage.js"
+import {searchUserJobList,editUserJobInfo} from '../../../api/user'
+
+  export default {
+    watch: {
+      dataForm:{
+        deep:true,
+        handler: function (val, oldVal) {
+          this.dataForm.userId = this.dataForm.userId.toUpperCase()
+        }
+      },
+      modalData:{
+        deep:true,
+        handler: function (val, oldVal) {
+          this.modalData.userId = this.modalData.userId.toUpperCase()
+        }
+      }
+    },
+    data () {
+      return {
+        dataForm: {
+          site: '',
+          userId: '',
+          userName: '',
+          userDisplay: '',
+        },
+        modalData: {
+          title: '',
+          site: '',
+          userId:'',
+          userName: '',
+          userDisplay: '',
+          purchaser: '',
+          insideSales: '',
+          externalSales: '',
+          procurementApplicant: '',
+          purchaseRequisitionApprover: '',
+          purchaseOrderApprover: '',
+          salesOrderApprover: '',
+          createTime:''
+        },
+        dataList: [],
+        pageIndex: 1,
+        pageSize: 20,
+        totalPage: 0,
+        height: 200,
+        dataListLoading: false,
+        dataListSelections: [],
+        addOrUpdateVisible: false,
+        buttons: {
+          cz: '操作',
+          search: '查询',
+          edit: '编辑',
+          purchaser: '采购员',
+          insideSales: '内部销售',
+          externalSales: '外部销售',
+          procurementApplicant: '采购申请人',
+          purchaseRequisitionApprover: '采购申请单审批人',
+          purchaseOrderApprover: '采购订单审批人',
+          salesOrderApprover: '销售订单审批人',
+          createTime: '创建时间',
+        },
+        rules: {
+          userName: [
+            {required: true, message: '', trigger: 'blur'}
+          ],
+          userDisplay: [
+            {required: true, message: '', trigger: 'blur'}
+          ],
+          purchaser: [
+            {required: true, message: '', trigger: 'blur'}
+          ],
+          insideSales: [
+            {required: true, message: '', trigger: 'blur'}
+          ],
+          externalSales: [
+            {required: true, message: '', trigger: 'blur'}
+          ],
+          procurementApplicant: [
+            {required: true, message: '', trigger: 'blur'}
+          ],
+          purchaseRequisitionApprover: [
+            {required: true, message: '', trigger: 'blur'}
+          ],
+          purchaseOrderApprover: [
+            {required: true, message: '', trigger: 'blur'}
+          ],
+          salesOrderApprover: [
+            {required: true, message: '', trigger: 'blur'}
+          ],
+        },
+        modalFlag: false,
+        modalDisableFlag: false,
+      }
+    },
+    activated () {
+      this.search()
+    },
+    created () {
+      this.getFunctionButtonList()
+      this.search()
+    },
+    methods: {
+      // for (let i = 0; i < this.dataList.length; i++) {
+      //   if(this.dataList[i].username==this.$store.state.user.name){
+      //     this.dataList[i].purchaser='Y'
+      //     this.dataList[i].insideSales='Y'
+      //     this.dataList[i].externalSales='Y'
+      //     this.dataList[i].procurementApplicant='Y'
+      //     this.dataList[i].purchaseRequisitionApprover='Y'
+      //     this.dataList[i].purchaseOrderApprover='Y'
+      //     this.dataList[i].salesOrderApprover='Y'
+      //   }
+      // }
+      search () {
+        this.dataForm.limit = this.pageSize
+        this.dataForm.page = this.pageIndex
+        searchUserJobList(this.dataForm).then(({data}) => {
+          if (data.code == 0) {
+            this.dataList = data.page.list
+            this.pageIndex = data.page.currPage
+            this.pageSize = data.page.pageSize
+            this.totalPage = data.page.totalCount
+          }
+          this.dataListLoading = false
+        })
+      },
+      // changeAll(row){
+      //   if(row.checkAll){
+      //     row.purchaser='Y';
+      //     row.insideSales='Y';
+      //     row.externalSales='Y';
+      //     row.procurementApplicant='Y';
+      //     row.purchaseRequisitionApprover='Y';
+      //     row.purchaseOrderApprover='Y';
+      //     row.salesOrderApprover='Y';
+      //   }else {
+      //     row.purchaser='N';
+      //     row.insideSales='N';
+      //     row.externalSales='N';
+      //     row.procurementApplicant='N';
+      //     row.purchaseRequisitionApprover='N';
+      //     row.purchaseOrderApprover='N';
+      //     row.salesOrderApprover='N';
+      //   }
+      // },
+      // changeCheck(row,type){
+      //   if(type===1){
+      //     if(row.purchaser){
+      //       row.purchaserFlag='Y'
+      //     }else {
+      //       row.purchaserFlag='N'
+      //     }
+      //   }
+      //   if(type==2){
+      //     if(row.insideSales){
+      //       row.insideSalesFlag='Y'
+      //     }else {
+      //       row.insideSalesFlag='N'
+      //     }
+      //   }
+      //   if(type==3){
+      //     if(row.externalSales){
+      //       row.externalSalesFlag='Y'
+      //     }else {
+      //       row.externalSalesFlag='N'
+      //     }
+      //   }
+      //   if(type==4){
+      //     if(row.procurementApplicant){
+      //       row.procurementApplicantFlag='Y'
+      //     }else {
+      //       row.procurementApplicantFlag='N'
+      //     }
+      //   }
+      //   if(type==5){
+      //     if(row.purchaseRequisitionApprover){
+      //       row.purchaseRequisitionApproverFlag='Y'
+      //     }else {
+      //       row.purchaseRequisitionApproverFlag='N'
+      //     }
+      //   }
+      //   if(type==6){
+      //     if(row.purchaseOrderApprover){
+      //       row.purchaseOrderApproverFlag='Y'
+      //     }else {
+      //       row.purchaseOrderApproverFlag='N'
+      //     }
+      //   }
+      //   if(type==7){
+      //     if(row.salesOrderApprover){
+      //       row.salesOrderApproverFlag='Y'
+      //     }else {
+      //       row.salesOrderApproverFlag='N'
+      //     }
+      //   }
+      //   if (row.purchaserFlag=='Y'&&row.insideSalesFlag=='Y'&&row.externalSalesFlag=='Y'&&row.procurementApplicantFlag=='Y'&&row.purchaseRequisitionApproverFlag=='Y'&&row.purchaseOrderApproverFlag=='Y'&&row.salesOrderApproverFlag=='Y'){
+      //     row.checkAll=true
+      //   }else {
+      //     row.checkAll=false
+      //   }
+      //   this.$forceUpdate();
+      // },
+      // 角色修改模态框
+      UpdateHandle (row) {
+        this.modalData = {
+          title: '角色修改',
+          site: row.site,
+          userId: row.userId,
+          userName: row.userName,
+          userDisplay: row.userDisplay,
+          purchaser: row.purchaser,
+          insideSales: row.insideSales,
+          externalSales: row.externalSales,
+          procurementApplicant: row.procurementApplicant,
+          purchaseRequisitionApprover: row.purchaseRequisitionApprover,
+          purchaseOrderApprover: row.purchaseOrderApprover,
+          salesOrderApprover: row.salesOrderApprover,
+        }
+        this.modalDisableFlag = true
+        this.modalFlag = true
+      },
+      // 保存
+      saveData () {
+        if (this.modalData.purchaser === '' || this.modalData.purchaser == null) {
+          this.$message.warning('请选择采购员是否！')
+          return
+        }
+        if (this.modalData.insideSales === '' || this.modalData.insideSales == null) {
+          this.$message.warning('请选择内部销售是否！')
+          return
+        }
+        if (this.modalData.externalSales === '' || this.modalData.externalSales == null) {
+          this.$message.warning('请选择外部销售是否！')
+          return
+        }
+        if (this.modalData.procurementApplicant === '' || this.modalData.procurementApplicant == null) {
+          this.$message.warning('请选择采购申请人是否！')
+          return
+        }
+        if (this.modalData.purchaseRequisitionApprover === '' || this.modalData.purchaseRequisitionApprover == null) {
+          this.$message.warning('请选择采购申请单审批人是否！')
+          return
+        }
+        if (this.modalData.purchaseOrderApprover === '' || this.modalData.purchaseOrderApprover == null) {
+          this.$message.warning('请选择采购订单审批人是否！')
+          return
+        }
+        if (this.modalData.salesOrderApprover === '' || this.modalData.salesOrderApprover == null) {
+          this.$message.warning('请选择销售订单审批人是否！')
+          return
+        }
+        //修改方法
+        editUserJobInfo(this.modalData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.search()
+            this.modalFlag = false
+            this.$message({
+              message: '操作成功',
+              type: 'success',
+              duration: 1500,
+              onClose: () => {
+              }
+            })
+          } else {
+            this.$alert(data.msg, '错误', {
+              confirmButtonText: '确定'
+            })
+          }
+        })
+      },
+      // 获取button的词典
+      getFunctionButtonList () {
+        let queryButton = {
+          functionId: this.$route.meta.menuId,
+          tableId: '*',
+          languageCode: this.$i18n.locale,
+          objectType: 'button'
+        }
+        searchFunctionButtonList(queryButton).then(({data}) => {
+          if (data.code == 0 && data.data) {
+            this.buttons = data.data
+          }
+        })
+      },
+      sizeChangeHandle (val) {
+        this.pageSize = val
+        this.pageIndex = 1
+        this.search()
+      },
+      // 当前页
+      currentChangeHandle (val) {
+        this.pageIndex = val
+        this.search()
+      },
+      // 多选
+      selectionChangeHandle (val) {
+        this.dataListSelections = val
+      },
+    }
+  }
+</script>