From 0d5f70bbcf830f6c3aebf92a0b865a04c9d7f263 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 27 Jun 2025 11:28:12 +0800
Subject: [PATCH] feat:系统管理---二级页面样式调整
---
src/views/system/dept.vue | 403 +++++++++++++++++++++++++++------------------------------
1 files changed, 190 insertions(+), 213 deletions(-)
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 9475470..93d87a8 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -1,45 +1,18 @@
<template>
<basic-container>
- <avue-crud
- :option="option"
- :table-loading="loading"
- :data="data"
- ref="crud"
- v-model="form"
- :permission="permissionList"
- :before-open="beforeOpen"
- :before-close="beforeClose"
- @row-del="rowDel"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- @tree-load="treeLoad"
- >
+ <avue-crud :option="option" :table-loading="loading" :data="data" ref="crud" v-model="form"
+ :permission="permissionList" :before-open="beforeOpen" :before-close="beforeClose" @row-del="rowDel"
+ @row-update="rowUpdate" @row-save="rowSave" @search-change="searchChange" @search-reset="searchReset"
+ @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange"
+ @refresh-change="refreshChange" @on-load="onLoad" @tree-load="treeLoad">
<template #menu-left>
- <el-button
- type="danger"
- icon="el-icon-delete"
- v-if="permission.dept_delete"
- plain
- @click="handleDelete"
- >
+ <el-button type="danger" icon="el-icon-delete" v-if="permission.dept_delete" plain @click="handleDelete">
删除
</el-button>
</template>
<template #menu="scope">
- <el-button
- type="primary"
- text
- icon="el-icon-plus"
- @click.stop="handleAdd(scope.row, scope.index)"
- v-if="userInfo.role_name.includes('admin')"
- >
+ <el-button type="primary" text icon="el-icon-plus" @click.stop="handleAdd(scope.row, scope.index)"
+ v-if="userInfo.role_name.includes('admin')">
新增子项
</el-button>
</template>
@@ -63,13 +36,13 @@
add,
getDept,
getDeptTree,
-} from '@/api/system/dept';
-import { getLazyTree } from '@/api/base/region';
-import { mapGetters } from 'vuex';
-import website from '@/config/website';
+} from '@/api/system/dept'
+import { getLazyTree } from '@/api/base/region'
+import { mapGetters } from 'vuex'
+import website from '@/config/website'
export default {
- data() {
+ data () {
return {
form: {},
selectionList: [],
@@ -94,6 +67,10 @@
viewBtn: true,
menuWidth: 320,
dialogClickModal: false,
+
+ height: 'auto',
+ calcHeight: 20,
+
column: [
{
label: '机构名称',
@@ -239,23 +216,23 @@
],
change: ({ value }) => {
if (!value) {
- this.form.areaCode = null; // 未选择时置为空
+ this.form.areaCode = null // 未选择时置为空
} else {
// 如果 value 是逗号分隔的字符串，拆分并取最后一个值
if (typeof value === 'string' && value.includes(',')) {
- const codes = value.split(',');
- this.form.areaCode = codes[codes.length - 1];
+ const codes = value.split(',')
+ this.form.areaCode = codes[codes.length - 1]
} else {
- this.form.areaCode = value; // 直接使用单一值
+ this.form.areaCode = value // 直接使用单一值
}
}
- console.log('cascader change value:', value);
- console.log('处理后的区县编码:', this.form.areaCode);
+ console.log('cascader change value:', value)
+ console.log('处理后的区县编码:', this.form.areaCode)
},
lazy: true,
- lazyLoad(node, resolve) {
- let level = node.level;
- let list = [];
+ lazyLoad (node, resolve) {
+ let level = node.level
+ let list = []
let callback = () => {
resolve(
(list || []).map(ele => ({
@@ -263,26 +240,26 @@
value: ele.value, // 保持原始值类型（字符串）
leaf: level >= 2, // 县级为最后一级
}))
- );
- };
+ )
+ }
if (level === 0) {
getLazyTree('000000000000').then(res => {
- list = res.data.data;
- callback();
- });
+ list = res.data.data
+ callback()
+ })
} else if (level === 1) {
getLazyTree(node.value).then(res => {
- list = res.data.data;
- callback();
- });
+ list = res.data.data
+ callback()
+ })
} else if (level === 2) {
getLazyTree(node.value).then(res => {
- list = res.data.data;
- callback();
- });
+ list = res.data.data
+ callback()
+ })
} else {
- callback();
+ callback()
}
},
},
@@ -302,148 +279,148 @@
],
},
data: [],
- };
+ }
},
computed: {
...mapGetters(['userInfo', 'permission']),
- permissionList() {
+ permissionList () {
return {
addBtn: this.validData(this.permission.dept_add, false),
viewBtn: this.validData(this.permission.dept_view, false),
delBtn: this.validData(this.permission.dept_delete, false),
editBtn: this.validData(this.permission.dept_edit, false),
- };
+ }
},
- ids() {
- let ids = [];
+ ids () {
+ let ids = []
this.selectionList.forEach(ele => {
- ids.push(ele.id);
- });
- return ids.join(',');
+ ids.push(ele.id)
+ })
+ return ids.join(',')
},
},
methods: {
- initData() {
+ initData () {
getDeptTree().then(res => {
- const column = this.findObject(this.option.column, 'parentId');
- column.dicData = res.data.data;
- });
+ const column = this.findObject(this.option.column, 'parentId')
+ column.dicData = res.data.data
+ })
},
- handleAdd(row) {
- this.parentId = row.id;
- const column = this.findObject(this.option.column, 'parentId');
- column.value = row.id;
- column.addDisabled = true;
- this.form.areaCode = null; // 初始化为空
- this.$refs.crud.rowAdd();
+ handleAdd (row) {
+ this.parentId = row.id
+ const column = this.findObject(this.option.column, 'parentId')
+ column.value = row.id
+ column.addDisabled = true
+ this.form.areaCode = null // 初始化为空
+ this.$refs.crud.rowAdd()
},
- validateSubmitData(row) {
+ validateSubmitData (row) {
if (!row.areaCode) {
- this.$message.warning('请选择行政区划');
- return false;
+ this.$message.warning('请选择行政区划')
+ return false
}
- return true;
+ return true
},
- rowSave(row, done, loading) {
+ rowSave (row, done, loading) {
if (!this.validateSubmitData(row)) {
- loading();
- return;
+ loading()
+ return
}
- console.log('--- Start rowSave ---');
- console.log('Form data before save:', this.form);
+ console.log('--- Start rowSave ---')
+ console.log('Form data before save:', this.form)
// 处理 areaCode，确保只取最后一个值
- let areaCode = this.form.areaCode;
+ let areaCode = this.form.areaCode
if (Array.isArray(areaCode)) {
- areaCode = areaCode[areaCode.length - 1]; // 数组取最后一个
+ areaCode = areaCode[areaCode.length - 1] // 数组取最后一个
} else if (typeof areaCode === 'string' && areaCode.includes(',')) {
- const codes = areaCode.split(',');
- areaCode = codes[codes.length - 1]; // 字符串拆分取最后一个
+ const codes = areaCode.split(',')
+ areaCode = codes[codes.length - 1] // 字符串拆分取最后一个
}
- row.areaCode = areaCode || null; // 确保非空
+ row.areaCode = areaCode || null // 确保非空
- console.log('Row data before submit:', row);
+ console.log('Row data before submit:', row)
add(row).then(
res => {
- console.log('Save response:', res.data);
- const data = res.data.data;
- row.id = data.id;
- row.deptCategoryName = data.deptCategoryName;
- row.tenantId = data.tenantId;
+ console.log('Save response:', res.data)
+ const data = res.data.data
+ row.id = data.id
+ row.deptCategoryName = data.deptCategoryName
+ row.tenantId = data.tenantId
this.$message({
type: 'success',
message: '操作成功!',
- });
- this.onLoad(this.page);
- done(row);
+ })
+ this.onLoad(this.page)
+ done(row)
},
error => {
- console.log('Save error:', error);
- this.loading = false;
- loading();
+ console.log('Save error:', error)
+ this.loading = false
+ loading()
}
- );
+ )
},
- rowUpdate(row, index, done, loading) {
+ rowUpdate (row, index, done, loading) {
if (!this.validateSubmitData(row)) {
- loading();
- return;
+ loading()
+ return
}
- console.log('--- Start rowUpdate ---');
+ console.log('--- Start rowUpdate ---')
// 提交时只使用县级代码
const submitData = {
...row,
areaCode: row.areaCode.split(',').pop(), // 取最后一个代码（县级）
- };
+ }
- console.log('Row data before submit:', row);
+ console.log('Row data before submit:', row)
update(submitData)
.then(
res => {
- console.log('Update response:', res.data);
+ console.log('Update response:', res.data)
this.$message({
type: 'success',
message: '操作成功!',
- });
- this.onLoad(this.page);
- done(row);
+ })
+ this.onLoad(this.page)
+ done(row)
},
error => {
- console.log('Update error:', error);
- this.loading = false;
- loading();
+ console.log('Update error:', error)
+ this.loading = false
+ loading()
}
)
.catch(error => {
- console.log('Update promise rejected:', error);
- this.loading = false;
- });
+ console.log('Update promise rejected:', error)
+ this.loading = false
+ })
},
- rowDel(row, index, done) {
+ rowDel (row, index, done) {
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
})
.then(() => {
- return remove(row.id);
+ return remove(row.id)
})
.then(() => {
this.$message({
type: 'success',
message: '操作成功!',
- });
- this.onLoad(this.page);
- done(row);
- });
+ })
+ this.onLoad(this.page)
+ done(row)
+ })
},
- handleDelete() {
+ handleDelete () {
if (this.selectionList.length === 0) {
- this.$message.warning('请选择至少一条数据');
- return;
+ this.$message.warning('请选择至少一条数据')
+ return
}
this.$confirm('确定将选择数据删除?', {
confirmButtonText: '确定',
@@ -451,153 +428,153 @@
type: 'warning',
})
.then(() => {
- return remove(this.ids);
+ return remove(this.ids)
})
.then(() => {
- this.data = [];
- this.parentId = 0;
- this.$refs.crud.refreshTable();
- this.$refs.crud.toggleSelection();
- this.onLoad(this.page);
+ this.data = []
+ this.parentId = 0
+ this.$refs.crud.refreshTable()
+ this.$refs.crud.toggleSelection()
+ this.onLoad(this.page)
this.$message({
type: 'success',
message: '操作成功!',
- });
- });
+ })
+ })
},
- searchReset() {
- this.query = {};
- this.parentId = 0;
- this.onLoad(this.page);
+ searchReset () {
+ this.query = {}
+ this.parentId = 0
+ this.onLoad(this.page)
},
- searchChange(params, done) {
- this.query = params;
- this.parentId = '';
- this.page.currentPage = 1;
- this.onLoad(this.page, params);
- done();
+ searchChange (params, done) {
+ this.query = params
+ this.parentId = ''
+ this.page.currentPage = 1
+ this.onLoad(this.page, params)
+ done()
},
- selectionChange(list) {
- this.selectionList = list;
+ selectionChange (list) {
+ this.selectionList = list
},
- selectionClear() {
- this.selectionList = [];
- this.$refs.crud.toggleSelection();
+ selectionClear () {
+ this.selectionList = []
+ this.$refs.crud.toggleSelection()
},
// 修改 beforeOpen 方法
- beforeOpen(done, type) {
+ beforeOpen (done, type) {
if (['add', 'edit'].includes(type)) {
- this.initData();
+ this.initData()
}
if (['edit', 'view'].includes(type)) {
getDept(this.form.id).then(res => {
- const data = res.data.data;
- const areaCode = data.areaCode;
- const areaName = data.areaName;
+ const data = res.data.data
+ const areaCode = data.areaCode
+ const areaName = data.areaName
// 生成完整的行政区划代码（考虑不同级别）
- const fullAreaCode = this.getFullAreaCode(areaCode);
+ const fullAreaCode = this.getFullAreaCode(areaCode)
this.form = Object.assign({}, data, {
hasChildren: this.form.hasChildren,
areaCode: fullAreaCode,
areaName: areaName || '',
- });
+ })
// 调试输出
console.log('回显数据:', {
originalAreaCode: areaCode,
fullAreaCode: fullAreaCode,
areaName: areaName,
- });
- });
+ })
+ })
} else if (type === 'add') {
- this.form.areaCode = '';
- this.form.areaName = '';
+ this.form.areaCode = ''
+ this.form.areaName = ''
}
- done();
+ done()
},
- beforeClose(done) {
- this.parentId = '';
- const column = this.findObject(this.option.column, 'parentId');
- column.value = '';
- column.addDisabled = false;
- this.form.areaCode = null;
- done();
+ beforeClose (done) {
+ this.parentId = ''
+ const column = this.findObject(this.option.column, 'parentId')
+ column.value = ''
+ column.addDisabled = false
+ this.form.areaCode = null
+ done()
},
- currentChange(currentPage) {
- this.page.currentPage = currentPage;
- this.onLoad(this.page);
+ currentChange (currentPage) {
+ this.page.currentPage = currentPage
+ this.onLoad(this.page)
},
- sizeChange(pageSize) {
- this.page.pageSize = pageSize;
- this.onLoad(this.page);
+ sizeChange (pageSize) {
+ this.page.pageSize = pageSize
+ this.onLoad(this.page)
},
- refreshChange() {
- this.onLoad(this.page, this.query);
+ refreshChange () {
+ this.onLoad(this.page, this.query)
},
- onLoad(page, params = {}) {
- this.loading = true;
- console.log('onLoad triggered with page:', page, 'params:', params);
- console.log('Current parentId:', this.parentId, 'query:', this.query);
+ onLoad (page, params = {}) {
+ this.loading = true
+ console.log('onLoad triggered with page:', page, 'params:', params)
+ console.log('Current parentId:', this.parentId, 'query:', this.query)
getLazyList(this.parentId, Object.assign(params, this.query))
.then(res => {
- console.log('onLoad response:', res.data);
+ console.log('onLoad response:', res.data)
// 处理 areaCode，确保是单一字符串
const data = (res.data.data || []).map(item => {
- const fullAreaCode = this.getFullAreaCode(item.areaCode);
+ const fullAreaCode = this.getFullAreaCode(item.areaCode)
return {
...item,
// 保存完整的行政区划代码
areaCode: fullAreaCode,
// 使用原始的县级代码作为实际值
originalAreaCode: item.areaCode,
- };
- });
- this.data = data;
- this.loading = false;
- this.selectionClear();
- console.log('Table data after onLoad:', this.data);
+ }
+ })
+ this.data = data
+ this.loading = false
+ this.selectionClear()
+ console.log('Table data after onLoad:', this.data)
})
.catch(error => {
- console.log('onLoad error:', error);
- this.loading = false;
- this.data = this.data; // 保留当前数据
- console.log('Table data after onLoad error:', this.data);
- });
+ console.log('onLoad error:', error)
+ this.loading = false
+ this.data = this.data // 保留当前数据
+ console.log('Table data after onLoad error:', this.data)
+ })
},
- treeLoad(tree, treeNode, resolve) {
+ treeLoad (tree, treeNode, resolve) {
getChildLazyTree({ parentId: tree.id }).then(res => {
- resolve(res.data.data);
- });
+ resolve(res.data.data)
+ })
},
// 修改 getFullAreaCode 方法
- getFullAreaCode(areaCode) {
- if (!areaCode) return '';
+ getFullAreaCode (areaCode) {
+ if (!areaCode) return ''
// 根据编码长度判断层级
- const code = areaCode.toString();
+ const code = areaCode.toString()
// 如果已经是完整的逗号分隔格式，直接返回
- if (code.includes(',')) return code;
+ if (code.includes(',')) return code
// 处理不同级别的编码
if (code.endsWith('0000000000')) {
// 省级编码
- return code;
+ return code
} else if (code.endsWith('00000000') && !code.endsWith('0000000000')) {
// 市级编码
- const provinceCode = code.substring(0, 2) + '0000000000';
- return `${provinceCode},${code}`;
+ const provinceCode = code.substring(0, 2) + '0000000000'
+ return `${provinceCode},${code}`
} else {
// 县级编码
- const provinceCode = code.substring(0, 2) + '0000000000';
- const cityCode = code.substring(0, 4) + '00000000';
- return `${provinceCode},${cityCode},${code}`;
+ const provinceCode = code.substring(0, 2) + '0000000000'
+ const cityCode = code.substring(0, 4) + '00000000'
+ return `${provinceCode},${cityCode},${code}`
}
},
},
-};
+}
</script>
<style></style>
--
Gitblit v1.9.3