diff --git a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db index a24a9d37..548aad63 100644 Binary files a/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db and b/Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db differ diff --git a/Yi.Vue3.X.RuoYi/src/api/system/dept.js b/Yi.Vue3.X.RuoYi/src/api/system/dept.js index a504f725..cf28c932 100644 --- a/Yi.Vue3.X.RuoYi/src/api/system/dept.js +++ b/Yi.Vue3.X.RuoYi/src/api/system/dept.js @@ -1,7 +1,7 @@ import request from '@/utils/request' // 查询部门列表 -export function listData(query) { +export function listDept(query) { return request({ url: '/dept/SelctGetList', method: 'get', @@ -18,7 +18,7 @@ export function listData(query) { // } // 查询部门详细 -export function getData(deptId) { +export function getDept(deptId) { return request({ url: '/dept/getById/' + deptId, method: 'get' @@ -26,7 +26,7 @@ export function getData(deptId) { } // 新增部门 -export function addData(data) { +export function addDept(data) { return request({ url: '/dept/add', method: 'post', @@ -35,7 +35,7 @@ export function addData(data) { } // 修改部门 -export function updateData(data) { +export function updateDept(data) { return request({ url: '/dept/update', method: 'put', @@ -44,7 +44,7 @@ export function updateData(data) { } // 删除部门 -export function delData(deptId) { +export function delDept(deptId) { if("string"==typeof(deptId)) { deptId=[deptId]; diff --git a/Yi.Vue3.X.RuoYi/src/views/system/dept/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/dept/index.vue index 75dbdf55..ca4fbc60 100644 --- a/Yi.Vue3.X.RuoYi/src/views/system/dept/index.vue +++ b/Yi.Vue3.X.RuoYi/src/views/system/dept/index.vue @@ -1,376 +1,297 @@ - + \ No newline at end of file + deptOptions.value = proxy.handleTree(response.data.filter(i=>i.id!=row.id), "id"); + }); + + getDept(row.id).then(response => { + form.value = response.data; + open.value = true; + title.value = "修改部门"; + }); +}) +} +/** 提交按钮 */ +function submitForm() { + proxy.$refs["deptRef"].validate(valid => { + if (valid) { + if (form.value.id != undefined) { + updateDept(form.value).then(response => { + proxy.$modal.msgSuccess("修改成功"); + open.value = false; + getList(); + }); + } else { + addDept(form.value).then(response => { + proxy.$modal.msgSuccess("新增成功"); + open.value = false; + getList(); + }); + } + } + }); +} +/** 删除按钮操作 */ +function handleDelete(row) { + proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function() { + return delDept(row.id); + }).then(() => { + getList(); + proxy.$modal.msgSuccess("删除成功"); + }).catch(() => {}); +} + +getList(); + diff --git a/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue index ecdff1c5..3650904e 100644 --- a/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue +++ b/Yi.Vue3.X.RuoYi/src/views/system/role/index.vue @@ -379,7 +379,7 @@ import { treeselect as menuTreeselect, listMenu, } from "@/api/system/menu"; -import { listData as listDept, roleDeptTreeselect } from "@/api/system/dept"; +import { listDept, roleDeptTreeselect } from "@/api/system/dept"; const router = useRouter(); const { proxy } = getCurrentInstance(); const { sys_normal_disable } = proxy.useDict("sys_normal_disable"); diff --git a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue index 427006df..5946e12a 100644 --- a/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue +++ b/Yi.Vue3.X.RuoYi/src/views/system/user/index.vue @@ -239,7 +239,7 @@ import { getToken } from "@/utils/auth"; import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser } from "@/api/system/user"; import { roleOptionselect } from "@/api/system/role"; import { postOptionselect } from "@/api/system/post"; -import { listData as listDept } from "@/api/system/dept"; +import { listDept } from "@/api/system/dept"; const router = useRouter(); diff --git a/Yi.Vue3.x.RuoYi/src/views/bbs/article/index.vue b/Yi.Vue3.x.RuoYi/src/views/bbs/article/index.vue index ecdbca44..79065cb0 100644 --- a/Yi.Vue3.x.RuoYi/src/views/bbs/article/index.vue +++ b/Yi.Vue3.x.RuoYi/src/views/bbs/article/index.vue @@ -58,7 +58,7 @@ plain icon="Plus" @click="handleAdd" - v-hasPermi="['business:article:add']" + v-hasPermi="['bbs:article:add']" >新增 @@ -69,7 +69,7 @@ icon="Edit" :disabled="single" @click="handleUpdate" - v-hasPermi="['business:article:edit']" + v-hasPermi="['bbs:article:edit']" >修改 @@ -80,7 +80,7 @@ icon="Delete" :disabled="multiple" @click="handleDelete" - v-hasPermi="['business:article:remove']" + v-hasPermi="['bbs:article:remove']" >删除 @@ -90,7 +90,7 @@ plain icon="Download" @click="handleExport" - v-hasPermi="['business:article:export']" + v-hasPermi="['bbs:article:export']" >导出 @@ -172,14 +172,14 @@ type="text" icon="Edit" @click="handleUpdate(scope.row)" - v-hasPermi="['business:article:edit']" + v-hasPermi="['bbs:article:edit']" >修改 删除 @@ -241,7 +241,7 @@ import { delData, addData, updateData, -} from "@/api/business/articleApi"; +} from "@/api/bbs/articleApi"; import { ref } from "@vue/reactivity"; import { computed } from "@vue/runtime-core";