1
lzhe
2024-04-01 b28a825dd4dee120f70398308c04cf97fa0688d8
1
已修改5个文件
251 ■■■■ 文件已修改
src/router/index.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/system/addDict.vue 97 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/system/addMenu.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/system/dict.vue 102 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/system/menu.vue 38 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/router/index.js
@@ -81,7 +81,7 @@
        if (to.matched.length == 0) {
            router.push(to.fullPath);
        }
        console.log(menuRouter,router,8899)
        console.log(menuRouter,router)
        isGetRouter = true;
    }
    beforeEach(to, from)
src/views/console/system/addDict.vue
@@ -1,37 +1,37 @@
<template>
    <el-dialog :title="titleMap[mode]" v-model="visible" :width="800" destroy-on-close @closed="$emit('closed')">
        <el-form :model="form" :rules="rules" :disabled="mode=='show'" ref="dialogForm" label-width="120px" label-position="center">
        <el-form :model="addDictForm" :rules="addDictRules" :disabled="mode=='show'" ref="dialogForm" label-width="120px" label-position="center">
            <el-row>
                <el-col :span="24">
                    <el-form-item label="字典编号" prop="userName">
                        <el-input v-model="form.userName" placeholder="字典编号" clearable></el-input>
                    <el-form-item label="字典编号" prop="code">
                        <el-input v-model="addDictForm.code" placeholder="字典编号" clearable></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="字典名称" prop="name">
                        <el-input v-model="form.name" placeholder="字典名称" clearable></el-input>
                    <el-form-item label="字典名称" prop="dictValue">
                        <el-input v-model="addDictForm.dictValue" placeholder="字典名称" clearable></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="字典排序" prop="name">
                        <el-input v-model="form.name" placeholder="字典排序" clearable></el-input>
                    <el-form-item label="字典排序" prop="sort">
                        <el-input v-model="addDictForm.sort" placeholder="字典排序" clearable></el-input>
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="封存" prop="name">
                        <el-switch v-model="value1" />
                    <el-form-item label="封存">
                        <el-switch v-model="addDictForm.isSealed" />
                    </el-form-item>
                </el-col>
                <el-col :span="12">
                    <el-form-item label="字典备注" prop="name">
                        <el-input v-model="form.name" placeholder="字典备注" clearable></el-input>
                    <el-form-item label="字典备注">
                        <el-input v-model="addDictForm.remark" placeholder="字典备注" clearable></el-input>
                    </el-form-item>
                </el-col>
            </el-row>
        </el-form>
        <template #footer>
            <el-button @click="visible=false" >取 消</el-button>
            <el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="submit()">保 存</el-button>
            <el-button v-if="mode!='show'" type="primary" :loading="isSaveing" @click="dictSubmit()">保 存</el-button>
        </template>
    </el-dialog>
</template>
@@ -51,50 +51,18 @@
                visible: false,
                isSaveing: false,
                //表单数据
                form: {
                    id:"",
                    userName: "",
                    avatar: "",
                    name: "",
                    dept: "",
                    group: []
                addDictForm: {
                    code: "",
                    dictValue: "",
                    sort: "",
                    isSealed: "",
                    remark: ""
                },
                //验证规则
                rules: {
                    avatar:[
                        {required: true, message: '请上传头像'}
                    ],
                    userName: [
                        {required: true, message: '请输入登录账号'}
                    ],
                    name: [
                        {required: true, message: '请输入真实姓名'}
                    ],
                    password: [
                        {required: true, message: '请输入登录密码'},
                        {validator: (rule, value, callback) => {
                            if (this.form.password2 !== '') {
                                this.$refs.dialogForm.validateField('password2');
                            }
                            callback();
                        }}
                    ],
                    password2: [
                        {required: true, message: '请再次输入密码'},
                        {validator: (rule, value, callback) => {
                            if (value !== this.form.password) {
                                callback(new Error('两次输入密码不一致!'));
                            }else{
                                callback();
                            }
                        }}
                    ],
                    dept: [
                        {required: true, message: '请选择所属部门'}
                    ],
                    group: [
                        {required: true, message: '请选择所属角色', trigger: 'change'}
                    ]
                addDictRules: {
                    code:[{required: true, message: '请输入字典编号'}],
                    dictValue:[{required: true, message: '请输入字典名称'}],
                    sort:[{required: true, message: '请输入字典排序'}]
                },
                //所需数据选项
                groups: [],
@@ -131,19 +99,20 @@
                this.depts = res.data;
            },
            //表单提交方法
            submit(){
            dictSubmit(){
                this.$refs.dialogForm.validate(async (valid) => {
                    if (valid) {
                        this.isSaveing = true;
                        var res = await this.$API.demo.post.post(this.form);
                        this.isSaveing = false;
                        if(res.code == 200){
                            this.$emit('success', this.form, this.mode)
                            this.visible = false;
                            this.$message.success("操作成功")
                        }else{
                            this.$alert(res.message, "提示", {type: 'error'})
                        }
                        this.$HTTP.post("/api/blade-system/dict/submit",this.addDictForm).then(res=> {
                            this.isSaveing = false;
                            if(res.code == 200) {
                                this.$emit('success', this.addDictForm, this.mode);
                                this.visible = false;
                                this.$message.success("操作成功");
                            }else {
                                this.$alert(res.message, "提示", {type: 'error'});
                            }
                        })
                    }else{
                        return false;
                    }
src/views/console/system/addMenu.vue
@@ -97,6 +97,7 @@
        emits: ['success', 'closed'],
        data() {
            return {
                fixed: false,
                parentData: {},
                categoryList: [
                    {label: 0,id: "0",value: "APP"},
@@ -168,6 +169,7 @@
            parentIdChange(val) {
                var $parentId = this.$refs.parentTree.getCurrentNode().title;
                this.formAddMenu.$parentId = $parentId;
                alert(4)
            },
            belongApplicationChange(val) {
                var $belongApplication =  this.applicationList.find(option=>option.code === val).name;
@@ -240,9 +242,15 @@
            },
            //表单注入数据
            setData(data){
                if(data.parentId == "0") {
                    data.parentId = "";
                }
                //可以和上面一样单个注入,也可以像下面一样直接合并进去
                console.log(data)
                Object.assign(this.formAddMenu, data)
                if(data.fixed) { //新增子项
                    this.formAddMenu.parentId = data.id;
                }else {
                    Object.assign(this.formAddMenu, data);
                }
            }
        }
    }
src/views/console/system/dict.vue
@@ -10,21 +10,17 @@
    <div class="dict-main">
        <el-form :inline="true" :model="searchData" abel-width="120px">
            <el-form-item label="字典编号">
                <el-input v-model="searchData.test" placeholder="字典编号" clearable />
                <el-input v-model="searchData.code" placeholder="字典编号" clearable />
            </el-form-item>
            <el-form-item label="字典名称">
                <el-select
                    v-model="searchData.test"
                    placeholder="字典名称"
                    clearable
                >
                <el-select v-model="searchData.dictValue" placeholder="字典名称" clearable>
                    <el-option label="Zone one" value="shanghai" />
                    <el-option label="Zone two" value="beijing" />
                </el-select>
            </el-form-item>
            <el-form-item>
                <el-button type="primary" @click="searchBtn">搜索</el-button>
                <el-button @click="searchBtn">清空</el-button>
                <el-button type="primary" @click="searchclick">搜索</el-button>
                <el-button @click="searchClearBtn">清空</el-button>
            </el-form-item>
        </el-form>
        <div>
@@ -37,10 +33,14 @@
            <div class="dict-table">
                <el-table ref="multipleTableRef" :data="tableData" border style="width: 100%" class="multipleTableRef" @selection-change="handleSelectionChange">
                    <el-table-column type="selection" width="55" />
                    <el-table-column prop="date" label="字典编号"></el-table-column>
                    <el-table-column prop="name" label="字典名称"></el-table-column>
                    <el-table-column prop="name" label="字典排序"></el-table-column>
                    <el-table-column prop="name" label="封存"></el-table-column>
                    <el-table-column prop="code" label="字典编号"></el-table-column>
                    <el-table-column prop="dictValue" label="字典名称"></el-table-column>
                    <el-table-column prop="sort" label="字典排序"></el-table-column>
                    <el-table-column prop="isSealed" label="封存">
                        <template #default="scope">
                            <div>{{scope.row.isSealed == 0?"否":"是"}}</div>
                        </template>
                    </el-table-column>
                    <el-table-column fixed="right" label="操作">
                        <template #default="scope">
                            <el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
@@ -51,19 +51,20 @@
                    </el-table-column>
                </el-table>
                <el-pagination
                    style="margin-top: 12px;"
                    @size-change="handleSizeChange"
                    @current-change="handleCurrentChange"
                    :current-page="currentPage4"
                    :page-sizes="[100, 200, 300, 400]"
                    :page-size="100"
                    :page-sizes="[15, 50, 100]"
                    :page-size="15"
                    layout="total, sizes, prev, pager, next, jumper"
                    :total="400">
                    :total="total">
                </el-pagination>
            </div>
        </div>
    </div>
    
    <save-dialog v-if="dialog.save" ref="saveDialog" @success="handleSuccess" @closed="dialog.save=false"></save-dialog>
    <save-dialog v-if="dialog.save" ref="saveDialog" @success="addDictSuccess" @closed="dialog.save=false"></save-dialog>
    <allocation-dialog v-if="dialog.allocation" ref="allocationDialog" @success="handleSuccess" @closed="dialog.allocation=false"></allocation-dialog>
</template>
<script>
@@ -73,8 +74,12 @@
        name: "allocation",
        data(){
            return {
                total: 0,
                searchData: {
                    test: ""
                    code: "",
                    dictValue: "",
                    current: "1",
                    size: "15"
                },
                dialog: {
                    save: false,
@@ -87,48 +92,44 @@
                    label: '黄金糕'
                }],
                input3: '',
                tableData: [{
                    date: '2016-05-02',
                    name: '王小虎',
                    province: '上海',
                    city: '普陀区',
                    address: '上海市普陀区金沙江路 1518 弄',
                    zip: 200333
                    }, {
                    date: '2016-05-04',
                    name: '王小虎',
                    province: '上海',
                    city: '普陀区',
                    address: '上海市普陀区金沙江路 1517 弄',
                    zip: 200333
                    }, {
                    date: '2016-05-01',
                    name: '王小虎',
                    province: '上海',
                    city: '普陀区',
                    address: '上海市普陀区金沙江路 1519 弄',
                    zip: 200333
                    }, {
                    date: '2016-05-03',
                    name: '王小虎',
                    province: '上海',
                    city: '普陀区',
                    address: '上海市普陀区金沙江路 1516 弄',
                    zip: 200333
                }]
                tableData: []
            }
        },
        created(){
            
        },
        mounted(){
            this.searchBtn();
        },
        components: {
            saveDialog,allocationDialog
        },
        methods: {
            searchBtn() {},
            addDictSuccess(addDictForm) {
                this.searchClearBtn();
            },
            searchClearBtn() {
                this.searchData = {
                    code: "",
                    dictValue: "",
                    current: "1",
                    size: "15"
                }
                this.searchBtn();
            },
            searchclick() {
                this.searchData.current = "1";
                this.searchData.size = "15";
                this.searchBtn();
            },
            searchBtn() {
                this.$HTTP.get("/api/blade-system/dict/parent-list",this.searchData).then(res=> {
                    if(res.code == 200) {
                        this.tableData = res.data.records;
                        this.total = res.data.total;
                    }
                })
            },
            //字典配置
            table_allocation(row) {
                this.dialog.allocation = true;
@@ -172,9 +173,14 @@
            },
            handleSizeChange(val) {
                console.log(`每页 ${val} 条`);
                this.searchData.current = "1";
                this.searchData.size = val;
                this.searchBtn();
            },
            handleCurrentChange(val) {
                console.log(`当前页: ${val}`);
                this.searchData.current = val;
                this.searchBtn();
            }
        }
    }
src/views/console/system/menu.vue
@@ -72,7 +72,7 @@
                            <el-button text type="primary" size="small" @click="table_show(scope.row, scope.$index)">查看</el-button>
                            <el-button type="text" size="small" @click="table_edit(scope.row, scope.$index)">编辑</el-button>
                            <el-button text type="primary" size="small" @click="table_del(scope.row, scope.$index)">删除</el-button>
                            <el-button text type="primary" size="small" @click="addPerson(scope.row, scope.$index)">新增子项</el-button>
                            <el-button text type="primary" size="small" @click="table_edit(scope.row, scope.$index,'fixed')">新增子项</el-button>
                        </template>
                    </el-table-column>
                </el-table>
@@ -88,6 +88,7 @@
        name: "allocation",
        data(){
            return {
                selection: [],
                applicationList: [],
                searchData: {
                    name: "",
@@ -123,7 +124,7 @@
        methods: {
            handleSuccess(formAddMenu) {
                this.searchData.parentId = formAddMenu.parentId;
                this.searchBtn();
                this.searchClearBtn();
            },
            tableLoad(row,treeNode,resolve) {
                this.searchData.parentId= row.id;
@@ -177,7 +178,7 @@
                    this.$HTTP.post("/api/blade-system/menu/remove?ids="+row.id).then(res=> {
                        if(res.code == 200) {
                            that.$message.success("操作成功");
                            that.searchBtn();
                            that.searchclick();
                        }
                    })
                }).catch(() => {
@@ -191,12 +192,15 @@
                    this.$refs.saveDialog.open()
                })
            },
            table_edit(row){
            table_edit(row,index,fixed){
                this.dialog.save = true
                this.$HTTP.get("/api/blade-system/menu/detail?id="+row.id).then(res=> {
                    if(res.code == 200) {
                        this.dialog.save = true;
                        this.$nextTick(() => {
                            if(fixed) {  //判断新增子项
                                res.data.fixed = "fixed";
                            }
                            this.$refs.saveDialog.open('edit').setData(res.data);
                        })
                    }
@@ -209,8 +213,30 @@
                    this.$refs.saveDialog.open('show').setData(row)
                })
            },
            handleSelectionChange() {},
            delPerson() {},
            handleSelectionChange(selection) {
                this.selection = selection;
            },
            delPerson() {
                if(this.selection.length == 0) {
                    this.$message({
                      message: '请选择至少一条数据',
                      type: 'warning'
                    });
                    return;
                }
                var selStr = "";
                this.selection.map(item=> {
                    selStr += item.id + ","
                })
                selStr = selStr.replace(/,$/, '');
                var that = this;
                this.$HTTP.post("/api/blade-system/menu/remove?ids="+selStr).then(res=> {
                    if(res.code == 200) {
                        that.$message.success("操作成功");
                        that.searchclick();
                    }
                })
            },
            changeDepartment() {
                this.departmentVisible = true;
            },