From 04c2dff687369d6e427af76431d1b7607d7182b7 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 19 二月 2025 15:34:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/system/dept/index.vue |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index e502b4e..efaa417 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -100,7 +100,7 @@
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="24" v-if="form.parentId !== 0">
+          <el-col :span="24">
             <el-form-item label="涓婄骇閮ㄩ棬" prop="parentId">
               <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="閫夋嫨涓婄骇閮ㄩ棬" />
             </el-form-item>
@@ -193,9 +193,9 @@
       form: {},
       // 琛ㄥ崟鏍¢獙
       rules: {
-        parentId: [
-          { required: true, message: "涓婄骇閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }
-        ],
+        // parentId: [
+        //   { required: true, message: "涓婄骇閮ㄩ棬涓嶈兘涓虹┖", trigger: "blur" }
+        // ],
         deptName: [
           { required: true, message: "閮ㄩ棬鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
         ],
@@ -303,6 +303,13 @@
             const noResultsOptions = { deptId: this.form.parentId, deptName: this.form.parentName, children: [] };
             this.deptOptions.push(noResultsOptions);
           }
+          if (row.parentId === 0) {
+            this.deptOptions.push({
+              deptId: 0,
+              deptName: '鏃�',
+              children: []
+            });
+          }
         });
       });
     },

--
Gitblit v1.8.0