去除岗位管理前后端代码

nladmin-ui/src/api/system/job.js

@@ -1,40 +0,0 @@
-import request from '@/utils/request'
-
-export function getAllJob() {
-  const params = {
-    page: 0,
-    size: 9999,
-    enabled: true
-  }
-  return request({
-    url: 'api/job',
-    method: 'get',
-    params
-  })
-}
-
-export function add(data) {
-  return request({
-    url: 'api/job',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/job',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/job',
-    method: 'put',
-    data
-  })
-}
-
-export default { add, edit, del }

nladmin-ui/src/views/system/job/index.vue

@@ -1,115 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--工具栏-->
-    <div class="head-container">
-      <eHeader :dict="dict" :permission="permission" />
-      <crudOperation :permission="permission" />
-    </div>
-    <!--表格渲染-->
-    <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
-      <el-table-column type="selection" width="55" />
-      <el-table-column prop="name" label="名称" />
-      <el-table-column prop="jobSort" label="排序">
-        <template slot-scope="scope">
-          {{ scope.row.jobSort }}
-        </template>
-      </el-table-column>
-      <el-table-column prop="status" label="状态" align="center">
-        <template slot-scope="scope">
-          <el-switch
-            v-model="scope.row.enabled"
-            active-color="#409EFF"
-            inactive-color="#F56C6C"
-            @change="changeEnabled(scope.row, scope.row.enabled)"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column prop="createTime" label="创建日期">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <!--   编辑与删除   -->
-      <el-table-column
-        v-permission="['admin','job:edit','job:del']"
-        label="操作"
-        width="130px"
-        align="center"
-        fixed="right"
-      >
-        <template slot-scope="scope">
-          <udOperation
-            :data="scope.row"
-            :permission="permission"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
-    <!--分页组件-->
-    <pagination />
-    <!--表单渲染-->
-    <eForm :job-status="dict.job_status" />
-  </div>
-</template>
-
-<script>
-import crudJob from '@/api/system/job'
-import eHeader from './module/header'
-import eForm from './module/form'
-import CRUD, { presenter } from '@crud/crud'
-import crudOperation from '@crud/CRUD.operation'
-import pagination from '@crud/Pagination'
-import udOperation from '@crud/UD.operation'
-
-export default {
-  name: 'Job',
-  components: { eHeader, eForm, crudOperation, pagination, udOperation },
-  cruds() {
-    return CRUD({
-      title: '岗位',
-      url: 'api/job',
-      sort: ['jobSort,asc', 'id,desc'],
-      crudMethod: { ...crudJob }
-    })
-  },
-  mixins: [presenter()],
-  // 数据字典
-  dicts: ['job_status'],
-  data() {
-    return {
-      permission: {
-        add: ['admin', 'job:add'],
-        edit: ['admin', 'job:edit'],
-        del: ['admin', 'job:del']
-      }
-    }
-  },
-  methods: {
-    // 改变状态
-    changeEnabled(data, val) {
-      this.$confirm('此操作将 "' + this.dict.label.job_status[val] + '" ' + data.name + '岗位, 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        // eslint-disable-next-line no-undef
-        crudJob.edit(data).then(() => {
-          // eslint-disable-next-line no-undef
-          this.crud.notify(this.dict.label.job_status[val] + '成功', 'success')
-        }).catch(err => {
-          data.enabled = !data.enabled
-          console.log(err.data.message)
-        })
-      }).catch(() => {
-        data.enabled = !data.enabled
-      })
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
- ::v-deep .el-input-number .el-input__inner {
-    text-align: left;
-  }
-</style>

nladmin-ui/src/views/system/job/module/form.vue

@@ -1,110 +0,0 @@
-<template>
-  <el-dialog
-    append-to-body
-    :close-on-click-modal="false"
-    :before-close="crud.cancelCU"
-    :visible="crud.status.cu > 0"
-    :title="crud.status.title"
-    width="500px"
-  >
-    <el-form
-      ref="form"
-      :model="form"
-      :rules="rules"
-      size="mini"
-      label-width="80px"
-    >
-      <el-form-item
-        label="名称"
-        prop="name"
-      >
-        <el-input
-          v-model="form.name"
-          style="width: 370px;"
-        />
-      </el-form-item>
-      <el-form-item
-        label="排序"
-        prop="jobSort"
-      >
-        <el-input-number
-          v-model.number="form.jobSort"
-          :min="0"
-          :max="999"
-          controls-position="right"
-          style="width: 370px;"
-        />
-      </el-form-item>
-      <el-form-item
-        v-if="form.pid !== 0"
-        label="状态"
-        prop="enabled"
-      >
-        <el-radio
-          v-for="item in jobStatus"
-          :key="item.id"
-          v-model="form.enabled"
-          :label="item.value === 'true'"
-        >
-          {{ item.label }}
-        </el-radio>
-      </el-form-item>
-    </el-form>
-    <div
-      slot="footer"
-      class="dialog-footer"
-    >
-      <el-button
-        type="text"
-        @click="crud.cancelCU"
-      >
-        取消
-      </el-button>
-      <el-button
-        :loading="crud.status.cu === 2"
-        type="primary"
-        @click="crud.submitCU"
-      >
-        确认
-      </el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script>
-import { form } from '@crud/crud'
-
-const defaultForm = {
-  id: null,
-  name: '',
-  jobSort: 999,
-  enabled: true
-}
-export default {
-  mixins: [form(defaultForm)],
-  props: {
-    jobStatus: {
-      type: Array,
-      required: true
-    }
-  },
-  data() {
-    return {
-      rules: {
-        name: [
-          { required: true, message: '请输入名称', trigger: 'blur' }
-        ],
-        jobSort: [
-          { required: true, message: '请输入序号', trigger: 'blur', type: 'number' }
-        ]
-      }
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
- ::v-deep .el-input-number .el-input__inner {
-    text-align: left;
-  }
-</style>

nladmin-ui/src/views/system/job/module/header.vue

@@ -1,32 +0,0 @@
-<template>
-  <div
-    v-if="crud.props.searchToggle"
-  >
-    <el-input v-model="query.name" clearable size="mini" placeholder="输入岗位名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
-    <date-range-picker v-model="query.createTime" class="date-item" />
-    <el-select v-model="query.enabled" clearable size="mini" placeholder="状态" class="filter-item" style="width: 90px" @change="crud.toQuery">
-      <el-option v-for="item in dict.dict.job_status" :key="item.value" :label="item.label" :value="item.value" />
-    </el-select>
-    <rrOperation />
-  </div>
-</template>
-
-<script>
-import { header } from '@crud/crud'
-import rrOperation from '@crud/RR.operation'
-import DateRangePicker from '@/components/DateRangePicker'
-export default {
-  components: { rrOperation, DateRangePicker },
-  mixins: [header()],
-  props: {
-    dict: {
-      type: Object,
-      required: true
-    },
-    permission: {
-      type: Object,
-      required: true
-    }
-  }
-}
-</script>

nladmin-ui/src/views/system/user/index.vue

@@ -90,23 +90,7 @@
                 placeholder="选择部门"
               />
             </el-form-item>
-            <el-form-item label="岗位" prop="jobs">
-              <el-select
-                v-model="jobDatas"
-                style="width: 200px"
-                multiple
-                placeholder="请选择"
-                @remove-tag="deleteTag"
-                @change="changeJob"
-              >
-                <el-option
-                  v-for="item in jobs"
-                  :key="item.name"
-                  :label="item.name"
-                  :value="item.id"
-                />
-              </el-select>
-            </el-form-item>
+
             <el-form-item label="性别">
               <el-radio-group v-model="form.gender" style="width: 178px">
                 <el-radio label="男">男</el-radio>
@@ -123,12 +107,6 @@
                 </el-radio>
               </el-radio-group>
             </el-form-item>
-            <el-form-item label="外部标识" prop="extId">
-              <el-input v-model="form.extId" style="width: 200px;"/>
-            </el-form-item>
-            <el-form-item label="外部用户标识" prop="extId">
-              <el-input v-model="form.extuserId" style="width: 200px;"/>
-            </el-form-item>
             <el-form-item style="margin-bottom: 0;" label="角色" prop="roles">
               <el-select
                 v-model="roleDatas"
@@ -216,7 +194,6 @@ import crudUser from '@/api/system/user'
 import { isvalidPhone } from '@/utils/validate'
 import { getDepts, getDeptSuperior } from '@/api/system/dept'
 import { getAll, getLevel } from '@/api/system/role'
-import { getAllJob } from '@/api/system/job'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
@@ -235,13 +212,10 @@ const defaultForm = {
   nickName: null,
   gender: '男',
   email: null,
-  enabled: 'false',
+  enabled: 'true',
   roles: [],
-  jobs: [],
   dept: { id: null },
-  phone: null,
-  extId: null,
-  extuserId: null
+  phone: null
 }
 export default {
   name: 'User',
@@ -255,9 +229,7 @@ export default {
   data() {
     // 自定义验证
     const validPhone = (rule, value, callback) => {
-      if (!value) {
-        callback(new Error('请输入电话号码'))
-      } else if (!isvalidPhone(value)) {
+      if (!isvalidPhone(value)) {
         callback(new Error('请输入正确的11位手机号码'))
       } else {
         callback()
@@ -265,8 +237,8 @@ export default {
     }
     return {
       height: document.documentElement.clientHeight - 180 + 'px;',
-      deptName: '', depts: [], deptDatas: [], jobs: [], level: 3, roles: [],
-      jobDatas: [], roleDatas: [], // 多选时使用
+      deptName: '', depts: [], deptDatas: [], level: 3, roles: [],
+      roleDatas: [], // 多选时使用
       defaultProps: { children: 'children', label: 'name', isLeaf: 'leaf' },
       permission: {
         add: ['admin', 'user:add'],
@@ -287,11 +259,10 @@ export default {
           { min: 2, max: 20, message: '长度在 2 到 20 个字符', trigger: 'blur' }
         ],
         email: [
-          { required: true, message: '请输入邮箱地址', trigger: 'blur' },
           { type: 'email', message: '请输入正确的邮箱地址', trigger: 'blur' }
         ],
         phone: [
-          { required: true, trigger: 'blur', validator: validPhone }
+          { required: false, trigger: 'blur', validator: validPhone }
         ]
       }
     }
@@ -341,7 +312,6 @@ export default {
         this.getSupDepts(form.dept.id)
       }
       this.getRoleLevel()
-      this.getJobs()
       form.enabled = form.enabled.toString()
     },
     // 新增前将多选的值设置为空
@@ -351,8 +321,6 @@ export default {
     },
     // 初始化编辑时候的角色与岗位
     [CRUD.HOOK.beforeToEdit](crud, form) {
-      this.getJobs(this.form.dept.id)
-      this.jobDatas = []
       this.roleDatas = []
       userRoles = []
       userJobs = []
@@ -362,11 +330,6 @@ export default {
         const rol = { id: role.id }
         userRoles.push(rol)
       })
-      form.jobs.forEach(function(job, index) {
-        _this.jobDatas.push(job.id)
-        const data = { id: job.id }
-        userJobs.push(data)
-      })
     },
     // 提交前做的操作
     [CRUD.HOOK.afterValidateCU](crud) {
@@ -390,7 +353,7 @@ export default {
         return false
       }
       crud.form.roles = userRoles
-      crud.form.jobs = userJobs
+      // crud.form.jobs = userJobs
       return true
     },
     // 获取左侧部门数据
@@ -489,13 +452,6 @@ export default {
       }).catch(() => {
       })
     },
-    // 获取弹窗内岗位数据
-    getJobs() {
-      getAllJob().then(res => {
-        this.jobs = res.content
-      }).catch(() => {
-      })
-    },
     // 获取权限级别
     getRoleLevel() {
       getLevel().then(res => {