Merge remote-tracking branch 'origin/master'

fuliqi

2025-02-19 04c2dff687369d6e427af76431d1b7607d7182b7

Merge remote-tracking branch 'origin/master'

 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: []
            });
          }
        });
      });
    },