From 0ca1914e9966cae2778d757f330519f9a997e95d Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Mon, 8 Sep 2025 17:43:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/index.vue | 227 +++++++++++---------------------
 1 file changed, 77 insertions(+), 150 deletions(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 2420760..2f3857b 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -7,105 +7,57 @@
             :inline="true"
             v-show="showSearch"
         >
-            <el-form-item label="部门名称" prop="deptName">
+            <el-form-item prop="deptName">
                 <el-input
-                    v-model="queryParams.deptName"
-                    placeholder="请输入部门名称"
                     clearable
+                    placeholder="部门名称"
+                    v-model="queryParams.deptName"
                     @keyup.enter.native="handleQuery"
                 />
             </el-form-item>
-            <el-form-item label="状态" prop="status">
-                <el-select
-                    v-model="queryParams.status"
-                    placeholder="部门状态"
-                    clearable
-                >
-                    <el-option
-                        v-for="dict in dict.type.sys_normal_disable"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                    />
-                </el-select>
-            </el-form-item>
+
             <el-form-item>
                 <el-button
+                    size="mini"
                     type="primary"
                     icon="el-icon-search"
-                    size="mini"
                     @click="handleQuery"
-                    >搜索</el-button
                 >
+                    搜索
+                </el-button>
                 <el-button
-                    icon="el-icon-refresh"
                     size="mini"
                     @click="resetQuery"
-                    >重置</el-button
+                    icon="el-icon-refresh"
                 >
-            </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
+                    重置
+                </el-button>
                 <el-button
                     type="primary"
                     plain
-                    icon="el-icon-plus"
                     size="mini"
                     @click="handleAdd"
+                    icon="el-icon-plus"
                     v-hasPermi="['system:dept:add']"
-                    >新增</el-button
                 >
-            </el-col>
-            <el-col :span="1.5">
-                <el-button
-                    type="info"
-                    plain
-                    icon="el-icon-sort"
-                    size="mini"
-                    @click="toggleExpandAll"
-                    >展开/折叠</el-button
-                >
-            </el-col>
-            <right-toolbar
-                :showSearch.sync="showSearch"
-                @queryTable="getList"
-            ></right-toolbar>
-        </el-row>
+                    新增
+                </el-button>
+            </el-form-item>
+        </el-form>
 
         <el-table
             v-if="refreshTable"
             v-loading="loading"
             :data="deptList"
             row-key="deptId"
+            border
             :default-expand-all="isExpandAll"
             :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
         >
-            <el-table-column
-                prop="deptName"
-                label="部门名称"
-                width="260"
-            ></el-table-column>
-            <el-table-column
-                prop="orderNum"
-                label="排序"
-                width="200"
-            ></el-table-column>
-            <el-table-column prop="status" label="状态" width="100">
-                <template slot-scope="scope">
-                    <dict-tag
-                        :options="dict.type.sys_normal_disable"
-                        :value="scope.row.status"
-                    />
-                </template>
-            </el-table-column>
-            <el-table-column
-                label="创建时间"
-                align="center"
-                prop="createTime"
-                width="200"
-            >
+            <el-table-column prop="deptName" label="部门名称" align="center" />
+            <el-table-column prop="remark" label="部门描述" align="center" />
+
+            <el-table-column label="更新时间" align="center" prop="createTime">
                 <template slot-scope="scope">
                     <span>{{ parseTime(scope.row.createTime) }}</span>
                 </template>
@@ -122,25 +74,19 @@
                         icon="el-icon-edit"
                         @click="handleUpdate(scope.row)"
                         v-hasPermi="['system:dept:edit']"
-                        >修改</el-button
                     >
+                        修改
+                    </el-button>
+
                     <el-button
-                        size="mini"
-                        type="text"
-                        icon="el-icon-plus"
-                        @click="handleAdd(scope.row)"
-                        v-hasPermi="['system:dept:add']"
-                        >新增</el-button
-                    >
-                    <el-button
-                        v-if="scope.row.parentId != 0"
                         size="mini"
                         type="text"
                         icon="el-icon-delete"
                         @click="handleDelete(scope.row)"
                         v-hasPermi="['system:dept:remove']"
-                        >删除</el-button
                     >
+                        删除
+                    </el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -149,12 +95,29 @@
         <el-dialog
             :title="title"
             :visible.sync="open"
-            width="600px"
+            width="50%"
             append-to-body
         >
-            <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+            <el-form
+                ref="form"
+                :model="form"
+                :rules="rules"
+                label-width="120px"
+            >
                 <el-row>
-                    <el-col :span="24" v-if="form.parentId !== 0">
+                    <el-col :span="24">
+                        <el-form-item label="部门名称" prop="deptName">
+                            <el-input
+                                maxlength="30"
+                                show-word-limit
+                                v-model="form.deptName"
+                                placeholder="请输入部门名称"
+                            />
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+                <el-row>
+                    <el-col :span="24">
                         <el-form-item label="上级部门" prop="parentId">
                             <treeselect
                                 v-model="form.parentId"
@@ -166,66 +129,18 @@
                     </el-col>
                 </el-row>
                 <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="部门名称" prop="deptName">
+                    <el-col :span="24">
+                        <el-form-item label="部门描述" prop="remark">
                             <el-input
-                                v-model="form.deptName"
-                                placeholder="请输入部门名称"
+                                type="textarea"
+                                maxlength="100"
+                                show-word-limit
+                                v-model="form.remark"
+                                placeholder="请输入部门描述"
+                                :autosize="{ minRows: 6, maxRows: 10 }"
                             />
                         </el-form-item>
                     </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="显示排序" prop="orderNum">
-                            <el-input-number
-                                v-model="form.orderNum"
-                                controls-position="right"
-                                :min="0"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="负责人" prop="leader">
-                            <el-input
-                                v-model="form.leader"
-                                placeholder="请输入负责人"
-                                maxlength="20"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="联系电话" prop="phone">
-                            <el-input
-                                v-model="form.phone"
-                                placeholder="请输入联系电话"
-                                maxlength="11"
-                            />
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-                <el-row>
-                    <el-col :span="12">
-                        <el-form-item label="邮箱" prop="email">
-                            <el-input
-                                v-model="form.email"
-                                placeholder="请输入邮箱"
-                                maxlength="50"
-                            />
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                        <el-form-item label="部门状态">
-                            <el-radio-group v-model="form.status">
-                                <el-radio
-                                    v-for="dict in dict.type.sys_normal_disable"
-                                    :key="dict.value"
-                                    :label="dict.value"
-                                    >{{ dict.label }}</el-radio
-                                >
-                            </el-radio-group>
-                        </el-form-item>
-                    </el-col>
                 </el-row>
             </el-form>
             <div slot="footer" class="dialog-footer">
@@ -279,13 +194,13 @@ export default {
             form: {},
             // 表单校验
             rules: {
-                parentId: [
-                    {
-                        required: true,
-                        message: '上级部门不能为空',
-                        trigger: 'blur',
-                    },
-                ],
+                // parentId: [
+                //     {
+                //         required: false,
+                //         message: '上级部门不能为空',
+                //         trigger: 'blur',
+                //     },
+                // ],
                 deptName: [
                     {
                         required: true,
@@ -356,6 +271,7 @@ export default {
                 phone: undefined,
                 email: undefined,
                 status: '0',
+                remark: undefined,
             }
             this.resetForm('form')
         },
@@ -371,9 +287,9 @@ export default {
         /** 新增按钮操作 */
         handleAdd(row) {
             this.reset()
-            if (row != undefined) {
-                this.form.parentId = row.deptId
-            }
+            // if (row != undefined) {
+            //     this.form.parentId = row.deptId
+            // }
             this.open = true
             this.title = '添加部门'
             listDept().then((response) => {
@@ -393,6 +309,9 @@ export default {
             this.reset()
             getDept(row.deptId).then((response) => {
                 this.form = response.data
+                this.form.parentId === 0
+                    ? (this.form.parentId = undefined)
+                    : null
                 this.open = true
                 this.title = '修改部门'
                 listDeptExcludeChild(row.deptId).then((response) => {
@@ -419,7 +338,15 @@ export default {
                             this.getList()
                         })
                     } else {
-                        addDept(this.form).then((response) => {
+                        const { deptName, parentId, remark } = this.form
+                        const params = { deptName, remark }
+
+                        if (parentId === undefined) {
+                            params.parentId = 0
+                        } else {
+                            params.parentId = parentId
+                        }
+                        addDept(params).then((response) => {
                             this.$modal.msgSuccess('新增成功')
                             this.open = false
                             this.getList()
@@ -431,7 +358,7 @@ export default {
         /** 删除按钮操作 */
         handleDelete(row) {
             this.$modal
-                .confirm('是否确认删除名称为"' + row.deptName + '"的数据项？')
+                .confirm('是否确认删除名称为' + row.deptName + '的数据项？')
                 .then(function () {
                     return delDept(row.deptId)
                 })