diff --git a/src/api/api_staff_role.js b/src/api/api_staff_role.js
index 59d9b82..ba4f20e 100644
--- a/src/api/api_staff_role.js
+++ b/src/api/api_staff_role.js
@@ -5,3 +5,18 @@ export const apiGetRoleList = params => {
   return http({url: '/lz_management/user/lzstaffrole/list', method: 'get', params})
 }
 
+export const apiSysRoleInfo = params => {
+  return http({url: `/lz_management/user/lzstaffrole/info/${params}`, method: 'post'})
+}
+
+export const apiSysMenuList = params => {
+  return http({url: '/lz_management/user/lzstaffrole/menu/list', method: 'get', params})
+}
+
+export const apiSysRoleList = (params, id) => {
+  return http({url: `/lz_management/user/lzstaffrole/role/list/${id}`, method: 'get', params})
+}
+
+export const apiSysRoleConfirm = (data, type) => {
+  return http({ url: `/lz_management/user/lzstaffrole/updateOrAdd`, method: 'post', data })
+}
diff --git a/src/views/modules/result/record/lzresultrecord.vue b/src/views/modules/result/record/lzresultrecord.vue
index 2de5007..36020e4 100644
--- a/src/views/modules/result/record/lzresultrecord.vue
+++ b/src/views/modules/result/record/lzresultrecord.vue
@@ -131,9 +131,9 @@ export default {
       } else if (status === 1) {
         return '审批中'
       } else if (status === 2) {
-        return '侍审批'
+        return '审批中'
       } else if (status === 3) {
-        return '侍提交'
+        return '审批中'
       } else if (status === 4) {
         return '审批通过'
       } else if (status === 5) {
diff --git a/src/views/modules/result/record/recorddetail-add-or-update.vue b/src/views/modules/result/record/recorddetail-add-or-update.vue
index b46efc4..ff9c0e9 100644
--- a/src/views/modules/result/record/recorddetail-add-or-update.vue
+++ b/src/views/modules/result/record/recorddetail-add-or-update.vue
@@ -248,7 +248,6 @@ export default {
           const data = await apiDetailInfo(this.dataForm.id)
           if (data && data.code === 0) {
             this.dataForm = data.detailInfo
-            console.log(this.dataForm.keyResult37)
             if (this.keyResultEditor !== null) {
               this.keyResultEditor.txt.html(this.dataForm.keyResult || '')
             }
diff --git a/src/views/modules/result/role/lzrecordrole-add-or-update.vue b/src/views/modules/result/role/lzrecordrole-add-or-update.vue
index e99e9f6..5d0e317 100644
--- a/src/views/modules/result/role/lzrecordrole-add-or-update.vue
+++ b/src/views/modules/result/role/lzrecordrole-add-or-update.vue
@@ -51,8 +51,8 @@ export default {
         children: 'children'
       },
       tempKey: -666666, // 临时key, 用于解决tree半选中状态项不能传给后台接口问题. # 待优化
-      apiType: '', // api类型
       defaultCheckedKeys: [],
+      apiType: '', // api类型
       dataForm: {
         roleName: ''
       },
diff --git a/src/views/modules/result/role/lzstaffrole-add-or-update.vue b/src/views/modules/result/role/lzstaffrole-add-or-update.vue
index 01e988e..39d4054 100644
--- a/src/views/modules/result/role/lzstaffrole-add-or-update.vue
+++ b/src/views/modules/result/role/lzstaffrole-add-or-update.vue
@@ -3,25 +3,70 @@
     :title="!dataForm.id ? '新增' : '修改'"
     :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="是否删除状态，1：删除，0：有效" prop="isDelete">
-      <el-input v-model="dataForm.isDelete" placeholder="是否删除状态，1：删除，0：有效"></el-input>
-    </el-form-item>
-    <el-form-item label="创建时间" prop="gmtCreate">
-      <el-input v-model="dataForm.gmtCreate" placeholder="创建时间"></el-input>
-    </el-form-item>
-    <el-form-item label="最后修改时间" prop="gmtModified">
-      <el-input v-model="dataForm.gmtModified" placeholder="最后修改时间"></el-input>
-    </el-form-item>
-    <el-form-item label="员工 id" prop="staffId">
-      <el-input v-model="dataForm.staffId" placeholder="员工 id"></el-input>
-    </el-form-item>
-    <el-form-item label="角色" prop="departmentLevel">
-      <el-input v-model="dataForm.departmentLevel" placeholder="角色"></el-input>
-    </el-form-item>
-    <el-form-item label="角色 id" prop="typeRoleIds">
-      <el-input v-model="dataForm.typeRoleIds" placeholder="角色 id"></el-input>
-    </el-form-item>
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmit()"
+             label-width="80px">
+      <el-form-item label="员工姓名">
+        <el-select v-model="dataForm.staffId" placeholder="请选择" clearable filterable>
+          <el-option
+            v-for="item in staffs"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="员工角色">
+        <el-select v-model="dataForm.departmentLevel" placeholder="请选择" clearable filterable>
+          <el-option
+            v-for="item in departmentLevels"
+            :key="item.id"
+            :label="item.departmentLevel"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="审批目标角色">
+        <el-select v-model="dataForm.targetRole" placeholder="请选择" clearable filterable>
+          <el-option
+            v-for="item in targetRoles"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="审批业绩角色">
+        <el-select v-model="dataForm.resultRole" placeholder="请选择" clearable filterable>
+          <el-option
+            v-for="item in resultRoles"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item size="mini" label="授权">
+        <el-tree
+          :data="menuList"
+          :props="menuListTreeProps"
+          node-key="menuId"
+          ref="menuListTree"
+          :default-expand-all="true"
+          :default-checked-keys="defaultCheckedKeys"
+          :filter-node-method="filterNode"
+          show-checkbox
+        >
+          <span class="custom-tree-node" slot-scope="{ node, data }">
+            <span>{{ node.label }}</span>
+          </span>
+        </el-tree>
+      </el-form-item>
+
+
     </el-form>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取消</el-button>
@@ -30,100 +75,152 @@
   </el-dialog>
 </template>
 
+
 <script>
-  export default {
-    data () {
-      return {
-        visible: false,
-        dataForm: {
-          id: 0,
-          isDelete: '',
-          gmtCreate: '',
-          gmtModified: '',
-          staffId: '',
-          departmentLevel: '',
-          typeRoleIds: ''
-        },
-        dataRule: {
-          isDelete: [
-            { required: true, message: '是否删除状态，1：删除，0：有效不能为空', trigger: 'blur' }
-          ],
-          gmtCreate: [
-            { required: true, message: '创建时间不能为空', trigger: 'blur' }
-          ],
-          gmtModified: [
-            { required: true, message: '最后修改时间不能为空', trigger: 'blur' }
-          ],
-          staffId: [
-            { required: true, message: '员工 id不能为空', trigger: 'blur' }
-          ],
-          departmentLevel: [
-            { required: true, message: '角色不能为空', trigger: 'blur' }
-          ],
-          typeRoleIds: [
-            { required: true, message: '角色 id不能为空', trigger: 'blur' }
-          ]
-        }
-      }
-    },
-    methods: {
-      init (id) {
-        this.dataForm.id = id || 0
-        this.visible = true
-        this.$nextTick(() => {
-          this.$refs['dataForm'].resetFields()
-          if (this.dataForm.id) {
-            this.$http({
-              url: this.$http.adornUrl(`/user/lzstaffrole/info/${this.dataForm.id}`),
-              method: 'get',
-              params: this.$http.adornParams()
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.dataForm.isDelete = data.lzstaffrole.isDelete
-                this.dataForm.gmtCreate = data.lzstaffrole.gmtCreate
-                this.dataForm.gmtModified = data.lzstaffrole.gmtModified
-                this.dataForm.staffId = data.lzstaffrole.staffId
-                this.dataForm.departmentLevel = data.lzstaffrole.departmentLevel
-                this.dataForm.typeRoleIds = data.lzstaffrole.typeRoleIds
-              }
-            })
-          }
-        })
+import {apiSysRoleInfo, apiSysMenuList, apiSysRoleList, apiSysRoleConfirm} from '@/api/api_staff_role'
+import {treeDataTranslate} from '@/utils'
+
+export default {
+  data () {
+    return {
+      visible: false,
+      staffs: [],
+      targetRoles: [],
+      resultRoles: [],
+      departmentLevels: [{
+        id: 1,
+        departmentLevel: 'HR'
+      }, {
+        id: 2,
+        departmentLevel: 'BOSS'
+      }],
+      lzStaffRole: {},
+      menuList: [],
+      menuListTreeProps: {
+        label: 'name',
+        children: 'children'
       },
-      // 表单提交
-      dataFormSubmit () {
-        this.$refs['dataForm'].validate((valid) => {
-          if (valid) {
-            this.$http({
-              url: this.$http.adornUrl(`/user/lzstaffrole/${!this.dataForm.id ? 'save' : 'update'}`),
-              method: 'post',
-              data: this.$http.adornData({
-                'id': this.dataForm.id || undefined,
-                'isDelete': this.dataForm.isDelete,
-                'gmtCreate': this.dataForm.gmtCreate,
-                'gmtModified': this.dataForm.gmtModified,
-                'staffId': this.dataForm.staffId,
-                'departmentLevel': this.dataForm.departmentLevel,
-                'typeRoleIds': this.dataForm.typeRoleIds
-              })
-            }).then(({data}) => {
-              if (data && data.code === 0) {
-                this.$message({
-                  message: '操作成功',
-                  type: 'success',
-                  duration: 1500,
-                  onClose: () => {
-                    this.visible = false
-                    this.$emit('refreshDataList')
-                  }
-                })
-              } else {
-                this.$message.error(data.msg)
-              }
-            })
-          }
-        })
+      tempKey: -666666, // 临时key, 用于解决tree半选中状态项不能传给后台接口问题. # 待优化
+      defaultCheckedKeys: [],
+      dataForm: {
+        staffId: '',
+        departmentLevel: '',
+        targetRole: '',
+        resultRole: ''
+      },
+      dataRule: {
+        staffId: [
+          { required: true, message: '员工名称不能为空', trigger: 'blur' }
+        ],
+        departmentLevel: [
+          { required: true, message: '请选择HR或BOSS', trigger: 'blur' }
+        ],
+        targetRole: [
+          { required: true, message: '请选择目标角色', trigger: 'blur' }
+        ],
+        resultRole: [
+          { required: true, message: '请选择月未总结角色', trigger: 'blur' }
+        ]
       }
     }
+  },
+  methods: {
+    async init (id) {
+      this.dataForm.id = id || 0
+      this.visible = true
+      this.$nextTick(() => {
+        this.dataForm.staffId = ''
+        this.dataForm.departmentLevel = ''
+        this.dataForm.targetRole = ''
+        this.dataForm.resultRole = ''
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getDataList()
+        }
+      })
+      await this.handleGetSysMenuList()
+      await this.handleEdit()
+    },
+    // 获取数据列表
+    async getDataList () {
+      const data = await apiSysRoleInfo(this.dataForm.id)
+      if (data && data.code === 0) {
+        this.staffs = data.staffs
+        this.lzStaffRole = data.lzStaffRole
+        this.dataForm.staffId = data.lzStaffRole.staffId
+        this.dataForm.departmentLevel = data.lzStaffRole.departmentLevel
+        this.targetRoles = data.targetRoles
+        this.resultRoles = data.targetRoles
+        let d = JSON.parse(data.lzStaffRole.typeRoleIds)
+        this.dataForm.targetRole = d.type1
+        this.dataForm.resultRole = d.type2
+      }
+    },
+    // 获取权限列表
+    async handleGetSysMenuList () {
+      let res = await apiSysMenuList({})
+      this.menuList = treeDataTranslate(res, 'menuId')
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        this.$refs.menuListTree.setCheckedKeys([])
+      })
+    },
+    filterNode (value, data) {
+      data.disabled = true
+      return value.includes(data.menuId)
+    },
+    // 编辑
+    handleEdit () {
+      apiSysRoleList({}, `/${this.dataForm.id}`).then(res => {
+        if (res && res.code === 0) {
+          this.dataForm = Object.assign({}, this.dataForm, res.role)
+          var idx = res.role.menuIdList.indexOf(this.tempKey)
+          if (idx !== -1) {
+            res.role.menuIdList.splice(idx, res.role.menuIdList.length - idx)
+          }
+          if (this.disable) {
+            this.$refs.menuListTree.filter(res.role.menuIdList)
+          }
+          this.defaultCheckedKeys = res.role.menuIdList
+        }
+      })
+    },
+    // 提交
+    dataFormSubmit () {
+      if (this.disable) {
+        this.visible = false
+        return
+      }
+      alert( this.dataForm.departmentLevel)
+      this.$refs['dataForm'].validate((valid) => {
+        if (valid) {
+          let params = {
+            'id': this.dataForm.id,
+            'menuIdList': [].concat(this.$refs.menuListTree.getCheckedKeys(), [this.tempKey], this.$refs.menuListTree.getHalfCheckedKeys()),
+            'staffId': this.dataForm.staffId,
+            'departmentLevel': this.dataForm.departmentLevel,
+            'targetRole': this.dataForm.targetRole,
+            'resultRole': this.dataForm.resultRole
+          }
+          apiSysRoleConfirm(params, this.apiType).then(res => {
+            if (res && res.code === 0) {
+              this.$message({
+                message: '操作成功',
+                type: 'success',
+                duration: 1500,
+                onClose: () => {
+                  this.visible = false
+                  this.$emit('refreshDataList')
+                }
+              })
+            } else {
+              this.$message.error(res.msg)
+            }
+          })
+        }
+      })
+    }
   }
+}
 </script>