Merge branch 'master' of https://e.coding.net/ctcdevteam/cnas
This commit is contained in:
commit
322e3ee0da
|
|
@ -1,32 +1,32 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
export function getUserDetailList(query) {
|
||||
export function getAbilityList(query) {
|
||||
return request({
|
||||
url: '/employee/userdetail/',
|
||||
url: '/employee/ability/',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
export function createUserDetail(data) {
|
||||
export function createAbility(data) {
|
||||
return request({
|
||||
url: '/employee/userdetail/',
|
||||
url: '/employee/ability/',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function updateUserDetail(id, data) {
|
||||
export function updateAbility(id, data) {
|
||||
return request({
|
||||
url: `/employee/userdetail/${id}/`,
|
||||
url: `/employee/ability/${id}/`,
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function deleteUserDetail(id) {
|
||||
export function deleteAbility(id) {
|
||||
return request({
|
||||
url: `/employee/userdetail/${id}/`,
|
||||
url: `/employee/ability/${id}/`,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
|
@ -1,32 +1,32 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
export function getUserDetailList(query) {
|
||||
export function getEducationList(query) {
|
||||
return request({
|
||||
url: '/employee/userdetail/',
|
||||
url: '/employee/education/',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
export function createUserDetail(data) {
|
||||
export function createEducation(data) {
|
||||
return request({
|
||||
url: '/employee/userdetail/',
|
||||
url: '/employee/education/',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function updateUserDetail(id, data) {
|
||||
export function updateEducation(id, data) {
|
||||
return request({
|
||||
url: `/employee/userdetail/${id}/`,
|
||||
url: `/employee/education/${id}/`,
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function deleteUserDetail(id) {
|
||||
export function deleteEducation(id) {
|
||||
return request({
|
||||
url: `/employee/userdetail/${id}/`,
|
||||
url: `/employee/education/${id}/`,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
|
@ -15,6 +15,13 @@ export function createEmployee(data) {
|
|||
data
|
||||
})
|
||||
}
|
||||
export function getEmployee(id, data) {
|
||||
return request({
|
||||
url: `/employee/employee/${id}/`,
|
||||
method: 'get',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function updateEmployee(id, data) {
|
||||
return request({
|
||||
|
|
|
|||
|
|
@ -1,32 +1,32 @@
|
|||
import request from '@/utils/request'
|
||||
|
||||
export function getUserDetailList(query) {
|
||||
export function getQualificationList(query) {
|
||||
return request({
|
||||
url: '/employee/userdetail/',
|
||||
url: '/employee/qualification/',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
export function createUserDetail(data) {
|
||||
export function createQualification(data) {
|
||||
return request({
|
||||
url: '/employee/userdetail/',
|
||||
url: '/employee/qualification/',
|
||||
method: 'post',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function updateUserDetail(id, data) {
|
||||
export function updateQualification(id, data) {
|
||||
return request({
|
||||
url: `/employee/userdetail/${id}/`,
|
||||
url: `/employee/qualification/${id}/`,
|
||||
method: 'put',
|
||||
data
|
||||
})
|
||||
}
|
||||
|
||||
export function deleteUserDetail(id) {
|
||||
export function deleteQualification(id) {
|
||||
return request({
|
||||
url: `/employee/userdetail/${id}/`,
|
||||
url: `/employee/qualification/${id}/`,
|
||||
method: 'delete'
|
||||
})
|
||||
}
|
||||
|
|
@ -72,10 +72,10 @@ export const asyncRoutes = [
|
|||
path: 'employee',
|
||||
name: 'Employee',
|
||||
component: () => import('@/views/employee/employee'),
|
||||
meta: { title: '人员信息', icon: 'example', perms: ['employee_manage'] }
|
||||
meta: { title: '人员信息', icon: 'example', perms: ['employee_view'] }
|
||||
},
|
||||
{
|
||||
path: 'employee/update',
|
||||
path: 'employee/update/:id',
|
||||
name: 'EmployeeUpdate',
|
||||
component: () => import('@/views/employee/employeeupdate'),
|
||||
meta: { title: '人员信息变更', icon: 'example', perms: ['employee_update'] },
|
||||
|
|
@ -84,8 +84,8 @@ export const asyncRoutes = [
|
|||
{
|
||||
path: 'qualification',
|
||||
name: 'Qualification',
|
||||
component: () => import('@/views/employee/qualification'),
|
||||
meta: { title: '注册资格', icon: 'example', perms: ['qualification_manage'] }
|
||||
component: () => import('@/views/qualification/qualification'),
|
||||
meta: { title: '注册资格', icon: 'example', perms: ['qualification_view'] }
|
||||
},
|
||||
{
|
||||
path: 'train',
|
||||
|
|
|
|||
|
|
@ -357,9 +357,6 @@ export function genTree(data) {
|
|||
const map = {}
|
||||
data.forEach(item => {
|
||||
item.label = item.name
|
||||
if(item.fullname){
|
||||
item.label = item.fullname
|
||||
}
|
||||
item.value = item.id
|
||||
map[item.id] = item
|
||||
})
|
||||
|
|
|
|||
|
|
@ -0,0 +1,185 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<div style="display:flex">
|
||||
<treeselect v-model="listQuery.cert_field" :multiple="false" :options="cert_fieldOptions" :disable-branch-nodes="true" placeholder="认证领域" @input="handleFilter" style="width: 260px" clearable/>
|
||||
<el-input
|
||||
v-model="listQuery.search"
|
||||
placeholder="专业代码"
|
||||
style="width: 300px;margin-left:10px"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="handleFilter"
|
||||
/>
|
||||
<el-button
|
||||
class="filter-item"
|
||||
style="margin-left: 10px;"
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleFilter"
|
||||
>搜索</el-button>
|
||||
<el-button
|
||||
class="filter-item"
|
||||
style="margin-left: 10px;"
|
||||
type="primary"
|
||||
icon="el-icon-refresh-left"
|
||||
@click="resetFilter"
|
||||
>刷新重置</el-button>
|
||||
</div>
|
||||
<div style="margin-top:6px">
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleCreate">新增</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
v-loading="listLoading"
|
||||
:data="tableData.results"
|
||||
style="width: 100%;margin-top:10px;"
|
||||
border
|
||||
fit
|
||||
stripe
|
||||
highlight-current-row
|
||||
max-height="500"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="认证领域">
|
||||
<template slot-scope="scope" v-if="scope.row.cert_field_">{{ scope.row.cert_field_.fullname }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="专业">
|
||||
<template slot-scope="scope">
|
||||
<span v-if="scope.row.cert_field_.code=='CCC'">{{scope.row.major_rule_code}}</span>
|
||||
<span v-else>{{scope.row.major_.fullname}}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="能力来源">
|
||||
<template slot-scope="scope">{{ scope.row.afrom_.name }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="能力项">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-for="(item, index) in scope.row.auditor_abilitys_" :key="index" style="margin:2px">{{item.name}}</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="评定日期">
|
||||
<template slot-scope="scope">{{ scope.row.access_date }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否暂停">
|
||||
<template slot-scope="scope">
|
||||
<el-tag type="danger" v-if="scope.row.is_paused">是</el-tag>
|
||||
<el-tag type="success" v-else>否</el-tag></template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="操作" width="260px">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
:disabled="!checkPermission(['ability_update'])"
|
||||
@click="handleUpdate(scope)"
|
||||
>编辑</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
size="small"
|
||||
:disabled="!checkPermission(['ability_delete'])"
|
||||
@click="handleDelete(scope)"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="tableData.count>0"
|
||||
:total="tableData.count"
|
||||
:page.sync="listQuery.page"
|
||||
:limit.sync="listQuery.page_size"
|
||||
@pagination="getList"
|
||||
/>
|
||||
<el-dialog :title="dgType=='create'?'新增':'编辑'" :visible.sync="dgVisiable" :close-on-click-modal="false" >
|
||||
<Abilityform ref="Abilityform" :formData="formData" :action="dgType" @close="closeDg" :cert_fieldOptions="cert_fieldOptions"></Abilityform>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import { getAbilityList, createAbility, updateAbility, deleteAbility} from "@/api/ability"
|
||||
import Abilityform from "@/views/ability/abilityform"
|
||||
import { getDictList } from "@/api/dict"
|
||||
import Pagination from "@/components/Pagination"
|
||||
import checkPermission from '@/utils/permission'
|
||||
import Treeselect from '@riophae/vue-treeselect'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
import { genTree } from '../../utils'
|
||||
export default {
|
||||
name:'Ability',
|
||||
props:['employee'],
|
||||
components: { Pagination, Treeselect, Abilityform },
|
||||
data() {
|
||||
return {
|
||||
tableData: {count:0},
|
||||
listLoading: true,
|
||||
listQuery: {
|
||||
page: 1,
|
||||
page_size: 20,
|
||||
is_enabled:true
|
||||
},
|
||||
cert_fieldOptions: [],
|
||||
formData:{},
|
||||
dgType:'create',
|
||||
dgVisiable:false
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.listQuery.employee = this.employee
|
||||
this.getList();
|
||||
this.getTypeOptions()
|
||||
},
|
||||
methods: {
|
||||
checkPermission,
|
||||
getList() {
|
||||
this.listLoading = true;
|
||||
getAbilityList(this.listQuery).then(response => {
|
||||
if (response.data) {
|
||||
this.tableData = response.data
|
||||
}
|
||||
this.listLoading = false
|
||||
});
|
||||
},
|
||||
getTypeOptions() {
|
||||
getDictList({type__code:'cert_field'}).then(res=>{
|
||||
this.cert_fieldOptions = genTree(res.data)
|
||||
})
|
||||
},
|
||||
resetFilter() {
|
||||
this.listQuery = {
|
||||
page: 1,
|
||||
page_size: 20,
|
||||
is_enabled:true,
|
||||
employee: this.employee
|
||||
}
|
||||
this.getList()
|
||||
},
|
||||
handleFilter() {
|
||||
this.listQuery.page = 1
|
||||
this.getList()
|
||||
},
|
||||
handleCreate() {
|
||||
this.formData = Object.assign({}, {employee:this.employee, is_paused:false})
|
||||
this.dgType = 'create'
|
||||
this.dgVisiable = true
|
||||
// this.$refs.Abilityform.formData = this.formData
|
||||
// this.$refs.Abilityform.action = this.dgType
|
||||
},
|
||||
handleUpdate(scope) {
|
||||
this.formData = Object.assign({}, scope.row)
|
||||
this.dgType = 'update'
|
||||
this.dgVisiable = true
|
||||
},
|
||||
handleDelete(scope) {
|
||||
deleteAbility(scope.row.id).then(res=>{
|
||||
this.$message.success('成功')
|
||||
this.getList()
|
||||
})
|
||||
},
|
||||
closeDg(val) {
|
||||
if(val){
|
||||
this.getList()
|
||||
}
|
||||
this.dgVisiable=false
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -0,0 +1,263 @@
|
|||
<template>
|
||||
<div>
|
||||
<el-row :gutter="15">
|
||||
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
|
||||
<el-form-item label="认证领域" prop="cert_field">
|
||||
<treeselect
|
||||
v-model="formData.cert_field"
|
||||
:multiple="false"
|
||||
:normalizer="normalizer"
|
||||
:options="cert_fieldOptions"
|
||||
:disable-branch-nodes="true"
|
||||
placeholder="请选择认证领域"
|
||||
:style="{width: '100%'}"
|
||||
@select="typeChange"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="能力来源" prop="afrom">
|
||||
<el-select
|
||||
v-model="formData.afrom"
|
||||
placeholder="请选择能力来源"
|
||||
clearable
|
||||
:style="{width: '100%'}"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in afromOptions"
|
||||
:key="index"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
:disabled="item.disabled"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="专业(CCC)" prop="major_rule" v-if="cert_field_code == 'CCC'">
|
||||
<el-select
|
||||
v-model="formData.major_rule"
|
||||
placeholder="请选择专业(CCC)"
|
||||
clearable
|
||||
:style="{width: '100%'}"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in major_ruleOptions"
|
||||
:key="index"
|
||||
:label="item.code + '/' + item.name"
|
||||
:value="item.id"
|
||||
:disabled="item.disabled"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="专业" prop="major" v-else>
|
||||
<treeselect
|
||||
v-if="cert_field_code == 'PV'"
|
||||
v-model="formData.major"
|
||||
:normalizer="normalizer"
|
||||
:multiple="false"
|
||||
:options="majorOptions2"
|
||||
:disable-branch-nodes="true"
|
||||
placeholder="请选择专业"
|
||||
:style="{width: '100%'}"
|
||||
clearable
|
||||
/>
|
||||
<treeselect
|
||||
v-else
|
||||
v-model="formData.major"
|
||||
:normalizer="normalizer"
|
||||
:multiple="false"
|
||||
:options="majorOptions1"
|
||||
:disable-branch-nodes="true"
|
||||
placeholder="请选择专业"
|
||||
:style="{width: '100%'}"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="能力项" prop="auditor_abilitys">
|
||||
<el-select
|
||||
v-model="formData.auditor_abilitys"
|
||||
placeholder="请选择能力项"
|
||||
multiple
|
||||
clearable
|
||||
:style="{width: '100%'}"
|
||||
>
|
||||
<el-option
|
||||
v-for="(item, index) in auditor_abilitysOptions"
|
||||
:key="index"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
:disabled="item.disabled"
|
||||
></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="评定日期" prop="access_date">
|
||||
<el-date-picker
|
||||
v-model="formData.access_date"
|
||||
format="yyyy-MM-dd"
|
||||
value-format="yyyy-MM-dd"
|
||||
:style="{width: '100%'}"
|
||||
placeholder="请选择评定日期"
|
||||
clearable
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="是否暂停" prop="is_paused" required>
|
||||
<el-switch v-model="formData.is_paused"></el-switch>
|
||||
</el-form-item>
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input
|
||||
v-model="formData.remark"
|
||||
type="textarea"
|
||||
placeholder="请输入备注"
|
||||
:autosize="{minRows: 4, maxRows: 4}"
|
||||
:style="{width: '100%'}"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</el-row>
|
||||
<div slot="footer" align="right">
|
||||
<el-button type="danger" @click="close(false)">取消</el-button>
|
||||
<el-button type="primary" @click="handelConfirm">确定</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { createAbility, updateAbility } from "@/api/ability";
|
||||
import { getImplementRuleList } from "@/api/implementrule"
|
||||
import { getDictList } from "@/api/dict";
|
||||
import { genTree } from "@/utils";
|
||||
import Treeselect from "@riophae/vue-treeselect";
|
||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||
export default {
|
||||
name: "Abilityform",
|
||||
inheritAttrs: false,
|
||||
components: { Treeselect },
|
||||
props: ["formData", "action", "cert_fieldOptions"],
|
||||
data() {
|
||||
return {
|
||||
rules: {
|
||||
cert_field: [
|
||||
{
|
||||
required: true,
|
||||
message: "请选择认证领域",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
afrom: [
|
||||
{
|
||||
required: true,
|
||||
message: "请选择能力来源",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
major: [],
|
||||
major_rule: [],
|
||||
auditor_abilitys: [
|
||||
{
|
||||
required: true,
|
||||
type: "array",
|
||||
message: "请至少选择一个能力项",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
access_date: [
|
||||
{
|
||||
required: true,
|
||||
message: "请选择评定日期",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
remark: []
|
||||
},
|
||||
cert_field_code: null,
|
||||
afromOptions: [],
|
||||
majorOptions: [],
|
||||
major_ruleOptions: [],
|
||||
auditor_abilitysOptions: [],
|
||||
majorOptions1: [],
|
||||
majorOptions2: []
|
||||
};
|
||||
},
|
||||
computed: {},
|
||||
watch: {
|
||||
// formData:'chooseDate'
|
||||
},
|
||||
created() {
|
||||
if(this.formData.cert_field_){
|
||||
// this.cert_field_code = this.formData.cert_field_.code
|
||||
this.typeChange(this.formData.cert_field_)
|
||||
}
|
||||
this.getafromOptions();
|
||||
this.getauditor_abilitysOptions();
|
||||
this.getmajorOptions1();
|
||||
this.getmajorOptions2();
|
||||
this.getmajor_ruleOptions()
|
||||
|
||||
},
|
||||
mounted() {},
|
||||
methods: {
|
||||
close(val) {
|
||||
// this.$refs['elForm'].resetFields()
|
||||
this.$emit("close", val);
|
||||
},
|
||||
typeChange(node, id) {
|
||||
this.cert_field_code = node.code;
|
||||
console.log(this.cert_field_code);
|
||||
},
|
||||
getafromOptions() {
|
||||
getDictList({ type__code: "ability_from" }).then(res => {
|
||||
this.afromOptions = genTree(res.data);
|
||||
});
|
||||
},
|
||||
getauditor_abilitysOptions() {
|
||||
getDictList({ type__code: "auditor_ability" }).then(res => {
|
||||
this.auditor_abilitysOptions = genTree(res.data);
|
||||
});
|
||||
},
|
||||
getmajorOptions1() {
|
||||
getDictList({ type__code: "cnas_scope" }).then(res => {
|
||||
this.majorOptions1 = genTree(res.data);
|
||||
});
|
||||
},
|
||||
getmajorOptions2() {
|
||||
getDictList({ type__code: "pv_scope" }).then(res => {
|
||||
this.majorOptions2 = genTree(res.data);
|
||||
});
|
||||
},
|
||||
getauditor_abilitysOptions() {
|
||||
getDictList({ type__code: "auditor_ability" }).then(res => {
|
||||
this.auditor_abilitysOptions = genTree(res.data);
|
||||
});
|
||||
},
|
||||
getmajor_ruleOptions() {
|
||||
getImplementRuleList({cert_field__code:'CCC'}).then(res=>{
|
||||
this.major_ruleOptions = res.data.results
|
||||
})
|
||||
},
|
||||
handelConfirm() {
|
||||
this.$refs["elForm"].validate(valid => {
|
||||
if (!valid) return;
|
||||
if (this.action == "create") {
|
||||
createAbility(this.formData).then(res => {
|
||||
this.$message.success("成功");
|
||||
this.close(true);
|
||||
});
|
||||
} else {
|
||||
updateAbility(this.formData.id, this.formData).then(res => {
|
||||
this.$message.success("成功");
|
||||
this.close(true);
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
normalizer(node) {
|
||||
//去掉children=[]的children属性
|
||||
if (node.children && !node.children.length) {
|
||||
delete node.children;
|
||||
}
|
||||
return {
|
||||
id: node.id,
|
||||
label: node.fullname?node.fullname:node.name,
|
||||
children: node.children
|
||||
};
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -0,0 +1,149 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<div style="margin-top:6px">
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleCreate">新增</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
v-loading="listLoading"
|
||||
:data="tableData.results"
|
||||
style="width: 100%;margin-top:10px;"
|
||||
border
|
||||
fit
|
||||
stripe
|
||||
highlight-current-row
|
||||
max-height="500"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="毕业学校">
|
||||
<template slot-scope="scope" >{{ scope.row.school }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="所学专业">
|
||||
<template slot-scope="scope">{{ scope.row.major }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="文化程度">
|
||||
<template slot-scope="scope">{{ scope.row.level_.name }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="入学日期">
|
||||
<template slot-scope="scope">{{ scope.row.admission_date }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="毕业日期">
|
||||
<template slot-scope="scope">{{ scope.row.graduation_date }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="操作" width="260px">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
:disabled="!checkPermission(['education_update'])"
|
||||
@click="handleUpdate(scope)"
|
||||
>编辑</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
size="small"
|
||||
:disabled="!checkPermission(['education_delete'])"
|
||||
@click="handleDelete(scope)"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="tableData.count>0"
|
||||
:total="tableData.count"
|
||||
:page.sync="listQuery.page"
|
||||
:limit.sync="listQuery.page_size"
|
||||
@pagination="getList"
|
||||
/>
|
||||
<el-dialog :title="dgType=='create'?'新增':'编辑'" :visible.sync="dgVisiable" :close-on-click-modal="false" >
|
||||
<Educationform ref="Educationform" :formData="formData" :action="dgType" @close="closeDg" :levelOptions="levelOptions"></Educationform>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import { getEducationList, deleteEducation} from "@/api/education"
|
||||
import Educationform from "@/views/education/educationform"
|
||||
import { getDictList } from "@/api/dict"
|
||||
import Pagination from "@/components/Pagination"
|
||||
import checkPermission from '@/utils/permission'
|
||||
import Treeselect from '@riophae/vue-treeselect'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
import { genTree } from '../../utils'
|
||||
export default {
|
||||
name:'Education',
|
||||
props:['employee'],
|
||||
components: { Pagination, Treeselect, Educationform },
|
||||
data() {
|
||||
return {
|
||||
tableData: {count:0},
|
||||
listLoading: true,
|
||||
listQuery: {
|
||||
page: 1,
|
||||
page_size: 20,
|
||||
},
|
||||
levelOptions: [],
|
||||
formData:{},
|
||||
dgType:'create',
|
||||
dgVisiable:false
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.listQuery.employee = this.employee
|
||||
this.getList();
|
||||
this.getTypeOptions()
|
||||
},
|
||||
methods: {
|
||||
checkPermission,
|
||||
getList() {
|
||||
this.listLoading = true;
|
||||
getEducationList(this.listQuery).then(response => {
|
||||
if (response.data) {
|
||||
this.tableData = response.data
|
||||
}
|
||||
this.listLoading = false
|
||||
});
|
||||
},
|
||||
getTypeOptions() {
|
||||
getDictList({type__code:'education_level'}).then(res=>{
|
||||
this.levelOptions = genTree(res.data)
|
||||
})
|
||||
},
|
||||
resetFilter() {
|
||||
this.listQuery = {
|
||||
page: 1,
|
||||
page_size: 20,
|
||||
employee: this.employee
|
||||
}
|
||||
this.getList()
|
||||
},
|
||||
handleFilter() {
|
||||
this.listQuery.page = 1
|
||||
this.getList()
|
||||
},
|
||||
handleCreate() {
|
||||
this.formData = Object.assign({}, {employee:this.employee})
|
||||
this.dgType = 'create'
|
||||
this.dgVisiable = true
|
||||
// this.$refs.Educationform.formData = this.formData
|
||||
// this.$refs.Educationform.action = this.dgType
|
||||
},
|
||||
handleUpdate(scope) {
|
||||
this.formData = Object.assign({}, scope.row)
|
||||
this.dgType = 'update'
|
||||
this.dgVisiable = true
|
||||
},
|
||||
handleDelete(scope) {
|
||||
deleteEducation(scope.row.id).then(res=>{
|
||||
this.$message.success('成功')
|
||||
this.getList()
|
||||
})
|
||||
},
|
||||
closeDg(val) {
|
||||
if(val){
|
||||
this.getList()
|
||||
}
|
||||
this.dgVisiable=false
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -0,0 +1,129 @@
|
|||
<template>
|
||||
<div>
|
||||
<el-row :gutter="15">
|
||||
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="毕业院校" prop="school">
|
||||
<el-input v-model="formData.school" placeholder="请输入毕业院校" clearable :style="{width: '100%'}">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="所学专业" prop="major">
|
||||
<el-input v-model="formData.major" placeholder="请输入所学专业" clearable :style="{width: '100%'}">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="文化程度" prop="level">
|
||||
<el-select v-model="formData.level" placeholder="请选择文化程度" clearable :style="{width: '100%'}">
|
||||
<el-option v-for="(item, index) in levelOptions" :key="index" :label="item.label"
|
||||
:value="item.value" :disabled="item.disabled"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="入学日期" prop="admission_date">
|
||||
<el-date-picker v-model="formData.admission_date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
|
||||
:style="{width: '100%'}" placeholder="请选择入学日期" clearable></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="毕业日期" prop="graduation_date">
|
||||
<el-date-picker v-model="formData.graduation_date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
|
||||
:style="{width: '100%'}" placeholder="请选择毕业日期" clearable></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注"
|
||||
:autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-form>
|
||||
</el-row>
|
||||
<div slot="footer" align="right">
|
||||
<el-button type="danger" @click="close(false)">取消</el-button>
|
||||
<el-button type="primary" @click="handelConfirm">确定</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { createEducation, updateEducation } from "@/api/education"
|
||||
import { genTree } from '../../utils'
|
||||
export default {
|
||||
name: "Educationform",
|
||||
inheritAttrs: false,
|
||||
components: { },
|
||||
props: ["formData", "action", "levelOptions"],
|
||||
data() {
|
||||
return {
|
||||
rules: {
|
||||
school: [{
|
||||
required: true,
|
||||
message: '请输入毕业院校',
|
||||
trigger: 'blur'
|
||||
}],
|
||||
major: [{
|
||||
required: true,
|
||||
message: '请输入所学专业',
|
||||
trigger: 'blur'
|
||||
}],
|
||||
level: [{
|
||||
required: true,
|
||||
message: '请选择文化程度',
|
||||
trigger: 'change'
|
||||
}],
|
||||
admission_date: [{
|
||||
required: true,
|
||||
message: '请选择入学日期',
|
||||
trigger: 'change'
|
||||
}],
|
||||
graduation_date: [{
|
||||
required: true,
|
||||
message: '请选择毕业日期',
|
||||
trigger: 'change'
|
||||
}],
|
||||
remark: [],
|
||||
},
|
||||
levelOptions: [],
|
||||
};
|
||||
},
|
||||
computed: {},
|
||||
watch: {
|
||||
// formData:'chooseDate'
|
||||
},
|
||||
created() {
|
||||
this.getlevelOptions()
|
||||
},
|
||||
mounted() {},
|
||||
methods: {
|
||||
close(val) {
|
||||
// this.$refs['elForm'].resetFields()
|
||||
this.$emit("close", val);
|
||||
},
|
||||
|
||||
// getlevelOptions() {
|
||||
// getDictList({ type__code: "education_level" }).then(res => {
|
||||
// this.levelOptions = genTree(res.data);
|
||||
// });
|
||||
// },
|
||||
handelConfirm() {
|
||||
this.$refs["elForm"].validate(valid => {
|
||||
if (!valid) return;
|
||||
if (this.action == "create") {
|
||||
createEducation(this.formData).then(res => {
|
||||
this.$message.success("成功");
|
||||
this.close(true);
|
||||
});
|
||||
} else {
|
||||
updateEducation(this.formData.id, this.formData).then(res => {
|
||||
this.$message.success("成功");
|
||||
this.close(true);
|
||||
});
|
||||
}
|
||||
});
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -155,7 +155,7 @@ export default {
|
|||
// this.$router.push({path:"/certset/implementrule/create"})
|
||||
// },
|
||||
handleUpdate(scope) {
|
||||
this.$router.push({path:"/employee/employee/update",query:{id:scope.row.id}})
|
||||
this.$router.push({name:"EmployeeUpdate",params:{id:scope.row.id}})
|
||||
},
|
||||
handleDelete(scope) {
|
||||
deleteEmployee(scope.row.id).then(res=>{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,282 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="编号" prop="code">
|
||||
<el-input v-model="formData.code" placeholder="请输入编号" clearable :style="{width: '100%'}"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="易记码" prop="remember_code">
|
||||
<el-input v-model="formData.remember_code" placeholder="请输入易记码" clearable :style="{width: '100%'}">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="财务编号" prop="finance_number">
|
||||
<el-input v-model="formData.finance_number" placeholder="请输入财务编号" clearable :style="{width: '100%'}">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="性别" prop="gender">
|
||||
<el-select v-model="formData.gender" placeholder="请选择性别" clearable :style="{width: '100%'}" >
|
||||
<el-option
|
||||
v-for="item in genderOptions"
|
||||
:key="item.key"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="座机号" prop="landline">
|
||||
<el-input v-model="formData.landline" placeholder="请输入座机" clearable :style="{width: '100%'}">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="邮箱" prop="email">
|
||||
<el-input v-model="formData.email" placeholder="请输入邮箱" clearable :style="{width: '100%'}">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="职称" prop="gender">
|
||||
<el-select v-model="formData.pro_title" placeholder="请选择职称" clearable :style="{width: '100%'}" >
|
||||
<el-option
|
||||
v-for="item in titleOptions"
|
||||
:key="item.key"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="身份证号" prop="ID_number">
|
||||
<el-input v-model="formData.ID_number" placeholder="请输入身份证号" clearable :style="{width: '100%'}">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="出生日期" prop="birth" >
|
||||
<el-date-picker
|
||||
:style="{width: '100%'}"
|
||||
v-model="formData.birth"
|
||||
type="date"
|
||||
value-format="yyyy-MM-dd"
|
||||
placeholder="选择日期">
|
||||
</el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="劳务费级别" prop="gender">
|
||||
<el-select v-model="formData.fee_level" placeholder="请选择劳务费级别" clearable :style="{width: '100%'}" >
|
||||
<el-option
|
||||
v-for="item in feeOptions"
|
||||
:key="item.key"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="省市区" prop="region">
|
||||
<el-cascader
|
||||
clearable :style="{width: '100%'}"
|
||||
v-model="formData.region"
|
||||
:options="regionOptions"
|
||||
></el-cascader>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="详细地址" prop="address">
|
||||
<el-input v-model="formData.address" placeholder="请输入详细地址" clearable :style="{width: '100%'}"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="是否在职" prop="is_onjob">
|
||||
<el-switch v-model="formData.is_onjob"></el-switch>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="是否专职" prop="is_fulltime">
|
||||
<el-switch v-model="formData.is_fulltime"></el-switch>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="4">
|
||||
<el-form-item label="缴纳保险" prop="is_payinsurance">
|
||||
<el-switch v-model="formData.is_payinsurance"></el-switch>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="证件照" prop="photo">
|
||||
<el-upload :action="upUrl" accept=".png,.jpeg,.jpg"
|
||||
:headers="upHeaders" class="avatar-uploader" :show-file-list="false" :on-success="handleSuccess"
|
||||
:before-upload="beforeUpload">
|
||||
<img v-if="formData.photo" :src="formData.photo" class="avatar">
|
||||
<i v-else class="el-icon-plus avatar-uploader-icon"></i>
|
||||
|
||||
</el-upload>
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="6">
|
||||
<el-form-item label="签名图片" prop="signature">
|
||||
<el-upload :action="upUrl"
|
||||
:headers="upHeaders"></el-upload>
|
||||
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item size="large">
|
||||
<el-button type="primary" @click="submitForm">保存</el-button>
|
||||
<el-button @click="goBack">返回</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
</template>
|
||||
<style>
|
||||
.avatar-uploader .el-upload {
|
||||
border: 1px dashed #d9d9d9;
|
||||
border-radius: 6px;
|
||||
cursor: pointer;
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
}
|
||||
.avatar-uploader .el-upload:hover {
|
||||
border-color: #409EFF;
|
||||
}
|
||||
.avatar-uploader-icon {
|
||||
font-size: 28px;
|
||||
color: #8c939d;
|
||||
width: 100px;
|
||||
height: 126px;
|
||||
line-height: 126px;
|
||||
text-align: center;
|
||||
}
|
||||
.avatar {
|
||||
width: 100px;
|
||||
height: 126px;
|
||||
display: block;
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
import { upUrl, upHeaders } from "@/api/file"
|
||||
import { getDictList } from "@/api/dict"
|
||||
import { genTree } from "@/utils"
|
||||
import { getEmployee, updateEmployee } from '@/api/employee'
|
||||
const defaultForm = {
|
||||
is_onjob:true,
|
||||
is_fulltime:true,
|
||||
is_payinsurance:true
|
||||
}
|
||||
export default {
|
||||
name:'Employeedetail',
|
||||
components: {},
|
||||
props: ['id'],
|
||||
data() {
|
||||
return {
|
||||
upHeaders: upHeaders(),
|
||||
upUrl: upUrl(),
|
||||
formData: Object.assign({}, defaultForm),
|
||||
titleOptions:[],
|
||||
regionOptions:[],
|
||||
feeOptions:[],
|
||||
genderOptions:[
|
||||
{'value':'男','label':'男'},
|
||||
{'value':'女','label':'女'}
|
||||
],
|
||||
rules:{
|
||||
email:[
|
||||
{
|
||||
pattern: /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/,
|
||||
message: '邮箱格式错误',
|
||||
trigger: 'blur'
|
||||
}],
|
||||
ID_number:[
|
||||
{
|
||||
pattern: /^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$|^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}([0-9]|X)$/,
|
||||
message: '身份证格式错误',
|
||||
trigger: 'blur'
|
||||
}]
|
||||
}
|
||||
}
|
||||
},
|
||||
computed: {},
|
||||
watch: {},
|
||||
created() {
|
||||
this.formData.id = this.id
|
||||
this.getDetail()
|
||||
this.getTitleOptions()
|
||||
this.getReginOptions()
|
||||
this.getFeeOptions()
|
||||
},
|
||||
mounted() {},
|
||||
methods: {
|
||||
getDetail() {
|
||||
getEmployee(this.id).then(res=>{
|
||||
this.formData = res.data
|
||||
})
|
||||
},
|
||||
beforeUpload(file) {
|
||||
const isLt1M = file.size / 1024 / 1024 < 1;
|
||||
if (!isLt1M) {
|
||||
this.$message.error('上传头像图片大小不能超过 1MB!');
|
||||
}
|
||||
return isLt1M;
|
||||
},
|
||||
handleSuccess(res, file) {
|
||||
this.formData.photo = res.data.path;
|
||||
},
|
||||
getTitleOptions() {
|
||||
getDictList({type__code:'pro_title'}).then(res=>{
|
||||
this.titleOptions=genTree(res.data)
|
||||
})
|
||||
},
|
||||
getFeeOptions() {
|
||||
getDictList({type__code:'fee_level'}).then(res=>{
|
||||
this.feeOptions = genTree(res.data)
|
||||
})
|
||||
},
|
||||
getReginOptions() {
|
||||
getDictList({type__code:'china_regions'}).then(res=>{
|
||||
this.regionOptions=genTree(res.data)
|
||||
})
|
||||
},
|
||||
submitForm() {
|
||||
this.$refs['elForm'].validate(valid => {
|
||||
if (!valid) return
|
||||
// TODO 提交表单
|
||||
var data = this.formData
|
||||
data.region = data.region[data.region.length-1]
|
||||
updateEmployee(this.id,data).then(res=>{
|
||||
this.$message.success('成功')
|
||||
})
|
||||
})
|
||||
},
|
||||
resetForm() {
|
||||
this.$refs['elForm'].resetFields()
|
||||
},
|
||||
goBack() {
|
||||
this.$router.go(-1)
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
@ -1,109 +1,45 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
|
||||
<el-row>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="编号" prop="code">
|
||||
<el-input v-model="formData.code" placeholder="请输入编号" clearable :style="{width: '100%'}"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="易记码" prop="remember_code">
|
||||
<el-input v-model="formData.remember_code" placeholder="请输入易记码" clearable :style="{width: '100%'}">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="性别" prop="gender">
|
||||
<el-select v-model="formData.gender" placeholder="请选择性别" clearable :style="{width: '100%'}" >
|
||||
<el-option
|
||||
v-for="item in genderOptions"
|
||||
:key="item.key"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="座机号" prop="landline">
|
||||
<el-input v-model="formData.landline" placeholder="请输入座机" clearable :style="{width: '100%'}">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="邮箱" prop="email">
|
||||
<el-input v-model="formData.email" placeholder="请输入邮箱" clearable :style="{width: '100%'}">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="职称" prop="gender">
|
||||
<el-select v-model="formData.pro_title" placeholder="请选择职称" clearable :style="{width: '100%'}" >
|
||||
<el-option
|
||||
v-for="item in titleOptions"
|
||||
:key="item.key"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="座机号" prop="landline">
|
||||
<el-input v-model="formData.landline" placeholder="请输入座机" clearable :style="{width: '100%'}">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="邮箱" prop="email">
|
||||
<el-input v-model="formData.email" placeholder="请输入邮箱" clearable :style="{width: '100%'}">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item size="large">
|
||||
<el-button type="primary" @click="submitForm">提交</el-button>
|
||||
<el-button @click="resetForm">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<el-tabs type="border-card" >
|
||||
<el-tab-pane label="详细信息" style="height:700px;overflow-y:auto;overflow-x:hidden;">
|
||||
<Employeedetail :id="employee"></Employeedetail>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="注册资格" style="height:700px;overflow-y:auto;overflow-x:hidden;">
|
||||
<Qualification :employee="employee"></Qualification>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="专业能力" style="height:700px;overflow-y:auto;overflow-x:hidden;">
|
||||
<Ability :employee="employee"></Ability>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="教育经历" style="height:700px;overflow-y:auto;overflow-x:hidden;">
|
||||
<Education :employee="employee"></Education>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
const defaultForm = {
|
||||
|
||||
}
|
||||
import Employeedetail from "@/views/employee/employeedetailupdate"
|
||||
import Qualification from "@/views/qualification/qualification"
|
||||
import Ability from "@/views/ability/ability"
|
||||
import Education from "@/views/education/education"
|
||||
|
||||
export default {
|
||||
components: {},
|
||||
components: { Employeedetail, Qualification, Ability, Education },
|
||||
props: [],
|
||||
data() {
|
||||
return {
|
||||
formData: Object.assign({}, defaultForm),
|
||||
rules: {},
|
||||
genderOptions:[
|
||||
{'value':'男','label':'男'},
|
||||
{'value':'女','label':'女'}
|
||||
]
|
||||
}
|
||||
employee:null
|
||||
};
|
||||
},
|
||||
computed: {},
|
||||
watch: {},
|
||||
created() {},
|
||||
watch: {
|
||||
// "formData.cert_field": "changeRules"
|
||||
},
|
||||
created() {
|
||||
this.employee = this.$route.params.id; //接收参数
|
||||
},
|
||||
mounted() {},
|
||||
methods: {
|
||||
submitForm() {
|
||||
this.$refs['elForm'].validate(valid => {
|
||||
if (!valid) return
|
||||
// TODO 提交表单
|
||||
})
|
||||
},
|
||||
resetForm() {
|
||||
this.$refs['elForm'].resetFields()
|
||||
},
|
||||
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -1,168 +0,0 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<div style="display:flex">
|
||||
<treeselect v-model="listQuery.cert_field" :multiple="false" :options="typeOptions" placeholder="认证类型" @input="handleFilter" style="width: 260px" clearable/>
|
||||
<!-- <el-select
|
||||
v-model="listQuery.cert_field"
|
||||
placeholder="认证类型"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
class="filter-item"
|
||||
@change="handleFilter"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in typeOptions"
|
||||
:key="item.key"
|
||||
:label="item.display_name"
|
||||
:value="item.key"
|
||||
/>
|
||||
</el-select> -->
|
||||
<el-input
|
||||
v-model="listQuery.search"
|
||||
placeholder="规则名称/编号"
|
||||
style="width: 300px;"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="handleFilter"
|
||||
/>
|
||||
<el-button
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleFilter"
|
||||
>搜索</el-button>
|
||||
<el-button
|
||||
class="filter-item"
|
||||
style="margin-left: 10px;"
|
||||
type="primary"
|
||||
icon="el-icon-refresh-left"
|
||||
@click="resetFilter"
|
||||
>刷新重置</el-button>
|
||||
</div>
|
||||
<div style="margin-top:6px">
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleCreate">新增</el-button>
|
||||
</div>
|
||||
<el-table
|
||||
v-loading="listLoading"
|
||||
:data="ruleList.results"
|
||||
style="width: 100%;margin-top:10px;"
|
||||
border
|
||||
fit
|
||||
stripe
|
||||
highlight-current-row
|
||||
max-height="600"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column align="header-center" label="编号">
|
||||
<template slot-scope="scope">{{ scope.row.code }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="名称">
|
||||
<template slot-scope="scope">{{ scope.row.name }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="所属认证类型">
|
||||
<template slot-scope="scope">{{ scope.row.cert_field.fullname }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="header-center" label="产品领域">
|
||||
<template slot-scope="scope">{{ scope.row.pv_scope.fullname }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="header-center" label="产品分类">
|
||||
<template slot-scope="scope">{{ scope.row.pv_class.fullname }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="上传日期">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.create_time }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="操作" width="260px">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
:disabled="!checkPermission(['implementrule_update'])"
|
||||
@click="handleUpdate(scope)"
|
||||
>编辑</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
size="small"
|
||||
:disabled="!checkPermission(['implementrule_delete'])"
|
||||
@click="handleDelete(scope)"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="ruleList.count>0"
|
||||
:total="ruleList.count"
|
||||
:page.sync="listQuery.page"
|
||||
:limit.sync="listQuery.page_size"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { getImplementRuleList, deleteImplementRule } from "@/api/implementrule"
|
||||
import { getDictList } from "@/api/dict"
|
||||
import Pagination from "@/components/Pagination"
|
||||
import checkPermission from '@/utils/permission'
|
||||
import Treeselect from '@riophae/vue-treeselect'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
import { genTree } from '../../utils'
|
||||
export default {
|
||||
components: { Pagination, Treeselect },
|
||||
data() {
|
||||
return {
|
||||
ruleList: {count:0},
|
||||
listLoading: true,
|
||||
listQuery: {
|
||||
page: 1,
|
||||
page_size: 20
|
||||
},
|
||||
typeOptions: [],
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.getList();
|
||||
this.getTypeOptions()
|
||||
},
|
||||
methods: {
|
||||
checkPermission,
|
||||
getList() {
|
||||
this.listLoading = true;
|
||||
getImplementRuleList(this.listQuery).then(response => {
|
||||
if (response.data) {
|
||||
this.ruleList = response.data
|
||||
}
|
||||
this.listLoading = false
|
||||
});
|
||||
},
|
||||
getTypeOptions() {
|
||||
getDictList({type__code:'cert_field'}).then(res=>{
|
||||
this.typeOptions = genTree(res.data)
|
||||
})
|
||||
},
|
||||
resetFilter() {
|
||||
this.listQuery = {
|
||||
page: 1,
|
||||
page_size: 20
|
||||
}
|
||||
this.getList()
|
||||
},
|
||||
handleFilter() {
|
||||
this.listQuery.page = 1
|
||||
this.getList()
|
||||
},
|
||||
handleCreate() {
|
||||
this.$router.push({path:"/certset/implementrule/create"})
|
||||
},
|
||||
handleUpdate(scope) {
|
||||
this.$router.push({path:"/certset/implementrule/update",query:{id:scope.row.id}})
|
||||
},
|
||||
handleDelete(scope) {
|
||||
deleteImplementRule(scope.row.id).then(res=>{
|
||||
this.$message.success('成功')
|
||||
this.getList()
|
||||
})
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -52,27 +52,34 @@
|
|||
max-height="600"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column align="header-center" label="编号">
|
||||
<el-table-column label="编号">
|
||||
<template slot-scope="scope">{{ scope.row.code }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="名称">
|
||||
<el-table-column label="名称">
|
||||
<template slot-scope="scope">{{ scope.row.name }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="所属认证类型">
|
||||
<template slot-scope="scope">{{ scope.row.cert_field.fullname }}</template>
|
||||
<el-table-column label="所属认证类型">
|
||||
<template slot-scope="scope" v-if="scope.row.cert_field">{{ scope.row.cert_field.fullname }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="header-center" label="产品领域">
|
||||
<template slot-scope="scope">{{ scope.row.pv_scope.fullname }}</template>
|
||||
<el-table-column label="产品领域">
|
||||
<template slot-scope="scope" v-if="scope.row.pv_scope">{{ scope.row.pv_scope.fullname }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="header-center" label="产品分类">
|
||||
<template slot-scope="scope">{{ scope.row.pv_class.fullname }}</template>
|
||||
<el-table-column label="产品分类">
|
||||
<template slot-scope="scope" >
|
||||
<div v-if="scope.row.pv_class">
|
||||
<el-tag style="margin:2px">{{ scope.row.pv_class.fullname }}</el-tag>
|
||||
</div>
|
||||
<div>
|
||||
<el-tag v-for="(item, index) in scope.row.ccc_list" :key="index" style="margin:2px">{{item.fullname}}</el-tag>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="上传日期">
|
||||
<template slot-scope="scope">
|
||||
<span>{{ scope.row.create_time }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column align="center" label="操作" width="260px">
|
||||
<el-table-column label="操作" >
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
type="primary"
|
||||
|
|
|
|||
|
|
@ -52,7 +52,7 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24" v-if="cert_field_code =='pv'">
|
||||
<el-col :span="24" v-if="cert_field_code =='PV'">
|
||||
<el-form-item label="产品领域" prop="pv_scope">
|
||||
<el-select
|
||||
v-model="formData.pv_scope"
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24" v-if="cert_field_code =='pv'">
|
||||
<el-col :span="24" v-if="cert_field_code =='PV'">
|
||||
<el-form-item label="产品分类" prop="pv_class">
|
||||
<treeselect
|
||||
v-model="formData.pv_class"
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
></treeselect>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24" v-if="cert_field_code =='ccc'">
|
||||
<el-col :span="24" v-if="cert_field_code =='CCC'">
|
||||
<el-form-item label="产品分类" prop="ccc_list">
|
||||
<treeselect
|
||||
v-model="formData.ccc_list"
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
</el-col>
|
||||
</el-form>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="单元类型划分" v-if="(cert_field_code =='ccc'|| cert_field_code == 'pv')&&(formData.id)">
|
||||
<el-tab-pane label="单元类型划分" v-if="(cert_field_code =='CCC'|| cert_field_code == 'PV')&&(formData.id)">
|
||||
<Unittype :implementrule="formData.id"></Unittype>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
|
|
@ -217,7 +217,7 @@ export default {
|
|||
this.formData.path = response.data.path;
|
||||
},
|
||||
changeRules(val) {
|
||||
if (val == "pv") {
|
||||
if (val == "PV") {
|
||||
this.rules.pv_scope = [
|
||||
{
|
||||
required: true,
|
||||
|
|
@ -233,7 +233,7 @@ export default {
|
|||
}
|
||||
];
|
||||
this.rules.ccc_list = [];
|
||||
} else if (val == "ccc") {
|
||||
} else if (val == "CCC") {
|
||||
this.rules.ccc_list = [
|
||||
{
|
||||
required: true,
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24" v-if="cert_field_code =='pv'">
|
||||
<el-col :span="24" v-if="cert_field_code =='PV'">
|
||||
<el-form-item label="产品领域" prop="pv_scope">
|
||||
<el-select
|
||||
v-model="formData.pv_scope"
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24" v-if="cert_field_code =='pv'">
|
||||
<el-col :span="24" v-if="cert_field_code =='PV'">
|
||||
<el-form-item label="产品分类" prop="pv_class">
|
||||
<treeselect
|
||||
v-model="formData.pv_class"
|
||||
|
|
@ -85,7 +85,7 @@
|
|||
></treeselect>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24" v-if="cert_field_code =='ccc'">
|
||||
<el-col :span="24" v-if="cert_field_code =='CCC'">
|
||||
<el-form-item label="产品分类" prop="ccc_list">
|
||||
<treeselect
|
||||
v-model="formData.ccc_list"
|
||||
|
|
@ -119,7 +119,7 @@
|
|||
</el-col>
|
||||
</el-form>
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="单元类型划分" v-if="(cert_field_code =='ccc'|| cert_field_code == 'pv')&&(formData.id)">
|
||||
<el-tab-pane label="单元类型划分" v-if="(cert_field_code =='CCC'|| cert_field_code == 'PV')&&(formData.id)">
|
||||
<Unittype :implementrule="formData.id"></Unittype>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
|
|
@ -222,7 +222,7 @@ export default {
|
|||
this.formData.path = response.data.path;
|
||||
},
|
||||
changeRules(val) {
|
||||
if (val == "pv") {
|
||||
if (val == "PV") {
|
||||
this.rules.pv_scope = [
|
||||
{
|
||||
required: true,
|
||||
|
|
@ -238,7 +238,7 @@ export default {
|
|||
}
|
||||
];
|
||||
this.rules.ccc_list = [];
|
||||
} else if (val == "ccc") {
|
||||
} else if (val == "CCC") {
|
||||
this.rules.ccc_list = [
|
||||
{
|
||||
required: true,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,205 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<div style="display:flex">
|
||||
<el-select
|
||||
v-model="listQuery.is_enabled"
|
||||
placeholder="是否有效"
|
||||
clearable
|
||||
style="width: 200px"
|
||||
class="filter-item"
|
||||
@change="handleFilter"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in enableOptions"
|
||||
:key="item.key"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
/>
|
||||
</el-select>
|
||||
<treeselect v-model="listQuery.cert_field" :multiple="false" :options="typeOptions" :disable-branch-nodes="true" placeholder="认证领域" @input="handleFilter" style="width: 260px" clearable/>
|
||||
<el-input
|
||||
v-model="listQuery.search"
|
||||
placeholder="证书/资格"
|
||||
style="width: 300px;"
|
||||
class="filter-item"
|
||||
@keyup.enter.native="handleFilter"
|
||||
/>
|
||||
<el-button
|
||||
class="filter-item"
|
||||
type="primary"
|
||||
icon="el-icon-search"
|
||||
@click="handleFilter"
|
||||
>搜索</el-button>
|
||||
<el-button
|
||||
class="filter-item"
|
||||
style="margin-left: 10px;"
|
||||
type="primary"
|
||||
icon="el-icon-refresh-left"
|
||||
@click="resetFilter"
|
||||
>刷新重置</el-button>
|
||||
</div>
|
||||
<div style="margin-top:6px">
|
||||
<el-button type="primary" icon="el-icon-plus" @click="handleCreate">新增</el-button>
|
||||
</el-switch>
|
||||
</div>
|
||||
<el-table
|
||||
v-loading="listLoading"
|
||||
:data="tableData.results"
|
||||
style="width: 100%;margin-top:10px;"
|
||||
border
|
||||
fit
|
||||
stripe
|
||||
highlight-current-row
|
||||
max-height="500"
|
||||
>
|
||||
<el-table-column type="index" width="50" />
|
||||
<el-table-column label="认证领域">
|
||||
<template slot-scope="scope" v-if="scope.row.cert_field_">{{ scope.row.cert_field_.fullname }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="证书号">
|
||||
<template slot-scope="scope">{{ scope.row.cert_number }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="资格类型">
|
||||
<template slot-scope="scope">{{ scope.row.auditor_type_.name }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="注册日期">
|
||||
<template slot-scope="scope">{{ scope.row.registration_date }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="到期日期">
|
||||
<template slot-scope="scope">{{ scope.row.expiration_date }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否暂停">
|
||||
<template slot-scope="scope">
|
||||
<el-tag type="danger" v-if="scope.row.is_paused">是</el-tag>
|
||||
<el-tag type="success" v-else>否</el-tag></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="是否有效">
|
||||
<template slot-scope="scope">
|
||||
<el-tag type="success" v-if="scope.row.is_enabled">有效</el-tag>
|
||||
<el-tag type="danger" v-else>失效</el-tag></template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" width="260px">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
:disabled="!checkPermission(['qualification_update'])"
|
||||
@click="handleUpdate(scope)"
|
||||
>编辑</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
size="small"
|
||||
:disabled="!checkPermission(['qualification_delete'])"
|
||||
@click="handleDelete(scope)"
|
||||
>删除</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="tableData.count>0"
|
||||
:total="tableData.count"
|
||||
:page.sync="listQuery.page"
|
||||
:limit.sync="listQuery.page_size"
|
||||
@pagination="getList"
|
||||
/>
|
||||
<el-dialog :title="dgType=='create'?'新增':'编辑'" :visible.sync="dgVisiable" :close-on-click-modal="false" >
|
||||
<Qualificationform ref="Qualificationform" :formData="formData" :action="dgType" @close="closeDg" ></Qualificationform>
|
||||
</el-dialog>
|
||||
</div>
|
||||
|
||||
</template>
|
||||
<script>
|
||||
import { getQualificationList, createQualification, updateQualification, deleteQualification} from "@/api/qualification"
|
||||
import Qualificationform from "@/views/qualification/qualificationform"
|
||||
import { getDictList } from "@/api/dict"
|
||||
import Pagination from "@/components/Pagination"
|
||||
import checkPermission from '@/utils/permission'
|
||||
import Treeselect from '@riophae/vue-treeselect'
|
||||
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
|
||||
import { genTree } from '../../utils'
|
||||
export default {
|
||||
name:'Qualification',
|
||||
props:['employee'],
|
||||
components: { Pagination, Treeselect, Qualificationform },
|
||||
data() {
|
||||
return {
|
||||
tableData: {count:0},
|
||||
listLoading: true,
|
||||
listQuery: {
|
||||
page: 1,
|
||||
page_size: 20,
|
||||
is_enabled:true
|
||||
},
|
||||
typeOptions: [],
|
||||
enableOptions:[
|
||||
{label:'全部',value:''},
|
||||
{label:'有效',value:true},
|
||||
{label:'失效',value:false}
|
||||
],
|
||||
formData:{},
|
||||
dgType:'create',
|
||||
dgVisiable:false
|
||||
};
|
||||
},
|
||||
created() {
|
||||
this.listQuery.employee = this.employee
|
||||
this.getList();
|
||||
this.getTypeOptions()
|
||||
},
|
||||
methods: {
|
||||
checkPermission,
|
||||
getList() {
|
||||
this.listLoading = true;
|
||||
getQualificationList(this.listQuery).then(response => {
|
||||
if (response.data) {
|
||||
this.tableData = response.data
|
||||
}
|
||||
this.listLoading = false
|
||||
});
|
||||
},
|
||||
getTypeOptions() {
|
||||
getDictList({type__code:'cert_field'}).then(res=>{
|
||||
this.typeOptions = genTree(res.data)
|
||||
})
|
||||
},
|
||||
resetFilter() {
|
||||
this.listQuery = {
|
||||
page: 1,
|
||||
page_size: 20,
|
||||
is_enabled:true,
|
||||
employee: this.employee
|
||||
}
|
||||
this.getList()
|
||||
},
|
||||
handleFilter() {
|
||||
this.listQuery.page = 1
|
||||
this.getList()
|
||||
},
|
||||
handleCreate() {
|
||||
this.formData = Object.assign({}, {employee:this.employee, is_paused:false, is_enabled:true})
|
||||
this.dgType = 'create'
|
||||
this.dgVisiable = true
|
||||
// this.$refs.Qualificationform.formData = this.formData
|
||||
// this.$refs.Qualificationform.action = this.dgType
|
||||
},
|
||||
handleUpdate(scope) {
|
||||
this.formData = Object.assign({}, scope.row)
|
||||
this.dgType = 'update'
|
||||
this.dgVisiable = true
|
||||
},
|
||||
handleDelete(scope) {
|
||||
deleteQualification(scope.row.id).then(res=>{
|
||||
this.$message.success('成功')
|
||||
this.getList()
|
||||
})
|
||||
},
|
||||
closeDg(val) {
|
||||
if(val){
|
||||
this.getList()
|
||||
}
|
||||
this.dgVisiable=false
|
||||
},
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -0,0 +1,161 @@
|
|||
<template>
|
||||
<div>
|
||||
<el-row :gutter="15">
|
||||
<el-form ref="elForm" :model="formData" :rules="rules" size="medium" label-width="100px">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="认证领域" prop="cert_field">
|
||||
<treeselect v-model="formData.cert_field" :multiple="false" :options="cert_fieldOptions" :disable-branch-nodes="true" placeholder="请选择认证领域" :style="{width: '100%'}" clearable/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="证书号" prop="cert_number">
|
||||
<el-input v-model="formData.cert_number" placeholder="请输入证书号" clearable :style="{width: '100%'}">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="资格类型" prop="auditor_type">
|
||||
<el-select v-model="formData.auditor_type" placeholder="请选择资格类型" clearable :style="{width: '100%'}">
|
||||
<el-option v-for="(item, index) in auditor_typeOptions" :key="index" :label="item.label"
|
||||
:value="item.value" :disabled="item.disabled"></el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="文号" prop="publish_number">
|
||||
<el-input v-model="formData.publish_number" placeholder="请输入文号" clearable :style="{width: '100%'}">
|
||||
</el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="证书注册" prop="registration_date">
|
||||
<el-date-picker v-model="formData.registration_date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
|
||||
:style="{width: '100%'}" placeholder="请选择证书注册" clearable></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="证书过期" prop="expiration_date">
|
||||
<el-date-picker v-model="formData.expiration_date" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
|
||||
:style="{width: '100%'}" placeholder="请选择证书过期" clearable></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否暂停" prop="is_paused" required>
|
||||
<el-switch v-model="formData.is_paused"></el-switch>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="是否有效" prop="is_enabled" required>
|
||||
<el-switch v-model="formData.is_enabled"></el-switch>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="备注" prop="remark">
|
||||
<el-input v-model="formData.remark" type="textarea" placeholder="请输入备注"
|
||||
:autosize="{minRows: 4, maxRows: 4}" :style="{width: '100%'}"></el-input>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-form>
|
||||
</el-row>
|
||||
<div slot="footer" align="right">
|
||||
<el-button type="danger" @click="close(false)">取消</el-button>
|
||||
<el-button type="primary" @click="handelConfirm">确定</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
import { createQualification, updateQualification } from "@/api/qualification"
|
||||
import { getDictList } from "@/api/dict";
|
||||
import { genTree } from "@/utils";
|
||||
import Treeselect from "@riophae/vue-treeselect";
|
||||
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
|
||||
export default {
|
||||
name:'Qualificationform',
|
||||
inheritAttrs: false,
|
||||
components: { Treeselect },
|
||||
props: ['formData', 'action'],
|
||||
data() {
|
||||
return {
|
||||
rules: {
|
||||
cert_field: [
|
||||
{
|
||||
required: true,
|
||||
message: "请选择认证领域",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
cert_number: [
|
||||
{
|
||||
required: true,
|
||||
message: "请输入证书号",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
auditor_type: [
|
||||
{
|
||||
required: true,
|
||||
message: "请选择资格类型",
|
||||
trigger: "blur"
|
||||
}
|
||||
],
|
||||
publish_number: [],
|
||||
registration_date: [{
|
||||
required: true,
|
||||
message: '请选择证书注册',
|
||||
trigger: 'blur'
|
||||
}],
|
||||
expiration_date: [{
|
||||
required: true,
|
||||
message: '请选择证书过期',
|
||||
trigger: 'blur'
|
||||
}],
|
||||
},
|
||||
cert_fieldOptions: [],
|
||||
auditor_typeOptions: []
|
||||
};
|
||||
},
|
||||
computed: {},
|
||||
watch: {
|
||||
// formData:'chooseDate'
|
||||
},
|
||||
created() {
|
||||
this.getCert_fieldOptions()
|
||||
this.getAud_typeOptions()
|
||||
},
|
||||
mounted() {
|
||||
},
|
||||
methods: {
|
||||
close(val) {
|
||||
// this.$refs['elForm'].resetFields()
|
||||
this.$emit("close", val);
|
||||
},
|
||||
getAud_typeOptions(){
|
||||
getDictList({ type__code: "auditor_qualification_type" }).then(res=>{
|
||||
this.auditor_typeOptions = genTree(res.data)
|
||||
})
|
||||
},
|
||||
getCert_fieldOptions(){
|
||||
getDictList({ type__code: "cert_field" }).then(res=>{
|
||||
this.cert_fieldOptions = genTree(res.data)
|
||||
})
|
||||
},
|
||||
handelConfirm() {
|
||||
this.$refs["elForm"].validate(valid => {
|
||||
if (!valid) return;
|
||||
if(this.action=='create'){
|
||||
createQualification(this.formData).then(res=>{
|
||||
this.$message.success('成功')
|
||||
this.close(true);
|
||||
})
|
||||
}else{
|
||||
updateQualification(this.formData.id, this.formData).then(res=>{
|
||||
this.$message.success('成功')
|
||||
this.close(true);
|
||||
})
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
@ -75,8 +75,8 @@
|
|||
<el-table-column label="是否有效">
|
||||
<template slot-scope="scope">
|
||||
|
||||
<el-tag type="danger" v-if="scope.row.is_deleted">无效</el-tag>
|
||||
<el-tag type="success" v-else>有效</el-tag>
|
||||
<el-tag type="success" v-if="scope.row.is_used">有效</el-tag>
|
||||
<el-tag type="danger" v-else>无效</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作">
|
||||
|
|
@ -147,11 +147,10 @@
|
|||
<el-form-item label="排序" prop="sort">
|
||||
<el-input-number v-model="dict.sort" :min="1" :max="999"></el-input-number>
|
||||
</el-form-item>
|
||||
<el-form-item label="状态" prop="is_deleted">
|
||||
<el-radio-group v-model="dict.is_deleted">
|
||||
<el-radio :label="false">有效</el-radio>
|
||||
<el-radio :label="true">无效</el-radio>
|
||||
</el-radio-group>
|
||||
<el-form-item label="是否有效" prop="is_used">
|
||||
<el-switch
|
||||
v-model="dict.is_used">
|
||||
</el-switch>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<div style="text-align:right;">
|
||||
|
|
@ -191,7 +190,7 @@ const defaultDict = {
|
|||
description: '',
|
||||
sort: 1,
|
||||
type: null,
|
||||
is_deleted: false,
|
||||
is_used: true,
|
||||
parent:null
|
||||
}
|
||||
export default {
|
||||
|
|
|
|||
|
|
@ -20,13 +20,15 @@ class ImplementRuleListSerializer(serializers.ModelSerializer):
|
|||
pv_scope = DictSerializer()
|
||||
pv_class = DictSerializer()
|
||||
cert_field = DictSerializer()
|
||||
ccc_list = DictSerializer(many=True)
|
||||
class Meta:
|
||||
model = ImplementRule
|
||||
fields = ['id', 'code', 'name', 'cert_field', 'pv_scope', 'pv_class', 'create_time']
|
||||
fields = ['id', 'code', 'name', 'cert_field', 'pv_scope', 'pv_class', 'create_time', 'ccc_list']
|
||||
@staticmethod
|
||||
def setup_eager_loading(queryset):
|
||||
""" Perform necessary eager loading of data. """
|
||||
queryset = queryset.select_related('pv_scope','pv_class', 'cert_field')
|
||||
queryset = queryset.prefetch_related('ccc_list',)
|
||||
return queryset
|
||||
|
||||
# def get_cert_field(self, obj):
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ class ImplementRuleViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelView
|
|||
queryset = ImplementRule.objects.all()
|
||||
serializer_class = ImplementRuleSerializer
|
||||
search_fields = ['name', 'code', 'cert_field']
|
||||
filterset_fields = ['pv_scope', 'cert_field']
|
||||
filterset_fields = ['pv_scope', 'cert_field', 'cert_field__code']
|
||||
ordering = ['-create_time']
|
||||
|
||||
def get_serializer_class(self):
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
# Generated by Django 3.0.7 on 2020-07-13 03:43
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('system', '0022_auto_20200710_1535'),
|
||||
('employee', '0004_auto_20200710_1535'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterUniqueTogether(
|
||||
name='qualification',
|
||||
unique_together={('employee', 'cert_field')},
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
# Generated by Django 3.0.7 on 2020-07-13 08:39
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('employee', '0005_auto_20200713_1143'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='historicalqualification',
|
||||
name='remark',
|
||||
field=models.TextField(blank=True, null=True, verbose_name='备注'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='qualification',
|
||||
name='remark',
|
||||
field=models.TextField(blank=True, null=True, verbose_name='备注'),
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
# Generated by Django 3.0.7 on 2020-07-13 08:44
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('employee', '0006_auto_20200713_1639'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='historicalqualification',
|
||||
name='publish_number',
|
||||
field=models.CharField(blank=True, max_length=200, null=True, verbose_name='文号'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='qualification',
|
||||
name='publish_number',
|
||||
field=models.CharField(blank=True, max_length=200, null=True, verbose_name='文号'),
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,21 @@
|
|||
# Generated by Django 3.0.7 on 2020-07-13 09:41
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('employee', '0007_auto_20200713_1644'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='qualification',
|
||||
name='is_enabled',
|
||||
field=models.BooleanField(default=True, verbose_name='是否有效'),
|
||||
),
|
||||
migrations.DeleteModel(
|
||||
name='HistoricalQualification',
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
# Generated by Django 3.0.7 on 2020-07-15 01:24
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('system', '0022_auto_20200710_1535'),
|
||||
('employee', '0008_auto_20200713_1741'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.RemoveField(
|
||||
model_name='ability',
|
||||
name='qualification',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='historicalability',
|
||||
name='qualification',
|
||||
),
|
||||
migrations.AlterUniqueTogether(
|
||||
name='qualification',
|
||||
unique_together={('employee', 'cert_field', 'is_enabled')},
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='qualification',
|
||||
name='major_rules',
|
||||
),
|
||||
migrations.RemoveField(
|
||||
model_name='qualification',
|
||||
name='majors',
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
# Generated by Django 3.0.7 on 2020-07-15 02:16
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('employee', '0009_auto_20200715_0924'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.DeleteModel(
|
||||
name='HistoricalAbility',
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
# Generated by Django 3.0.7 on 2020-07-15 08:48
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('employee', '0010_delete_historicalability'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='ability',
|
||||
name='remark',
|
||||
field=models.TextField(null=True, verbose_name='备注'),
|
||||
),
|
||||
migrations.AlterField(
|
||||
model_name='qualification',
|
||||
name='is_paused',
|
||||
field=models.BooleanField(default=False, verbose_name='是否暂停审核资格'),
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
# Generated by Django 3.0.7 on 2020-07-16 04:00
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('employee', '0011_auto_20200715_1648'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AlterField(
|
||||
model_name='education',
|
||||
name='remark',
|
||||
field=models.TextField(null=True, verbose_name='备注'),
|
||||
),
|
||||
]
|
||||
|
|
@ -60,18 +60,15 @@ class Qualification(CommonAModel):
|
|||
expiration_date = models.DateField('到期日期')
|
||||
auditor_type = models.ForeignKey(
|
||||
Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='资格类型',related_name='qualification_auditor_type')
|
||||
publish_number = models.CharField('文号', max_length=200, unique=True)
|
||||
remark = models.TextField('备注')
|
||||
majors = models.ManyToManyField(
|
||||
Dict, verbose_name='注册专业', through='ability', through_fields=('qualification', 'major'))
|
||||
major_rules = models.ManyToManyField(
|
||||
ImplementRule, verbose_name='注册专业(ccc)', through='ability', through_fields=('qualification', 'major_rule'),)
|
||||
is_paused = models.BooleanField('是否暂停', default=False)
|
||||
history = HistoricalRecords()
|
||||
publish_number = models.CharField('文号', max_length=200, null=True, blank=True)
|
||||
remark = models.TextField('备注',null=True,blank=True)
|
||||
is_paused = models.BooleanField('是否暂停审核资格', default=False)
|
||||
is_enabled = models.BooleanField('是否有效', default=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = '注册资格'
|
||||
verbose_name_plural = verbose_name
|
||||
unique_together = ('employee', 'cert_field', 'is_enabled')
|
||||
|
||||
def __str__(self):
|
||||
return self.cert_number
|
||||
|
|
@ -82,14 +79,12 @@ class Ability(CommonAModel):
|
|||
能力表
|
||||
"""
|
||||
employee = models.ForeignKey(Employee, on_delete=models.CASCADE, related_name='ability_employee')
|
||||
qualification = models.ForeignKey(
|
||||
Qualification, on_delete=models.SET_NULL, null=True, blank=True, related_name='ability_qualification')
|
||||
cert_field = models.ForeignKey(
|
||||
Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='认证领域', related_name='ability_cert_field')
|
||||
afrom = models.ForeignKey(
|
||||
Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='能力来源', related_name='ability_afrom')
|
||||
access_date = models.DateField('评定时间')
|
||||
remark = models.TextField('备注')
|
||||
remark = models.TextField('备注', null=True)
|
||||
major = models.ForeignKey(
|
||||
Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='专业代码', related_name='ability_major')
|
||||
major_rule = models.ForeignKey(
|
||||
|
|
@ -97,7 +92,6 @@ class Ability(CommonAModel):
|
|||
auditor_abilitys = models.ManyToManyField(
|
||||
Dict, verbose_name='能力项', related_name='ability_auditor_abilitys')
|
||||
is_paused = models.BooleanField('是否暂停', default=False)
|
||||
history = HistoricalRecords()
|
||||
|
||||
class Meta:
|
||||
verbose_name = '专业能力'
|
||||
|
|
@ -123,7 +117,7 @@ class Education(CommonAModel):
|
|||
major = models.CharField('所学专业', max_length=200)
|
||||
level = models.ForeignKey(
|
||||
Dict, on_delete=models.SET_NULL, null=True, blank=True, verbose_name='文化程度', related_name='education_level')
|
||||
remark = models.TextField('备注')
|
||||
remark = models.TextField('备注', null=True)
|
||||
|
||||
class Meta:
|
||||
verbose_name = '教育经历'
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ from rest_framework import serializers
|
|||
from .models import *
|
||||
|
||||
from apps.system.serializers import DictSerializer, UserListSerializer
|
||||
|
||||
from apps.certset.serializers import ImplementRuleSerializer
|
||||
|
||||
class EmployeeSerializer(serializers.ModelSerializer):
|
||||
"""
|
||||
|
|
@ -20,26 +20,74 @@ class EmployeeSerializer(serializers.ModelSerializer):
|
|||
queryset = queryset.select_related('user')
|
||||
return queryset
|
||||
|
||||
class EmployeeUpdateSerializer(serializers.ModelSerializer):
|
||||
"""
|
||||
update序列化
|
||||
"""
|
||||
class Meta:
|
||||
model = Employee
|
||||
exclude = ['user']
|
||||
|
||||
class QualificationSerializer(serializers.ModelSerializer):
|
||||
"""
|
||||
普通序列化
|
||||
"""
|
||||
cert_field_ = DictSerializer(source='cert_field', read_only=True)
|
||||
auditor_type_ = DictSerializer(source='auditor_type', read_only=True)
|
||||
class Meta:
|
||||
model = Qualification
|
||||
fields = '__all__'
|
||||
|
||||
@staticmethod
|
||||
def setup_eager_loading(queryset):
|
||||
""" Perform necessary eager loading of data. """
|
||||
queryset = queryset.select_related('cert_field', 'auditor_type')
|
||||
return queryset
|
||||
|
||||
class AbilitySerializer(serializers.ModelSerializer):
|
||||
"""
|
||||
普通序列化
|
||||
"""
|
||||
cert_field_ = DictSerializer(source='cert_field', read_only=True)
|
||||
major_ = DictSerializer(source='major', read_only=True)
|
||||
major_rule_code = serializers.StringRelatedField(source='major_rule')
|
||||
afrom_ = DictSerializer(source='afrom', read_only=True)
|
||||
auditor_abilitys_ = DictSerializer(source='auditor_abilitys', read_only=True, many = True)
|
||||
class Meta:
|
||||
model = Ability
|
||||
fields = '__all__'
|
||||
|
||||
# def get_auditor_abilitys_(self, obj):
|
||||
# return obj.auditor_abilitys.order_by('sort').values_list('name', flat=True)
|
||||
|
||||
@staticmethod
|
||||
def setup_eager_loading(queryset):
|
||||
""" Perform necessary eager loading of data. """
|
||||
queryset = queryset.select_related('cert_field', 'major', 'afrom', 'major_rule')
|
||||
queryset = queryset.prefetch_related('auditor_abilitys',)
|
||||
return queryset
|
||||
|
||||
|
||||
def save(self, **kwargs):
|
||||
validated_data = dict(
|
||||
list(self.validated_data.items()) +
|
||||
list(kwargs.items())
|
||||
)
|
||||
if validated_data['cert_field'] and validated_data['cert_field'].code == 'CCC':
|
||||
validated_data['major'] = None
|
||||
else:
|
||||
validated_data['major_rule'] = None
|
||||
if self.instance is not None:
|
||||
self.instance = self.update(self.instance, validated_data)
|
||||
else:
|
||||
self.instance = self.create(validated_data)
|
||||
return self.instance
|
||||
|
||||
class EducationSerializer(serializers.ModelSerializer):
|
||||
"""
|
||||
普通序列化
|
||||
"""
|
||||
level_ = DictSerializer(source='level', read_only=True)
|
||||
class Meta:
|
||||
model = Education
|
||||
fields = '__all__'
|
||||
|
|
|
|||
|
|
@ -17,6 +17,12 @@ class EmployeeViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelViewSet):
|
|||
filterset_fields = ['is_onjob', 'is_fulltime']
|
||||
ordering = ['-create_time']
|
||||
|
||||
def get_serializer_class(self):
|
||||
if self.action == 'update':
|
||||
return EmployeeUpdateSerializer
|
||||
else:
|
||||
return self.serializer_class
|
||||
|
||||
class QualificationViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelViewSet):
|
||||
"""
|
||||
注册资格-增删改查
|
||||
|
|
@ -25,8 +31,8 @@ class QualificationViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelView
|
|||
'put': 'qucalification_update', 'delete': 'qucalification_delete'}
|
||||
queryset = Qualification.objects.all()
|
||||
serializer_class = QualificationSerializer
|
||||
search_fields = ['cert_number']
|
||||
filterset_fields = ['auditor_type']
|
||||
search_fields = ['cert_number', 'auditor_type__name']
|
||||
filterset_fields = ['auditor_type', 'cert_field', 'is_enabled']
|
||||
ordering = ['-create_time']
|
||||
|
||||
class AbilityViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelViewSet):
|
||||
|
|
@ -37,7 +43,7 @@ class AbilityViewSet(CreateUpdateCustomMixin, OptimizationMixin, ModelViewSet):
|
|||
'put': 'ability_update', 'delete': 'ability_delete'}
|
||||
queryset = Ability.objects.all()
|
||||
serializer_class = AbilitySerializer
|
||||
# search_fields = ['name', 'code', 'status', 'implement_date']
|
||||
search_fields = ['major__code', 'major_rule__code']
|
||||
filterset_fields = ['major', 'major_rule', 'auditor_abilitys']
|
||||
ordering = ['-create_time']
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,23 @@
|
|||
# Generated by Django 3.0.7 on 2020-07-15 08:08
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('system', '0022_auto_20200710_1535'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='dict',
|
||||
name='is_used',
|
||||
field=models.BooleanField(default=True, verbose_name='是否有效'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='historicaldict',
|
||||
name='is_used',
|
||||
field=models.BooleanField(default=True, verbose_name='是否有效'),
|
||||
),
|
||||
]
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
# Generated by Django 3.0.7 on 2020-07-16 01:27
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('system', '0023_auto_20200715_1608'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='dict',
|
||||
name='fullname',
|
||||
field=models.CharField(blank=True, max_length=1000, null=True, verbose_name='全名'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='historicaldict',
|
||||
name='fullname',
|
||||
field=models.CharField(blank=True, max_length=1000, null=True, verbose_name='全名'),
|
||||
),
|
||||
migrations.AlterUniqueTogether(
|
||||
name='dict',
|
||||
unique_together={('name', 'is_used', 'type')},
|
||||
),
|
||||
]
|
||||
|
|
@ -149,6 +149,7 @@ class Dict(SoftModel):
|
|||
"""
|
||||
name = models.CharField('名称', max_length=1000)
|
||||
code = models.CharField('编号', max_length=30, null=True, blank=True)
|
||||
fullname = models.CharField('全名', max_length=1000, null=True, blank=True)
|
||||
description = models.TextField('描述', blank=True, null=True)
|
||||
other = JSONField('其它信息', blank=True, null=True)
|
||||
type = models.ForeignKey(
|
||||
|
|
@ -156,16 +157,24 @@ class Dict(SoftModel):
|
|||
sort = models.IntegerField('排序', default=1)
|
||||
parent = models.ForeignKey('self', null=True, blank=True,
|
||||
on_delete=models.SET_NULL, verbose_name='父')
|
||||
is_used = models.BooleanField('是否有效', default=True)
|
||||
history = HistoricalRecords()
|
||||
|
||||
class Meta:
|
||||
verbose_name = '字典'
|
||||
verbose_name_plural = verbose_name
|
||||
unique_together = ('name', 'code', 'type')
|
||||
unique_together = ('name', 'is_used', 'type')
|
||||
|
||||
def __str__(self):
|
||||
return self.name
|
||||
|
||||
def save(self, *args, **kwargs):
|
||||
"""
|
||||
冗余一个字段,方便调用
|
||||
"""
|
||||
if self.code and self.code not in self.name:
|
||||
self.fullname = self.code + '-' + self.name
|
||||
super().save(*args, **kwargs)
|
||||
|
||||
class CommonAModel(SoftModel):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ from apps.system.mixins import CreateUpdateModelBMixin
|
|||
from utils.queryset import get_child_queryset2
|
||||
|
||||
|
||||
class RbacFilterSet(CreateUpdateModelBMixin, GenericAPIView):
|
||||
class RbacFilterSet(CreateUpdateModelBMixin, object):
|
||||
"""
|
||||
数据权限控权返回的queryset
|
||||
在必须的View下继承
|
||||
|
|
|
|||
|
|
@ -30,15 +30,15 @@ class DictSerializer(serializers.ModelSerializer):
|
|||
"""
|
||||
数据字典序列化
|
||||
"""
|
||||
fullname = serializers.SerializerMethodField(read_only=True)
|
||||
# fullname = serializers.SerializerMethodField(read_only=True)
|
||||
class Meta:
|
||||
model = Dict
|
||||
fields = '__all__'
|
||||
|
||||
def get_fullname(self, obj):
|
||||
if obj.code:
|
||||
return obj.code + obj.name
|
||||
return obj.name
|
||||
# def get_fullname(self, obj):
|
||||
# if (obj.code) and (obj.code not in obj.name):
|
||||
# return obj.code + obj.name
|
||||
# return obj.name
|
||||
|
||||
class PositionSerializer(serializers.ModelSerializer):
|
||||
"""
|
||||
|
|
|
|||
|
|
@ -74,7 +74,8 @@ class DictViewSet(ModelViewSet):
|
|||
"""
|
||||
perms_map = {'get': '*', 'post': 'dict_create',
|
||||
'put': 'dict_update', 'delete': 'dict_delete'}
|
||||
queryset = Dict.objects.get_queryset(all=True) # 获取全部的,包括软删除的
|
||||
# queryset = Dict.objects.get_queryset(all=True) # 获取全部的,包括软删除的
|
||||
queryset = Dict.objects.all()
|
||||
filterset_fields = ['type', 'is_deleted', 'type__code']
|
||||
serializer_class = DictSerializer
|
||||
search_fields = ['name']
|
||||
|
|
@ -87,11 +88,15 @@ class DictViewSet(ModelViewSet):
|
|||
"""
|
||||
if self.paginator is None:
|
||||
return None
|
||||
if (not self.request.query_params.get('page', None)) and ((self.request.query_params.get('type__code', None)) or (self.request.query_params.get('type', None))):
|
||||
elif (not self.request.query_params.get('page', None)) and ((self.request.query_params.get('type__code', None)) or (self.request.query_params.get('type', None))):
|
||||
return None
|
||||
return self.paginator.paginate_queryset(queryset, self.request, view=self)
|
||||
|
||||
|
||||
@action(methods=['get'], detail=False, permission_classes=[], authentication_classes=[],url_name='correct_dict')
|
||||
def correct(self, request, pk=None):
|
||||
for i in Dict.objects.all():
|
||||
i.save()
|
||||
return Response(status=status.HTTP_200_OK)
|
||||
|
||||
class PositionViewSet(ModelViewSet):
|
||||
"""
|
||||
|
|
|
|||
Loading…
Reference in New Issue