Merge branch 'level' into ol_12_30

src/views/categroyManager/insideSetting/modals/handover.vue

@@ -24,6 +24,7 @@
 </template>
 <script>
 import { array2object } from '@/helpers/utils'
+import { employeeOperate } from '@/api/systemManage'
 import { employeeLevelDetail, employeeLevel, employeeFindEmployeeByRole } from '../api'
 import selectUser from './select-user'
 export default {
@@ -98,8 +99,12 @@ export default {
     async submit() {
       if (!this.$refs.form) {
         try {
-          await employeeLevel([])
+          await employeeOperate({
+            employeeId: this.detail.id,
+            operate: 'DEMISSION'
+          })
           this.$message.success('提交成功')
+          this.$listeners.close()
           this.$listeners.submited()
         } catch (error) {}
         return
@@ -116,6 +121,7 @@ export default {
           try {
             await employeeLevel(list)
             this.$message.success('提交成功')
+            this.$listeners.close()
             this.$listeners.submited()
           } catch (error) {}
         }

src/views/categroyManager/insideSetting/staffManager.vue

@@ -137,7 +137,7 @@
               <el-button @click="onStaffOperation('LOCK_UNLOCK', scope.row)"
                          v-permission="'employee/employeeOperate'"
                          type="text">{{ scope.row.lockFlag == 1 ? '解冻' : '冻结' }}</el-button>
-              <el-button @click="onStaffOperation('DEMISSION', scope.row)"
+              <el-button @click="onStaffOperation('REINSTATE', scope.row)"
                          v-permission="'employee/employeeOperate'"
                          v-if="scope.row.demissionDate"
                          type="text">复职</el-button>