123

ruoyi-ui/src/api/system/dept.js

@@ -58,4 +58,17 @@ export function delDept(deptId) {
     url: '/system/dept/' + deptId,
     method: 'delete'
   })
+}
+
+/**
+ * 校验部门名称是否唯一
+ * @param {Object} query deptName、parentId、deptId（编辑时传自身 id）
+ * @returns {Promise} data 为 true 表示唯一，false 表示重复
+ */
+export function checkDeptNameUnique(query) {
+  return request({
+    url: '/system/dept/checkDeptNameUnique',
+    method: 'get',
+    params: query
+  })
 }

ruoyi-ui/src/views/system/dept/index.vue

@@ -116,7 +116,13 @@
         <el-row>
           <el-col :span="24" v-if="form.parentId !== 0">
             <el-form-item label="上级部门" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
+              <treeselect
+                v-model="form.parentId"
+                :options="deptOptions"
+                :normalizer="normalizer"
+                placeholder="选择上级部门"
+                @input="onParentIdChange"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -172,7 +178,7 @@
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, updateDeptSort, listDeptExcludeChild } from "@/api/system/dept"
+import { listDept, getDept, delDept, addDept, updateDept, updateDeptSort, listDeptExcludeChild, checkDeptNameUnique } from "@/api/system/dept"
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"
 
@@ -213,7 +219,8 @@ export default {
           { required: true, message: "上级部门不能为空", trigger: "blur" }
         ],
         deptName: [
-          { required: true, message: "部门名称不能为空", trigger: "blur" }
+          { required: true, message: "部门名称不能为空", trigger: "blur" },
+          { validator: null, trigger: "blur" }
         ],
         orderNum: [
           { required: true, message: "显示排序不能为空", trigger: "blur" }
@@ -236,9 +243,49 @@ export default {
     }
   },
   created() {
+    this.rules.deptName[1].validator = this.validateDeptNameUnique
     this.getList()
   },
   methods: {
+    /** 上级部门变更后，重新校验部门名称唯一性 */
+    onParentIdChange() {
+      if (this.form.deptName) {
+        this.$nextTick(() => {
+          if (this.$refs.form) {
+            this.$refs.form.validateField("deptName")
+          }
+        })
+      }
+    },
+    /**
+     * 调用 /system/dept/checkDeptNameUnique
+     * data === true 唯一；false 同名已存在（编辑时排除自身 deptId）
+     */
+    validateDeptNameUnique(rule, value, callback) {
+      const name = value != null ? String(value).trim() : ""
+      if (!name) {
+        callback()
+        return
+      }
+      const params = {
+        deptName: name,
+        parentId: this.form.parentId
+      }
+      if (this.form.deptId != null && this.form.deptId !== "") {
+        params.deptId = this.form.deptId
+      }
+      checkDeptNameUnique(params)
+        .then((res) => {
+          if (res.data === true || res.data === "true") {
+            callback()
+          } else {
+            callback(new Error("部门名称已存在"))
+          }
+        })
+        .catch(() => {
+          callback(new Error("部门名称校验失败，请稍后重试"))
+        })
+    },
     /** 查询部门列表 */
     getList() {
       this.loading = true

ruoyi-ui/src/views/system/user/index.vue

@@ -52,7 +52,7 @@
             </template>
           </el-table-column>
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" />
-          <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
+          <el-table-column label="所属乡镇村" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
           <el-table-column label="状态" align="center" key="status" v-if="columns.status.visible">
             <template slot-scope="scope">
@@ -83,8 +83,8 @@
     </div>
 
     <!-- 添加或修改用户配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-dialog :title="title" :visible.sync="open" width="650px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px">
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickName">
@@ -92,7 +92,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="归属部门" prop="deptId">
+            <el-form-item label="所属乡镇村" prop="deptId">
               <treeselect v-model="form.deptId" :options="enabledDeptOptions" :show-count="true" placeholder="请选择归属部门" />
             </el-form-item>
           </el-col>