root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并分支sso

Browse Source
This commit is contained in:
zhangzhiqiang
2022-12-29 15:04:15 +08:00
parent b5990f168e
commit d6ce08df7d
42 changed files with 2044 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
lms/nladmin-ui/src/views/system/dept/dept.js Normal file
View File

@@ -0,0 +1,60 @@
import request from '@/utils/request'
export function getDepts(params) {
return request({
url: 'api/dept',
method: 'get',
params
})
}
export function getDeptTree(params) {
return request({
url: '/api/dept/allTree',
method: 'get',
params
})
}
export function getDeptSuperior(ids) {
const data = ids.length || ids.length === 0 ? ids : Array.of(ids)
return request({
url: 'api/dept/superior',
method: 'post',
data
})
}
export function getDeptvo(params) {
return request({
url: 'api/dept/vo',
method: 'get',
params
})
}
export function add(data) {
return request({
url: 'api/dept',
method: 'post',
data
})
}
export function del(ids) {
return request({
url: 'api/dept',
method: 'delete',
data: ids
})
}
export function edit(data) {
return request({
url: 'api/dept',
method: 'put',
data
})
}
export default { add, edit, del, getDepts, getDeptSuperior, getDeptvo, getDeptTree }

98
lms/nladmin-ui/src/views/system/dept/index.vue
View File

@@ -14,7 +14,7 @@
@keyup.enter.native="crud.toQuery"
/>
<el-select
v-model="query.enabled"
v-model="query.isUsed"
clearable
size="mini"
placeholder="状态"
@@ -28,7 +28,6 @@
</div>
<crudOperation :permission="permission" />
</div>
<!--表单组件-->
<el-dialog
append-to-body
:close-on-click-modal="false"
@@ -39,7 +38,7 @@
>
<el-form ref="form" inline :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="部门编码" prop="code">
<el-input v-model="form.code" style="width: 370px;" />
<el-input v-model="form.code" :disabled="true" style="width: 370px;" />
</el-form-item>
<el-form-item label="部门名称" prop="name">
<el-input v-model="form.name" style="width: 370px;" />
@@ -56,19 +55,20 @@
<el-form-item label="外部标识" prop="extId">
<el-input v-model="form.extId" style="width: 370px;" />
</el-form-item>
<el-form-item label="版本ID" prop="versionId">
<el-input v-model="form.versionId" style="width: 370px;" />
</el-form-item>
<el-form-item label="顶级部门">
<el-radio-group v-model="form.isTop" style="width: 140px">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="状态" prop="enabled">
<el-radio v-for="item in dict.dept_status" :key="item.id" v-model="form.enabled" :label="item.value">
{{ item.label }}
</el-radio>
<el-form-item label="状态" prop="isUesd">
<el-switch
v-model="form.isUsed"
active-color="#409EFF"
inactive-color="#F56C6C"
active-value = 'true'
inactive-valu='false'
/>
</el-form-item>
<el-form-item v-if="form.isTop === '0'" style="margin-bottom: 0;" label="上级部门" prop="pid">
<treeselect
@@ -76,7 +76,8 @@
:load-options="loadDepts"
:options="depts"
style="width: 370px;"
placeholder="选择上级类目"
:normalizer="normalizer"
placeholder="选择部门类目"
/>
</el-form-item>
</el-form>
@@ -85,7 +86,7 @@
<el-button :loading="crud.status.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<!--表格渲染-->
<!--表格渲染 :load="getDeptDatas" 点击事件 row-key需要指定唯一的数据id-->
<el-table
ref="table"
v-loading="crud.loading"
@@ -93,7 +94,7 @@
:load="getDeptDatas"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
:data="crud.data"
row-key="id"
row-key="deptId"
@select="crud.selectChange"
@select-all="crud.selectAllChange"
@selection-change="crud.selectionChangeHandler"
@@ -102,22 +103,18 @@
<!-- <el-table-column label="编码" prop="code" />-->
<el-table-column label="名称" prop="name" />
<el-table-column label="排序" prop="deptSort" />
<el-table-column label="状态" align="center" prop="enabled">
<el-table-column label="状态" align="center" prop="isUsed">
<template slot-scope="scope">
<el-switch
v-model="scope.row.enabled"
v-model="scope.row.isUsed"
:disabled="scope.row.id === 1"
active-color="#409EFF"
inactive-color="#F56C6C"
@change="changeEnabled(scope.row, scope.row.enabled,)"
@change="changeEnabled(scope.row, scope.row.isUsed,)"
/>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建日期">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建日期" />
<el-table-column
v-permission="['admin','dept:edit','dept:del']"
label="操作"
@@ -139,7 +136,7 @@
</template>
<script>
import crudDept from '@/api/system/dept'
import crudDept from '@/views/system/dept/dept'
import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import CRUD, { crud, form, header, presenter } from '@crud/crud'
@@ -148,22 +145,20 @@ import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
const defaultForm = {
id: null,
code: null,
name: null,
isTop: '1',
subCount: 0,
sub_count: 0,
pid: null,
deptSort: 999,
enabled: 'true',
extId: null,
versionId: null
isUsed: true,
extId: null
}
export default {
name: 'Dept',
components: { Treeselect, crudOperation, rrOperation, udOperation },
cruds() {
return CRUD({ title: '部门', url: 'api/dept', crudMethod: { ...crudDept }})
return CRUD({ title: '部门', idField: 'deptId', url: 'api/dept/vo', crudMethod: { ...crudDept }})
},
mixins: [presenter(), header(), form(defaultForm), crud()],
// 设置数据字典
@@ -172,9 +167,6 @@ export default {
return {
depts: [],
rules: {
code: [
{ required: true, message: '请输入编码', trigger: 'blur' }
],
name: [
{ required: true, message: '请输入名称', trigger: 'blur' }
],
@@ -188,16 +180,16 @@ export default {
del: ['admin', 'dept:del']
},
enabledTypeOptions: [
{ key: 'true', display_name: '正常' },
{ key: 'false', display_name: '禁用' }
{ key: true, display_name: '启用' },
{ key: false, display_name: '禁用' }
]
}
},
methods: {
getDeptDatas(tree, treeNode, resolve) {
const params = { pid: tree.id }
const params = { pid: tree.deptId }
setTimeout(() => {
crudDept.getDepts(params).then(res => {
crudDept.getDeptvo(params).then(res => {
resolve(res.content)
})
}, 100)
@@ -206,12 +198,12 @@ export default {
[CRUD.HOOK.afterToCU](crud, form) {
if (form.pid !== null) {
form.isTop = '0'
} else if (form.id !== null) {
} else {
form.isTop = '1'
}
form.enabled = `${form.enabled}`
if (form.id != null) {
this.getSupDepts(form.id)
form.isUsed = `${form.isUsed}`
if (form.pid != null) {
this.getSupDepts(form.pid)
} else {
this.getDepts()
}
@@ -234,7 +226,7 @@ export default {
})
},
getDepts() {
crudDept.getDepts({ enabled: true }).then(res => {
crudDept.getDeptvo({ isUsed: true }).then(res => {
this.depts = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
@@ -246,11 +238,9 @@ export default {
// 获取弹窗内部门数据
loadDepts({ action, parentNode, callback }) {
if (action === LOAD_CHILDREN_OPTIONS) {
crudDept.getDepts({ enabled: true, pid: parentNode.id }).then(res => {
crudDept.getDeptvo({ isUsed: true, pid: parentNode.deptId }).then(res => {
parentNode.children = res.content.map(function(obj) {
if (obj.hasChildren) {
obj.children = null
}
obj.children = null
return obj
})
setTimeout(() => {
@@ -261,7 +251,7 @@ export default {
},
// 提交前的验证
[CRUD.HOOK.afterValidateCU]() {
if (this.form.pid !== null && this.form.pid === this.form.id) {
if (this.form.isTop !== '1' && this.form.pid == null) {
this.$message({
message: '上级部门不能为空',
type: 'warning'
@@ -275,23 +265,29 @@ export default {
},
// 改变状态
changeEnabled(data, val) {
this.$confirm('此操作将 "' + this.dict.label.dept_status[val] + '" ' + data.name + '部门, 是否继续？', '提示', {
const satus = this.enabledTypeOptions.find(item => { return item.key == data.isUsed })
this.$confirm('此操作将 "' + satus.display_name + '" ' + data.name + '部门, 是否继续？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
crudDept.edit(data).then(res => {
this.crud.notify(this.dict.label.dept_status[val] + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
}).catch(err => {
data.enabled = !data.enabled
console.log(err.response.data.message)
this.crud.notify(satus.display_name + '成功', CRUD.NOTIFICATION_TYPE.SUCCESS)
})
}).catch(() => {
data.enabled = !data.enabled
data.isUsed = !data.isUsed
})
},
checkboxT(row, rowIndex) {
return row.id !== 1
},
normalizer(node) {
return {
id: node.deptId,
label: node.name,
children: node.children
}
}
}
}