lingling
/
welfare-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

This commit is contained in:
qinjie 2021-09-13 09:33:56 +08:00
parent 63c6364262 e40ac65817
commit 2053181a9d
18 changed files with 1234 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/api/person/person.js Normal file
View File

@ -0,0 +1,69 @@
import request from '@/utils/request'
const personApi = {
addOrUpdate: 'person/addOrUpdate',
del: 'person/del',
get: 'person/get',
page: 'person/pageList',
transferOrg: 'person/transferOrg',
quit: 'person/quit',
resetPwd: 'person/resetPwd',
setAdmin: 'person/setAdmin',
}
export function personAddOrUpdate (params) {
return request({
url: personApi.addOrUpdate,
method: 'post',
data: params
})
}
export function personGet (params) {
return request({
url: personApi.get,
method: 'get',
params: params
})
}
export function personDel (params) {
return request({
url: personApi.del,
method: 'post',
params: params
})
}
export function personPage (params) {
return request({
url: personApi.page,
method: 'get',
params: params
})
}
export function personTransferOrg (params) {
return request({
url: personApi.transferOrg,
method: 'get',
params: params
})
}
export function personQuit (params) {
return request({
url: personApi.quit,
method: 'get',
params: params
})
}
export function personResetPwd (params) {
return request({
url: personApi.resetPwd,
method: 'get',
params: params
})
}
export function personSetAdmin (params) {
return request({
url: personApi.setAdmin,
method: 'get',
params: params
})
}

3
src/utils/permissions.js
View File

@ -14,8 +14,7 @@ export function actionToObject (json) {
*/
export function hasBtnPermission (permission) {
const myBtns = store.getters.buttons
const name = store.getters.name
if (name == 'admin') {
if (myBtns.indexOf('*:*:*') > -1) {
return true
}
return myBtns.indexOf(permission) > -1

13
src/views/org/OrgForm.vue
View File

@ -96,15 +96,15 @@
sm: { span: 15 }
},
orgTree: [],
modalTitle: "新增机构",
modalTitle: '新增机构',
visible: false,
confirmLoading: false,
formLoading: true,
replaceFields: {
children:'children',
title:'name',
key:'id',
value:'id'
children: 'children',
title: 'name',
key: 'id',
value: 'id'
},
form: this.$form.createForm(this)
}
@ -140,7 +140,7 @@
getOrgTree () {
orgList().then((res) => {
this.formLoading = false
if (!res.code === 200) {
if (!res.code === 200 || !res.data.length) {
this.orgTree = []
return
}
@ -190,7 +190,6 @@
this.confirmLoading = false
})
}
} else {
this.confirmLoading = false
}

124
src/views/org/OrgTree.vue Normal file
View File

@ -0,0 +1,124 @@
<template>
<a-modal v-model="isShowOrg" title="选择机构" :footer="null" >
<div>
<a-input-search style="margin-bottom: 8px" placeholder="搜索名称" @change="onChange" />
<a-tree
:disable-branch-nodes="true"
:expanded-keys="expandedKeys"
:auto-expand-parent="autoExpandParent"
:tree-data="orgList"
@expand="onExpand"
@select="onSelect"
:replaceFields="{
children:'children',
title:'name',
key:'id'
}"
>
<template slot="name" slot-scope="{ name }">
<span v-if="name.indexOf(searchValue) > -1">
{{ name.substr(0, name.indexOf(searchValue)) }}
<span style="color: #f50">{{ searchValue }}</span>
{{ name.substr(name.indexOf(searchValue) + searchValue.length) }}
</span>
<span v-else>{{ name }}</span>
</template>
</a-tree>
</div>
</a-modal>
</template>
<script>
import { orgList } from '@/api/org/org'
import { listToTree } from '@/utils/util'
const rootParentId = 0
// 所有节点放进dataList,便于搜索
const dataList = []
const generateList = data => {
for (let i = 0; i < data.length; i++) {
const node = data[i]
// 设置插槽,搜索结果样式变化
node.scopedSlots = { title: 'name' }
const id = node.id
const name = node.name
dataList.push({ id, name })
if (node.children) {
generateList(node.children)
}
}
}
// 获取传入id所在节点的父节点
const getParentKey = (id, tree) => {
let parentKey
for (let i = 0; i < tree.length; i++) {
const node = tree[i]
if (node.children) {
if (node.children.some(item => item.id === id)) {
parentKey = node.id
} else if (getParentKey(id, node.children)) {
parentKey = getParentKey(id, node.children)
}
}
}
return parentKey
}
export default {
data () {
return {
expandedKeys: [],
searchValue: '',
autoExpandParent: true,
orgList: [],
isShowOrg: false
}
},
methods: {
onExpand (expandedKeys) {
this.expandedKeys = expandedKeys
this.autoExpandParent = false
},
onSelect (selectedKeys, info) {
var orgInfo = info.node.dataRef
const org = { id: orgInfo.id, name: orgInfo.name }
this.$emit('selectOrg', org)
this.isShowOrg = false
},
onChange (e) {
const value = e.target.value
// 获取搜索结果所在节点的父节点集合
const expandedKeys = dataList
.map(item => {
if (item.name.indexOf(value) > -1) {
return getParentKey(item.id, this.orgList)
}
return null
})
.filter((item, i, self) => item && self.indexOf(item) === i)
// 拷贝,根据搜索结果设置展开节点
Object.assign(this, {
expandedKeys,
searchValue: value,
autoExpandParent: true
})
},
loadOrg () {
orgList().then(res => {
if (!res.code === 200 || !res.data.length) {
return
}
const orgTree = listToTree(res.data, [], rootParentId)
for (var item of orgTree) {
if (item.pid === 0) {
this.expandedKeys.push(item.id)
}
}
generateList(orgTree)
this.orgList = orgTree
})
this.isShowOrg = true
}
}
}
</script>

8
src/views/person/PersonDetail.vue Normal file
View File

@ -0,0 +1,8 @@
<template>
</template>
<script>
</script>
<style>
</style>

332
src/views/person/PersonForm.vue Normal file
View File

@ -0,0 +1,332 @@
<template>
<a-modal
:title="modalTitle"
:width="900"
:visible="visible"
:confirmLoading="confirmLoading"
@ok="handleSubmit"
@cancel="handleCancel"
>
<a-spin :spinning="confirmLoading">
<a-divider orientation="left">基本信息</a-divider>
<a-row :gutter="24">
<a-col :md="12" :sm="24">
<a-form :form="form">
<a-form-item style="display: none;">
<a-input v-decorator="['id']" />
</a-form-item>
<a-form-item style="display: none;">
<a-input v-decorator="['userId']" />
</a-form-item>
<a-form-item
label="用户名"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
>
<a-input placeholder="请输入用户名" v-decorator="['userName', {rules: [{required: true, min: 5, message: '请输入至少五个字符的账号！'}]}]" />
</a-form-item>
</a-form>
</a-col>
<a-col :md="12" :sm="24" >
<a-form :form="form">
<a-form-item
label="姓名"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
>
<a-input placeholder="请输入姓名" v-decorator="['name', {rules: [{required: true, message: '请输入姓名！'}]}]" />
</a-form-item>
</a-form>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :md="12" :sm="24">
<a-form :form="form">
<a-form-item
label="身份证"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
>
<a-input placeholder="请输入身份证" v-decorator="['idCardNo', {rules: [{required: true, message: '请输入身份证！'}]}]" @blur="idCardNoBlur"/>
</a-form-item>
</a-form>
</a-col>
<a-col :md="12" :sm="24">
<a-form :form="form">
<a-form-item
label="年龄"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
>
<a-input readOnly v-decorator="['age']" />
</a-form-item>
</a-form>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :md="12" :sm="24">
<a-form :form="form">
<a-form-item
label="性别"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-radio-group readOnly v-decorator="['sex',{rules: [{ required: true, message: '请选择性别！' }]}]" >
<a-radio :value="1">男</a-radio>
<a-radio :value="2">女</a-radio>
</a-radio-group>
</a-form-item>
</a-form>
</a-col>
<a-col :md="12" :sm="24">
<a-form :form="form">
<a-form-item
label="手机号"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
>
<a-input placeholder="请输入手机号" v-decorator="['phone',{rules: [{ required: true, message: '请输入手机号！' }]}]" />
</a-form-item>
</a-form>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :md="24" :sm="24">
<a-form :form="form">
<a-form-item
label="岗位"
:labelCol="{span: 3}"
:wrapperCol="{span: 20}"
has-feedback
>
<a-input v-decorator="['jobs',{rules: [{ required: true, message: '请输入岗位！' }]}]" />
</a-form-item>
</a-form>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :md="12" :sm="24">
<a-form :form="form">
<a-form-item
label="工种"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
>
<a-input v-decorator="['workType',{rules: [{ required: true, message: '请输入工种！' }]}]" />
</a-form-item>
</a-form>
</a-col>
<a-col :md="12" :sm="24">
<a-form :form="form">
<a-form-item
label="学历"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
>
<a-input v-decorator="['degreeId',{rules: [{ required: true, message: '请输入工种！' }]}]" />
</a-form-item>
</a-form>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :md="24" :sm="24">
<a-form :form="form">
<a-form-item
label="人员类型"
:labelCol="{span: 3}"
:wrapperCol="{span: 20}"
>
<a-checkbox-group v-decorator="['type',{rules: [{ required: true, message: '请选择人员类型！' }]}]">
<a-checkbox value="1" name="type">
单位主要负责人
</a-checkbox>
<a-checkbox value="2" name="type">
安全管理员
</a-checkbox>
<a-checkbox value="3" name="type">
班组长
</a-checkbox>
<a-checkbox value="4" name="type">
特种作业人员
</a-checkbox>
<a-checkbox value="5" name="type">
其他
</a-checkbox>
</a-checkbox-group>
</a-form-item>
</a-form>
</a-col>
</a-row>
<a-row :gutter="24">
<a-col :md="12" :sm="24">
<a-form :form="form">
<a-form-item
label="部门信息"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
has-feedback
>
<a-input readOnly @click="openOrgTree" v-decorator="['orgName',{rules: [{ required: true, message: '请选择机构！' }]}]" />
</a-form-item>
<a-form-item style="display: none;">
<a-input v-decorator="['orgId']" />
</a-form-item>
</a-form>
</a-col>
</a-row>
</a-spin>
<org-tree @selectOrg="selectOrg($event)" ref="orgModal"/>
</a-modal>
</template>
<script>
import { personAddOrUpdate, personGet } from '@/api/person/person'
import OrgTree from '../org/OrgTree'
export default {
components: {
OrgTree
},
data () {
return {
labelCol: {
xs: { span: 24 },
sm: { span: 6 }
},
wrapperCol: {
xs: { span: 24 },
sm: { span: 16 }
},
modalTitle: '新增人员',
visible: false,
confirmLoading: false,
form: this.$form.createForm(this)
}
},
methods: {
// 新增初始化方法
add () {
this.modalTitle = '新增人员'
this.visible = true
},
// 编辑初始化方法
edit (record) {
this.modalTitle = '编辑人员'
this.confirmLoading = true
this.visible = true
// 基本信息加入表单
personGet({id: record.id}).then((res) => {
if (res.code === 200) {
const data = res.data
// 默认选中的多选框
const type = data.type.split(',')
this.form.getFieldDecorator('type', { valuePropName: 'checked', initialValue: type })
this.form.setFieldsValue(
{
id: data.id,
userId: data.userId,
name: data.name,
userName: data.userName,
idCardNo: data.idCardNo,
// age: data.age,
// sex: data.sex,
phone: data.phone,
jobs: data.jobs,
workType: data.workType,
degreeId: data.degreeId,
orgId: data.orgId,
orgName: data.orgName
}
)
// 动态赋值年龄和性别
this.analyzeIdCardNo(data.idCardNo)
} else {
this.$message.error('查询失败：' + res.msg)
}
})
this.confirmLoading = false
},
handleSubmit () {
const { form: { validateFields } } = this
this.confirmLoading = true
validateFields((errors, values) => {
if (!errors) {
values.type = values.type.join(',')
console.log(values)
personAddOrUpdate(values).then((res) => {
this.confirmLoading = false
if (res.code === 200) {
this.$message.success('操作成功')
this.$emit('ok', values)
this.handleCancel()
} else {
this.$message.error('操作失败：' + res.msg)
}
}).finally((res) => {
this.confirmLoading = false
})
} else {
this.confirmLoading = false
}
})
},
idCardNoBlur (event) {
const idCardNo = event.target.value
this.analyzeIdCardNo(idCardNo)
},
analyzeIdCardNo (idCardNo) {
// 如果用户身份证号码为undefined则返回空
if (!idCardNo) {
return
}
// 获取性别
if (parseInt(idCardNo.substr(16, 1)) % 2 === 1) {
this.form.setFieldsValue({ sex: 1 })
} else {
console.log('sex 2')
this.form.setFieldsValue({ sex: 2 })
}
// 获取出生日期
var yearBirth = idCardNo.substring(6, 10)
var monthBirth = idCardNo.substring(10, 12)
var dayBirth = idCardNo.substring(12, 14)
// 获取当前年月日并计算年龄
var myDate = new Date()
var monthNow = myDate.getMonth() + 1
var dayNow = myDate.getDate()
var age = myDate.getFullYear() - yearBirth
if (monthNow < monthBirth || (monthNow === monthBirth && dayNow < dayBirth)) {
age--
}
console.log(age)
// 得到年龄
this.form.setFieldsValue({ age })
},
openOrgTree () {
this.$refs.orgModal.loadOrg()
},
selectOrg (orgData) {
console.log(orgData)
this.form.setFieldsValue({ orgId: orgData.id })
this.form.setFieldsValue({ orgName: orgData.name })
},
handleCancel () {
this.form.resetFields()
this.visible = false
}
}
}
</script>

347
src/views/person/PersonList.vue Normal file
View File

@ -0,0 +1,347 @@
<template>
<a-row :gutter="24">
<a-col :md="5" :sm="24">
<a-card :bordered="false" :loading="treeLoading">
<div v-if="this.orgTree != ''">
<a-tree
:treeData="orgTree"
v-if="orgTree.length"
@select="handleClick"
:defaultExpandAll="true"
:defaultExpandedKeys="defaultExpandedKeys"
:replaceFields="replaceFields" />
</div>
<div v-else>
<a-empty :image="simpleImage" />
</div>
</a-card>
</a-col>
<a-col :md="19" :sm="24">
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form layout="inline">
<a-row :gutter="48">
<a-col :md="8" :sm="24">
<a-form-item label="姓名" >
<a-input v-model="queryParam.name" allow-clear placeholder="请输入姓名"/>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
<a-form-item label="用户名" >
<a-input v-model="queryParam.userName" allow-clear placeholder="请输入用户名"/>
</a-form-item>
</a-col>
<a-col :md="8" :sm="24">
<a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
<a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
</a-col>
</a-row>
</a-form>
</div>
</a-card>
<a-card :bordered="false">
<div class="table-operator">
<a-button @click="$refs.personForm.add()" icon="plus" type="primary" v-if="hasPerm('person:add')">新增人员</a-button>
<a-button @click="transfer" type="primary" v-if="hasPerm('person:transfer')">转移部门</a-button>
<a-button @click="quit" type="primary" v-if="hasPerm('person:quit')">离职</a-button>
<!-- <a-button @click="export" type="primary" >导出</a-button> -->
<a-button @click="setAdmin" type="primary" v-if="hasPerm('person:setAdmin')">设置管理员</a-button>
<!-- <a-button @click="import" type="primary" v-if="hasPerm('person:import')">批量导入</a-button> -->
</div>
<div class="table-operator">
<div class='person-type'>
<a-radio-group v-model="queryParam.isAdmin" @change="onRadioChange">
<a-radio :value="2">学员</a-radio>
<a-radio :value="1">管理员</a-radio>
</a-radio-group>
</div>
</div>
<s-table
ref="table"
:columns="columns"
:data="loadData"
:rowKey="(record) => record.id"
:rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
>
<template slot="registerDate" slot-scope="text, record">
{{ record.registerDate | moment('YYYY-MM-DD') }}
</template>
<span slot="action" slot-scope="text, record">
<a v-if="hasPerm('person:detail')" @click="$refs.personDetail.detial(record)">详情</a>
<a-divider type="vertical" v-if="hasPerm('person:detail')" />
<a-dropdown v-if="hasPerm('person:edit') || hasPerm('person:resetPwd') || hasPerm('person:del')">
<a class="ant-dropdown-link">
更多 <a-icon type="down" />
</a>
<a-menu slot="overlay">
<a-menu-item v-if="hasPerm('person:edit')">
<a @click="$refs.personForm.edit(record)">编辑</a>
</a-menu-item>
<a-menu-item v-if="hasPerm('person:resetPwd')">
<a-popconfirm placement="topRight" title="确认重置密码？" @confirm="() => resetPwd(record)">
<a>重置密码</a>
</a-popconfirm>
</a-menu-item>
<a-menu-item v-if="hasPerm('person:del')">
<a-popconfirm placement="topRight" title="确认删除？" @confirm="() => personDelete(record)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</s-table>
<person-form ref="personForm" @ok="handleOk" />
<person-detail ref="personDetail" @ok="handleOk" />
<org-tree @selectOrg="selectOrg($event)" ref="orgModal"/>
</a-card>
</a-col>
</a-row>
</template>
<script>
import { STable } from '@/components'
import { Empty } from 'ant-design-vue'
import { orgList } from '@/api/org/org'
import { listToTree } from '@/utils/util'
import { personPage, personDel, personQuit, personTransferOrg, personSetAdmin, personResetPwd } from '@/api/person/person'
import PersonForm from './PersonForm'
import PersonDetail from './PersonDetail'
import OrgTree from '../org/OrgTree'
const rootParentId = 0
export default {
components: {
STable,
PersonForm,
PersonDetail,
OrgTree
},
data () {
return {
// 查询参数
queryParam: {isAdmin: 2},
// 表头
columns: [
{
title: '姓名',
dataIndex: 'name'
},
{
title: '用户名',
dataIndex: 'userName'
},
{
title: '单位信息',
dataIndex: 'unit'
},
{
title: '部门信息',
dataIndex: 'dept'
},
{
title: '年度学时要求',
dataIndex: 'classHours'
},
{
title: '注册时间',
dataIndex: 'registerDate',
scopedSlots: { customRender: 'registerDate' }
}
],
// 加载数据方法 必须为 Promise 对象
loadData: parameter => {
return personPage(Object.assign(parameter, this.queryParam)).then((res) => {
return res
})
},
orgTree: [],
selectedRowKeys: [],
selectedRows: [],
defaultExpandedKeys: [],
treeLoading: true,
simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
replaceFields: {
children: 'children',
title: 'name',
key: 'id',
value: 'id'
}
}
},
created () {
/**
* 获取到机构树，展开顶级下树节点，考虑到后期数据量变大，不建议全部展开
*/
orgList().then(res => {
this.treeLoading = false
if (!res.code === 200 || !res.data.length) {
return
}
this.orgTree = listToTree(res.data, [], rootParentId)
for (var item of this.orgTree) {
if (item.pid === 0) {
this.defaultExpandedKeys.push(item.id)
}
}
})
if (this.hasPerm('person:edit') || this.hasPerm('person:resetPwd') || this.hasPerm('person:del')) {
this.columns.push({
title: '操作',
width: '150px',
dataIndex: 'action',
scopedSlots: { customRender: 'action' }
})
}
},
methods: {
/**
* 重置密码
*/
resetPwd (record) {
personResetPwd({ id: record.id }).then(res => {
if (res.code === 200) {
this.$message.success('重置成功')
// this.$refs.table.refresh()
} else {
this.$message.error('重置失败：' + res.message)
}
})
},
/**
* 删除用户
*/
personDelete (record) {
personDel({ id: record.id, deleteReason: '' }).then((res) => {
if (res.code === 200) {
this.$message.success('删除成功')
this.$refs.table.refresh()
} else {
this.$message.error('删除失败：' + res.message)
}
}).catch((err) => {
this.$message.error('删除错误：' + err.message)
})
},
quit () {
if (!this.selectedRowKeys.length) {
this.$message.warning('请选择人员')
return
}
this.$confirm({
title: '提示',
content: '确认离职吗',
onOk: () => {
const paramIds = this.selectedRowKeys.join(',')
const param = { 'ids': paramIds }
personQuit(param).then((res) => {
if (res.code === 200) {
this.$message.success('操作成功')
this.$refs.table.refresh()
} else {
this.$message.error('操作失败：' + res.message)
}
}).catch((err) => {
this.$message.error('操作错误：' + err.message)
})
},
onCancel () {
}
})
},
transfer () {
if (!this.selectedRowKeys.length) {
this.$message.warning('请选择人员')
return
}
this.$refs.orgModal.loadOrg()
},
selectOrg (orgData) {
this.$confirm({
title: '提示',
content: '确认转移部门至'+ orgData.name +'吗',
onOk: () => {
const paramIds = this.selectedRowKeys.join(',')
const param = { ids: paramIds,targetOrgId: orgData.id }
personTransferOrg(param).then((res) => {
if (res.code === 200) {
this.$message.success('操作成功')
this.$refs.table.refresh()
} else {
this.$message.error('操作失败：' + res.message)
}
}).catch((err) => {
this.$message.error('操作错误：' + err.message)
})
},
onCancel () {
}
})
},
setAdmin () {
if (!this.selectedRowKeys.length) {
this.$message.warning('请选择人员')
return
}
this.$confirm({
title: '提示',
content: '确认设置为管理员吗',
onOk: () => {
const paramIds = this.selectedRowKeys.join(',')
const param = { 'ids': paramIds }
personSetAdmin(param).then((res) => {
if (res.code === 200) {
this.$message.success('操作成功')
this.$refs.table.refresh()
} else {
this.$message.error('操作失败：' + res.message)
}
}).catch((err) => {
this.$message.error('操作错误：' + err.message)
})
},
onCancel () {
}
})
},
/**
* 点击左侧机构树查询列表
*/
handleClick (e) {
this.queryParam = {
'orgId': e.toString()
}
this.$refs.table.refresh(true)
},
handleOk () {
this.$refs.table.refresh()
},
onRadioChange(e) {
this.queryParam.isAdmin = e.target.value
this.$refs.table.refresh(true)
},
onSelectChange (selectedRowKeys, selectedRows) {
this.selectedRowKeys = selectedRowKeys
this.selectedRows = selectedRows
}
}
}
</script>
<style lang="less">
.table-operator {
margin-bottom: 18px;
}
button {
margin-right: 8px;
}
.person-type span{
font-size: 24px;
}
</style>

34
src/views/project/ProjectList.vue
View File

@ -1,5 +1,5 @@
<template>
<div>
<a-card :bordered="false" title="人员档案">
<a-space direction="vertical" style="width: 100%">
<a-space direction="horizontal">
项目名:
@ -39,16 +39,10 @@
</a-space>
<a-space class="table-operator" direction="horizontal">
<a-button v-if="hasPerm('project:add')" type="primary" icon="plus" @click="$refs.projectStepForm.add()">新增项目</a-button>
<a-button v-if="hasPerm('project:add')" type="primary" icon="plus" @click="handledCreate">新增项目</a-button>
</a-space>
<s-table
ref="table"
size="default"
rowKey="id"
:columns="columns"
:data="loadData"
>
<s-table ref="table" size="default" rowKey="id" :columns="columns" :data="loadData" :pageNum="Number(this.$route.query.projectPageNum) || 1">
<span slot="serial" slot-scope="text, record, index">
{{ index + 1 }}
</span>
@ -65,20 +59,17 @@
</template>
</span>
</s-table>
<project-step-form ref="projectStepForm"></project-step-form>
</a-space>
</div>
</a-card>
</template>
<script>
import { STable } from '@/components'
import { getProjectList } from '@/api/project/project'
import projectStepForm from './ProjectStepForm'
export default {
components: {
STable,
projectStepForm,
},
data() {
return {
@ -141,14 +132,17 @@ export default {
created() {},
methods: {
// 增
handledCreate() {
return this.$router.push(
// {name: 'ProjectForm'}
{ path: 'project/project/add' }
)
},
handledCreate(record) {
this.$router.push({
path: '/project/projectStepForm',
query: {
id: record.id,
projectQueryParam: this.queryParam,
projectPageNum: this.$refs.table.localPagination.current
}
});
}
}
}
// @白鸣 发展党员哪个审批信息管理 是哪一级审核才显示，还是审核这一级的上级也能看到
</script>

60
src/views/project/ProjectStepForm.vue
View File

@ -1,32 +1,21 @@
<template>
<a-modal
:title="modalTitle"
:width="1200"
:visible="visible"
:confirmLoading="confirmLoading"
:destroyOnClose="true"
@ok="handleSubmit"
@cancel="handleCancel"
>
<!-- PageHeader 第二种使用方式 (v-slot) -->
<a-card :bordered="false">
<a-card :bordered="false" :title="title">
<a-steps class="steps" :current="currentTab">
<a-step title="基本信息" />
<a-step title="选择单位" />
<a-step title="选择课程" />
<a-step v-if="['2', '3', '4'].includes(form.trainWay)" title="选择课程" />
<a-step title="选择人员" />
<a-step title="完成" />
</a-steps>
<div class="content">
<step1 v-if="currentTab === 0" @nextStep="nextStep"/>
<step2 v-if="currentTab === 1" @nextStep="nextStep" @prevStep="prevStep"/>
<step3 v-if="currentTab === 2" @nextStep="nextStep" @prevStep="prevStep"/>
<step4 v-if="currentTab === 3" @nextStep="nextStep" @prevStep="prevStep"/>
<step5 v-if="currentTab === 4" @prevStep="prevStep" @finish="finish"/>
<step1 v-if="currentTab === 0" @nextStep="nextStep" />
<step2 v-if="currentTab === 1" @nextStep="nextStep" @prevStep="prevStep" />
<step3 v-if="currentTab === 2" @nextStep="nextStep" @prevStep="prevStep" />
<step4 v-if="currentTab === 3" @nextStep="nextStep" @prevStep="prevStep" />
<step5 v-if="currentTab === 4" @prevStep="prevStep" @finish="finish" />
</div>
</a-card>
</a-modal>
</template>
<script>
@ -40,8 +29,9 @@ export default {
Step2,
Step3,
},
data () {
data() {
return {
title:'',
currentTab: 0,
labelCol: {
xs: { span: 24 },
@ -55,54 +45,52 @@ export default {
visible: false,
confirmLoading: false,
type: '',
form: null
form: {},
}
},
methods: {
// 新增打开页面初始化
add (type) {
this.modalTitle = "新增项目"
add(type) {
this.modalTitle = '新增项目'
this.visible = true
this.formLoading = false
},
// 编辑打开页面初始化
edit (record) {
edit(record) {
console.log(record)
this.modalTitle = "编辑项目"
this.modalTitle = '编辑项目'
this.visible = true
this.formLoading = false
},
// handler
//下一步
nextStep () {
nextStep() {
if (this.currentTab < 5) {
this.currentTab += 1
}
},
//上一步
prevStep () {
console.log("返回上一步")
prevStep() {
console.log('返回上一步')
if (this.currentTab > 0) {
this.currentTab -= 1
}
},
finish () {
finish() {
this.currentTab = 0
},
handleSubmit() {
},
handleSubmit() {},
handleCancel() {
this.visible = false;
}
}
this.visible = false
},
},
}
</script>
<style lang="less" scoped>
.steps {
.steps {
max-width: 750px;
margin: 16px auto;
}
}
</style>

10
src/views/project/classAdd/ClassForm.vue
View File

@ -73,8 +73,6 @@ export default {
this.visible = true
},
handleOk(e) {
this.$refs.ClassForm.validate((valid) => {
if (valid) {
this.confirmLoading = true
classAdd(this.form).then((res) => {
if (res.code == 200) {
@ -83,16 +81,14 @@ export default {
this.handleCancel()
} else {
this.$message.error('新增失败：' + res.msg)
}
})
} else {
return false
this.handleCancel()
}
})
},
handleCancel(e) {
// console.log('Clicked cancel button')
this.$refs.table.refresh()
// this.$refs.table.refresh()
this.$parent.handleRefresh(false)
this.visible = false
},
},

10
src/views/project/classAdd/ClassList.vue
View File

@ -50,15 +50,19 @@ export default {
},
methods: {
handledDel(record) {
console.log("delete-id",record)
classDel({ids:record.id}).then((res) => {
console.log('delete-id', record)
classDel({ ids: record.id }).then((res) => {
if (res.code == 200) {
this.$message.success('删除成功')
this.$refs.table.refresh(true)
this.handleRefresh(false)
}
})
},
getData() {},
// 搜索按钮
handleRefresh(bool) {
this.$refs.table.refresh(bool)
},
},
created: {},
}

83
src/views/project/form/ProjectCourseSelect.vue
View File

@ -1,24 +1,41 @@
<template>
<a-modal
id="modal"
:title="modalTitle"
:width="1000"
:width="1200"
:visible="visible"
:confirmLoading="confirmLoading"
:destroyOnClose="true"
@ok="handleSubmit"
@cancel="handleCancel"
>
<a-layout>
<a-layout-sider>
<a-row type="flex" justify="center" align="top">
<a-col :span="6">
<a-menu v-model="current" mode="horizontal">
<a-menu-item key="mail"> <a-icon type="mail" />系统课程</a-menu-item>
<a-menu-item key="app"> <a-icon type="appstore" />自制课程</a-menu-item>
</a-menu>
</a-layout-sider>
<a-layout>
<a-layout-content>Content</a-layout-content>
</a-layout>
</a-layout>
<a-input-search style="margin-bottom: 8px" placeholder="Search" @change="onChange" />
<a-tree
:expanded-keys="expandedKeys"
:auto-expand-parent="autoExpandParent"
:tree-data="gData"
@expand="onExpand"
>
<template slot="title" slot-scope="{ title }">
<span v-if="title.indexOf(searchValue) > -1">
{{ title.substr(0, title.indexOf(searchValue)) }}
<span style="color: #f50">{{ searchValue }}</span>
{{ title.substr(title.indexOf(searchValue) + searchValue.length) }}
</span>
<span v-else>{{ title }}</span>
</template>
</a-tree>
</a-col>
<a-col :span="18">
<p class="height-50">col-4</p>
</a-col>
</a-row>
</a-modal>
</template>
@ -26,6 +43,10 @@
//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
//例如：import 《组件名称》 from '《组件路径》'
/**------------------------------------------------------------ */
/**----------------------------------------------------------------- */
export default {
//import引入的组件需要注入到对象中才能使用
components: {},
@ -36,6 +57,11 @@ export default {
visible: false,
confirmLoading: false,
current: ['mail'],
expandedKeys: [],
searchValue: '',
autoExpandParent: true,
gData,
}
},
//计算属性 类似于data概念
@ -61,6 +87,27 @@ export default {
this.visible = false
this.formLoading = false
},
onExpand(expandedKeys) {
this.expandedKeys = expandedKeys
this.autoExpandParent = false
},
onChange(e) {
console.log(this.gData)
const value = e.target.value
const expandedKeys = dataList
.map((item) => {
if (item.title.indexOf(value) > -1) {
return getParentKey(item.key, gData)
}
return null
})
.filter((item, i, self) => item && self.indexOf(item) === i)
Object.assign(this, {
expandedKeys,
searchValue: value,
autoExpandParent: true,
})
},
},
created() {}, //生命周期 - 创建完成（可以访问当前this实例）
mounted() {}, //生命周期 - 挂载完成（可以访问DOM元素）
@ -74,24 +121,4 @@ export default {
}
</script>
<style scoped>
#components-layout-demo-basic {
text-align: center;
}
#components-layout-demo-basic .ant-layout-sider {
background: #3ba0e9;
color: #fff;
line-height: 150px;
}
#components-layout-demo-basic .ant-layout-content {
background: rgba(16, 142, 233, 1);
color: #fff;
min-height: 1100px;
line-height: 120px;
}
#components-layout-demo-basic > .ant-layout {
margin-bottom: 48px;
}
#components-layout-demo-basic > .ant-layout:last-child {
margin: 0;
}
</style>

4
src/views/project/form/ProjectForm.vue
View File

@ -5,7 +5,7 @@
<a-row :gutter="24">
<a-col :md="24" :sm="24">
<a-form-model-item label="项目名称">
<a-input v-decorator="['projectName',{rules: [{required: true, min: 1, message: '请输入项目名称！'}]}]" />
<a-input v-model="form.projectName" />
</a-form-model-item>
</a-col>
</a-row>
@ -129,7 +129,7 @@ export default {
labelCol: { span: 4 },
wrapperCol: { span: 14 },
personType: [],
form: this.$form.createForm(this, { name: 'project' }),
form: {},
modalTitle: '新增项目',
visible: false,
confirmLoading: false,

135
src/views/project/terminalTrain/TerminalTrainList.vue Normal file
View File

@ -0,0 +1,135 @@
<template>
<a-card :bordered="false" title="终端培训列表">
<div class="table-page-search-wrapper">
<SearchCom
:form="queryParam"
:list="queryOptions"
@search="handleRefresh"
@reset="
() => {
;(queryParam = {}), handleRefresh()
}
"
></SearchCom>
</div>
<s-table ref="table" size="small" rowKey="id" :columns="columns" :data="loadData" :pageNum="Number(this.$route.query.archivesUserPageNum) || 1">
<template slot="action" slot-scope="text, record">
<a href="javascript:;" @click="handleRefresh()">项目档案</a>
<a-divider type="vertical" />
<a href="javascript:;" @click="handleRefresh()">自学档案</a>
<br />
<a href="javascript:;" @click="handleRefresh()">违章档案</a>
<a-divider type="vertical" />
<a-popconfirm title="确认导出?" cancelText="取消" okText="确认" @confirm="() => handleDelete(record)">
<a href="javascript:;">　导出　</a>
</a-popconfirm>
</template>
</s-table>
</a-card>
</template>
<script>
//这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
//例如：import 《组件名称》 from '《组件路径》'
import {SearchCom} from '@/components/SearchCom'
export default {
//import引入的组件需要注入到对象中才能使用
components: { SearchCom },
props: {},
data() {
//这里存放数据
return {
queryParam: {
status: this.$route.query.terminalTrainQueryProjectStatus || '',
projectName: this.$route.query.terminalTrainQueryProjectName || '',
startDate: this.$route.query.terminalTrainQueryStartDate || '',
endDate: this.$route.query.terminalTrainQueryEndDate || '',
},
columns: [
{ title: '项目名称', width: 'auto', align: 'center', dataIndex: 'projectName', key: 'projectName' },
{ title: '项目时间', width: 'auto', align: 'center', dataIndex: 'projectData', key: 'projectData' },
{ title: '受训角色', width: 'auto', align: 'center', dataIndex: 'roleName', key: 'roleName' },
{ title: '应修学时', width: 'auto', align: 'center', dataIndex: 'mustClassHour', key: 'mustClassHour' },
{ title: '已修学时', width: 'auto', align: 'center', dataIndex: 'alreadyClassHour', key: 'alreadyClassHour' },
{
title: '完成状态',
width: 'auto',
align: 'center',
dataIndex: 'finishState',
key: 'finishState',
customRender: (text, record, index) => {
// 完成状态 0-未完成 1-已完成
if (text == 0) return '未完成'
else if (text == 1) return '已完成'
},
},
{ title: '总练习题量', width: 'auto', align: 'center', dataIndex: 'addUpExercises', key: 'addUpExercises' },
{ title: '已练习题量', width: 'auto', align: 'center', dataIndex: 'alreadyExercises', key: 'alreadyExercises' },
{ title: '答对题量', width: 'auto', align: 'center', dataIndex: 'yesTopic', key: 'yesTopic' },
{ title: '正确率', width: 'auto', align: 'center', dataIndex: 'yesRate', key: 'yesRate' },
{ title: '考试成绩', width: 'auto', align: 'center', dataIndex: 'testResult', key: 'testResult' },
{ title: '补考成绩', width: 'auto', align: 'center', dataIndex: 'mendTestResult', key: 'mendTestResult' },
{ title: '考试耗时', width: 'auto', align: 'center', dataIndex: 'testTime', key: 'testTime' },
{
title: '考试状态',
width: 'auto',
align: 'center',
dataIndex: 'testState',
key: 'testState',
customRender: (text, record, index) => {
// 考试状态 0-不合格 1-合格
if (text == 0) return '不合格'
else if (text == 1) return '合格'
},
},
{ title: '操作', width: '90px', key: 'operation', align: 'center', scopedSlots: { customRender: 'action' } },
],
loadData: parameter => { return getArchivesUserList(Object.assign(parameter, this.queryParam)).then(res => { return res }) }
}
},
//计算属性 类似于data概念
computed: {
queryOptions: function () {
return [
{ type: 'input', placeholder: '项目名称', key: 'projectName' },
/** 培训状态：1-未发布 2-未开始 3-进行中 4-已结束 5-已中止 */
{
type: 'select',
placeholder: '项目状态',
key: 'status',
options: [
{ id: '', name: '全部' },
{ id: '1', name: '未发布' },
{ id: '2', name: '未开始' },
{ id: '3', name: '进行中' },
{ id: '4', name: '已结束' },
{ id: '5', name: '已终止' },
],
},
{ type: 'date', placeholder: '开始时间', key: 'startDate' },
{ type: 'date', placeholder: '结束时间', key: 'endDate' },
]
},
},
//监控data中的数据变化
watch: {},
//方法集合
methods: {
handleRefresh() {
console.log('handleRefresh')
},
},
created() {}, //生命周期 - 创建完成（可以访问当前this实例）
mounted() {}, //生命周期 - 挂载完成（可以访问DOM元素）
beforeCreate() {}, //生命周期 - 创建之前
beforeMount() {}, //生命周期 - 挂载之前
beforeUpdate() {}, //生命周期 - 更新之前
updated() {}, //生命周期 - 更新之后
beforeDestroy() {}, //生命周期 - 销毁之前
destroyed() {}, //生命周期 - 销毁完成
activated() {}, //如果页面有keep-alive缓存功能，这个函数会触发
}
</script>
<style scoped>
</style>

2
src/views/security/menu/MenuForm.vue
View File

@ -229,9 +229,7 @@
this.meneTypeFunc(record.type.toString())
// 默认选中的单选框
// eslint-disable-next-line no-unused-vars
const visibleDef = false
// eslint-disable-next-line eqeqeq
if (record.visible == 1) {
this.visibleDef = true
}

4
src/views/security/user/UserList.vue
View File

@ -48,7 +48,7 @@
<span slot="action" slot-scope="text, record">
<a v-if="hasPerm('sys:user:edit')" @click="$refs.userForm.edit(record)">编辑</a>
<a-divider type="vertical" v-if="hasPerm('sys:user:edit')" />
<a-dropdown v-if="hasPerm('sys:user:resetPwd') || hasPerm('sys:user:grantRole') || hasPerm('sys:user:delete')">
<a-dropdown v-if="hasPerm('sys:user:resetPwd') || hasPerm('sys:user:grantRole') || hasPerm('sys:user:del')">
<a class="ant-dropdown-link">
更多 <a-icon type="down" />
</a>
@ -138,7 +138,7 @@ export default {
},
created () {
// 动态加载权限
if (this.hasPerm('sys:user:edit') || this.hasPerm('sys:user:resetPwd') || this.hasPerm('sys:user:grantRole') || this.hasPerm('sys:user:delete')) {
if (this.hasPerm('sys:user:edit') || this.hasPerm('sys:user:resetPwd') || this.hasPerm('sys:user:grantRole') || this.hasPerm('sys:user:del')) {
this.columns.push({
title: '操作',
width: '150px',

2
src/views/sys/dictionary/DictionaryList.vue
View File

@ -1,5 +1,4 @@
<template>
<page-header-wrapper :title="false">
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<SearchCom
@ -30,7 +29,6 @@
</s-table>
<dictionary-form ref="modal" @ok="handleOk" />
</a-card>
</page-header-wrapper>
</template>
<script>

4
src/views/sys/dictionaryItem/DictionaryItemList.vue
View File

@ -1,5 +1,4 @@
<template>
<page-header-wrapper :title="false">
<a-card :bordered="false">
<div class="table-page-search-wrapper">
<a-form layout="inline">
@ -43,7 +42,6 @@
</s-table>
<dictionaryItem-form ref="modal" @ok="handleOk" />
</a-card>
</page-header-wrapper>
</template>
<script>
@ -107,7 +105,7 @@ export default {
},
// 删
handleDelete (record) {
dictionaryItemDel({ ids: record.id, deleteReason: "" }).then(() => {
dictionaryItemDel({ ids: record.id, deleteReason: '' }).then(() => {
this.$refs.table.refresh()
})
},