1
lzhe
2024-04-02 513eeed9693dd43930b49dfb7599874486546e6c
1
已修改5个文件
363 ■■■■■ 文件已修改
src/views/console/system/SubitemAddDict.vue 148 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/system/addDict.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/system/addMenu.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/system/allocationDialog.vue 182 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/system/dict.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/console/system/SubitemAddDict.vue
@@ -1,47 +1,59 @@
<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="addAllocationForm" :rules="addDictRules" 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="addAllocationForm.code" placeholder="字典编号" clearable disabled></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="addAllocationForm.dictValue" placeholder="字典名称" clearable :disabled="mode=='show'"></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="上级字典">
                        <el-tree-select
                            @change = "parentIdChange"
                            v-model="addAllocationForm.parentId"
                            clearable
                            node-key="id"
                            placeholder="上级字典"
                            ref="parentTree"
                            :data="parentData"
                            check-strictly
                            :props="{ label: 'title' }"
                            style="width:100%;"
                            disabled
                            :render-after-expand="false" />
                    </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="dictKey">
                        <el-input v-model="addAllocationForm.dictKey" placeholder="字典键值" clearable :disabled="mode=='show'"></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="addAllocationForm.sort" placeholder="字典排序" clearable :disabled="mode=='show'"></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="addAllocationForm.isSealed" :disabled="mode=='show'" />
                    </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="addAllocationForm.remark" placeholder="字典备注" clearable :disabled="mode=='show'"></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="allocationSubmit()">保 存</el-button>
        </template>
    </el-dialog>
</template>
@@ -51,6 +63,7 @@
        emits: ['success', 'closed'],
        data() {
            return {
                parentData: {},
                value1: true,
                mode: "add",
                titleMap: {
@@ -61,50 +74,23 @@
                visible: false,
                isSaveing: false,
                //表单数据
                form: {
                    id:"",
                    userName: "",
                    avatar: "",
                    name: "",
                    dept: "",
                    group: []
                addAllocationForm: {
                    code: "",
                    dictValue: "",
                    sort: "",
                    isSealed: "",
                    remark: "",
                    parentId: "",
                    dictKey: "",
                    $isSealed: "否",
                    $parentId: ""
                },
                //验证规则
                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: '请输入字典排序'}],
                    dictKey:[{required: true, message: '请输入字典键值'}],
                },
                //所需数据选项
                groups: [],
@@ -125,6 +111,10 @@
            // this.getDept()
        },
        methods: {
            parentIdChange(val) {
                var $parentId = this.$refs.parentTree.getCurrentNode().title;
                this.formAddMenu.$parentId = $parentId;
            },
            //显示
            open(mode='add'){
                this.mode = mode;
@@ -141,35 +131,51 @@
                this.depts = res.data;
            },
            //表单提交方法
            submit(){
            allocationSubmit(){
                var obj = Object.assign({},this.addAllocationForm);
                if(obj.isSealed === true) {
                    obj.$isSealed = "是";
                    obj.isSealed = "1";
                }else {
                    obj.$isSealed = "否";
                    obj.isSealed = "0";
                }
                this.$refs.dialogForm.validate(async (valid) => {
                    if (valid) {
                        this.isSaveing = true;
                        var res = await this.$API.demo.post.post(this.form);
                        this.$HTTP.post("/api/blade-system/dict/submit",obj).then(res=> {
                        this.isSaveing = false;
                        if(res.code == 200){
                            this.$emit('success', this.form, this.mode)
                                this.$emit('success', this.addAllocationForm, this.mode);
                            this.visible = false;
                            this.$message.success("操作成功")
                                this.$message.success("操作成功");
                        }else{
                            this.$alert(res.message, "提示", {type: 'error'})
                                this.$alert(res.message, "提示", {type: 'error'});
                        }
                        })
                    }else{
                        return false;
                    }
                })
            },
            showDict() {
                this.$HTTP.get("/api/blade-system/dict/tree?code=DICT").then(res=> {
                    if(res.code == 200) {
                        res.data.forEach(item=> {
                            if(item.id == this.addAllocationForm.parentId) {
                                this.addAllocationForm.$parentId = item.title;
                            }
                        })
                        this.parentData = res.data;
                    }
                })
            },
            //表单注入数据
            setData(data){
                this.form.id = data.id
                this.form.userName = data.userName
                this.form.avatar = data.avatar
                this.form.name = data.name
                this.form.group = data.group
                this.form.dept = data.dept
                //可以和上面一样单个注入,也可以像下面一样直接合并进去
                //Object.assign(this.form, data)
                this.addAllocationForm.code = data.code;
                this.addAllocationForm.parentId = data.parentId;
                this.showDict(); //获取所有字典
            }
        }
    }
src/views/console/system/addDict.vue
@@ -55,8 +55,10 @@
                    code: "",
                    dictValue: "",
                    sort: "",
                    isSealed: "",
                    remark: ""
                    isSealed: "0",
                    remark: "",
                    dictKey: "-1",
                    $isSealed: "否"
                },
                //验证规则
                addDictRules: {
@@ -100,10 +102,18 @@
            },
            //表单提交方法
            dictSubmit(){
                var obj = Object.assign({},this.addDictForm);
                if(obj.isSealed === true) {
                    obj.$isSealed = "是";
                    obj.isSealed = "1";
                }else {
                    obj.$isSealed = "否";
                    obj.isSealed = "0";
                }
                this.$refs.dialogForm.validate(async (valid) => {
                    if (valid) {
                        this.isSaveing = true;
                        this.$HTTP.post("/api/blade-system/dict/submit",this.addDictForm).then(res=> {
                        this.$HTTP.post("/api/blade-system/dict/submit",obj).then(res=> {
                            this.isSaveing = false;
                            if(res.code == 200) {
                                this.$emit('success', this.addDictForm, this.mode);
src/views/console/system/addMenu.vue
@@ -169,7 +169,6 @@
            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;
src/views/console/system/allocationDialog.vue
@@ -2,47 +2,44 @@
 * @Author: lzhe lzhe@example.com
 * @Date: 2024-03-26 10:28:33
 * @LastEditors: lzhe lzhe@example.com
 * @LastEditTime: 2024-03-29 15:35:43
 * @LastEditTime: 2024-04-02 18:28:33
 * @FilePath: /smart-web/src/views/master/person/main/index.vue
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
    <el-dialog title="字典名称字典配置" v-model="visible" :width="800" destroy-on-close @closed="$emit('closed')">
    <el-dialog title="字典名称字典配置" v-model="visible" :width="1000" destroy-on-close @closed="$emit('closed')">
        <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-option label="Zone one" value="shanghai" />
                        <el-option label="Zone two" value="beijing" />
                    </el-select>
                    <el-input v-model="searchData.dictValue" placeholder="字典名称" clearable></el-input>
                </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="searchModalclick">搜索</el-button>
                    <el-button @click="searchClearModalBtn">清空</el-button>
                </el-form-item>
            </el-form>
            <div>
                <div class="dict-Btn">
                    <div class="dict-btn-bottom"> 
                        <el-button type="primary" @click="addPerson">+ 新增</el-button>
                        <el-button type="danger" plain @click="delPerson">删除</el-button>
                        <el-button type="primary" @click="addAllocation">+ 新增</el-button>
                        <el-button type="danger" plain @click="delAllocation">删除</el-button>
                    </div>
                </div>
                <div class="dict-table">
                    <el-table ref="multipleTableRef" :data="tableData" border style="width: 100%" class="multipleTableRef" @selection-change="handleSelectionChange">
                    <el-table ref="modalTeTableRef" :data="allocationTableData" border style="width: 100%" class="modalTeTableRef" row-key="id" @selection-change="modalSelectionChange" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
                        <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 fixed="right" label="操作">
                        <el-table-column prop="code" label="字典编号" width="220"></el-table-column>
                        <el-table-column prop="dictValue" label="字典名称"></el-table-column>
                        <el-table-column prop="dictKey" label="字典键值"></el-table-column>
                        <el-table-column prop="isSealed" label="封存" width="60">
                            <template #default="scope">
                                <div>{{scope.row.isSealed == 0?"否":"是"}}</div>
                            </template>
                        </el-table-column>
                        <el-table-column fixed="right" label="操作" width="160">
                            <template #default="scope">
                                <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>
@@ -55,15 +52,15 @@
                        @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">
                    </el-pagination>
                </div>
            </div>
        </div>
        <SubitemAdd-dict v-if="dialog.save" ref="SubitemAddDict" @success="handleSuccess" @closed="dialog.allocation=false"></SubitemAdd-dict>
        <SubitemAdd-dict v-if="dialog.allocation" ref="SubitemAddDict" @success="allocationSuccess" @closed="dialog.allocation=false"></SubitemAdd-dict>
    </el-dialog>
    
</template>
@@ -73,12 +70,18 @@
        emits: ['success', 'closed'],
        data(){
            return {
                selection: [],
                mode: "edit",
                visible: false,
                searchData: {
                    test: ""
                    code: "",
                    dictValue: "",
                    current: "1",
                    size: "15",
                    parentId: ""
                },
                dialog: {
                    save: false
                    allocation: false
                },
                leftActive: true,
                input: '',
@@ -87,82 +90,105 @@
                    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
                }]
                allocationTableData: [],
            }
        },
        created(){
            
        },
        mounted(){
        },
        components: {
            SubitemAddDict
        },
        methods: {
            //显示
            open(mode='add'){
                this.mode = mode;
                this.visible = true;
                return this
            allocationSuccess(val) {
                this.searchBtn();
            },
            searchBtn() {},
            searchModalclick() {
                this.searchData.current = "1";
                this.searchData.size = "15";
                this.searchBtn();
            },
            searchClearModalBtn() {
                this.searchData.current = "1";
                this.searchData.size = "15";
                this.searchData.code = "";
                this.searchData.dictValue = "";
                this.searchBtn();
            },
            searchBtn() {
                this.$HTTP.get("/api/blade-system/dict/child-list",this.searchData).then(res=> {
                    if(res.code == 200) {
                        this.allocationTableData = res.data;
                        //this.total = res.data.total;
                    }
                })
            },
            //字典配置
            table_allocation(row) {
                this.addPerson();
                this.addAllocation();
            },
            //删除
            table_del(row) {},
            table_del(row) {
                var that = this;
                this.$confirm(`确定将选择数据删除?`, '', {
                    type: 'warning'
                }).then(() => {
                    this.$HTTP.post("/api/blade-system/dict/remove?ids="+row.id).then(res=> {
                        if(res.code == 200) {
                            that.$message.success("操作成功");
                            that.searchBtn();
                        }
                    })
                }).catch(() => {
                })
            },
            //添加
            addPerson(){
                this.dialog.save = true
            addAllocation(){
                this.dialog.allocation = true
                this.$nextTick(() => {
                    this.$refs.SubitemAddDict.open()
                    this.$refs.SubitemAddDict.open('edit').setData(this.allocationTableData[0])
                })
            },
            table_edit(row){
                this.dialog.save = true
                this.dialog.allocation = true
                this.$nextTick(() => {
                    this.$refs.SubitemAddDict.open('edit').setData(row)
                })
            },
            //查看
            table_show(row){
                this.dialog.save = true
                this.dialog.allocation = true
                this.$nextTick(() => {
                    this.$refs.SubitemAddDict.open('show').setData(row)
                })
            },
            handleSelectionChange() {},
            delPerson() {},
            modalSelectionChange(selection) {
                this.selection = selection;
            },
            delAllocation() {
                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/dict/remove?ids="+selStr).then(res=> {
                    if(res.code == 200) {
                        that.$message.success("操作成功");
                        that.searchModalclick();
                    }
                })
            },
            changeDepartment() {
                this.departmentVisible = true;
            },
@@ -178,6 +204,18 @@
            },
            handleCurrentChange(val) {
                console.log(`当前页: ${val}`);
            },
            //表单注入数据
            setData(row){
                //可以和上面一样单个注入,也可以像下面一样直接合并进去
                this.searchData.parentId = row.id;
                this.searchBtn();
            },
            //显示
            open(mode='add'){
                this.mode = mode;
                this.visible = true;
                return this
            }
        }
    }
@@ -212,7 +250,7 @@
        margin-bottom: 8px;
        
    }
    .multipleTableRef {
    .modalTeTableRef {
        margin-bottom: 8px;
    }
</style>
src/views/console/system/dict.vue
@@ -2,7 +2,7 @@
 * @Author: lzhe lzhe@example.com
 * @Date: 2024-03-26 10:28:33
 * @LastEditors: lzhe lzhe@example.com
 * @LastEditTime: 2024-04-02 12:02:57
 * @LastEditTime: 2024-04-02 17:48:31
 * @FilePath: /smart-web/src/views/master/person/main/index.vue
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -30,7 +30,11 @@
            <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="code" label="字典编号"></el-table-column>
                    <el-table-column prop="code" label="字典编号">
                        <template #default="scope">
                            <el-check-tag type="info" checked @change="table_allocation(scope.row, scope.$index)">{{scope.row.code}}</el-check-tag>
                        </template>
                    </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="封存">
@@ -62,7 +66,7 @@
    </div>
    
    <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>
    <allocation-dialog v-if="dialog.allocation" ref="allocationDialog" :getModalData="getModalData" @success="handleSuccess" @closed="dialog.allocation=false"></allocation-dialog>
</template>
<script>
    import saveDialog from './addDict'
@@ -71,6 +75,7 @@
        name: "allocation",
        data(){
            return {
                getModalData: [],
                selection: [],
                total: 0,
                searchData: {
@@ -103,6 +108,9 @@
            saveDialog,allocationDialog
        },
        methods: {
            codeClick() {
            },
            addDictSuccess(addDictForm) {
                this.searchClearBtn();
            },
@@ -132,7 +140,7 @@
            table_allocation(row) {
                this.dialog.allocation = true;
                this.$nextTick(() => {
                    this.$refs.allocationDialog.open()
                    this.$refs.allocationDialog.open('edit').setData(row);
                })
            },
            //删除