v3.21.0 【新增】修改部门名称字段；【新增】修改系统版本version字段；【新增】优化代码生成前端代码；【优化】SQL

smart-admin-web-javascript/src/views/system/department/components/department-form-modal.vue

@@ -14,8 +14,8 @@
         <DepartmentTreeSelect ref="departmentTreeSelect" v-model:value="formState.parentId" :defaultValueFlag="false"
           width="100%" />
       </a-form-item>
-      <a-form-item label="部门名称" name="name">
-        <a-input v-model:value.trim="formState.name" placeholder="请输入部门名称" />
+      <a-form-item label="部门名称" name="departmentName">
+        <a-input v-model:value.trim="formState.departmentName" placeholder="请输入部门名称" />
       </a-form-item>
       <a-form-item label="部门负责人" name="managerId">
         <EmployeeSelect ref="employeeSelect" placeholder="请选择部门负责人" width="100%" v-model:value="formState.managerId"
@@ -76,7 +76,7 @@ const emits = defineEmits(['refresh']);
   const defaultDepartmentForm = {
     id: undefined,
     managerId: undefined, //部门负责人
-    name: undefined,
+    departmentName: undefined,
     parentId: undefined,
     sort: 0,
   };
@@ -88,7 +88,7 @@ let formState = reactive({
 // 表单校验规则
 const rules = {
   parentId: [{ required: true, message: '上级部门不能为空' }],
-  name: [
+  departmentName: [
     { required: true, message: '部门名称不能为空' },
     { max: 50, message: '部门名称不能大于20个字符', trigger: 'blur' },
   ],

smart-admin-web-javascript/src/views/system/department/department-list.vue

@@ -95,8 +95,8 @@
   const columns = ref([
     {
       title: '部门名称',
-      dataIndex: 'name',
-      key: 'name',
+      dataIndex: 'departmentName',
+      key: 'departmentName',
     },
     {
       title: '负责人',
@@ -189,7 +189,7 @@
       return;
     }
     // 筛选出名称符合的部门
-    let filterDepartment = originData.filter((e) => e.name.indexOf(keywords.value) > -1);
+    let filterDepartment = originData.filter((e) => e.departmentName.indexOf(keywords.value) > -1);
     let filterDepartmentList = [];
     // 循环筛选出的部门 构建部门树
     filterDepartment.forEach((e) => {
@@ -220,7 +220,7 @@
   function addDepartment(e) {
     let data = {
       departmentId: 0,
-      name: '',
+      departmentName: '',
       parentId: e.departmentId || null,
     };
     departmentFormModal.value.showModal(data);

smart-admin-web-javascript/src/views/system/employee/components/department-children/index.vue

@@ -19,7 +19,7 @@
       <template #renderItem="{ item }">
         <a-list-item>
           <div class="department-item" @click="selectTree(item.departmentId)">
-            {{ item.name }}
+            {{ item.departmentName }}
             <RightOutlined />
           </div>
         </a-list-item>

smart-admin-web-javascript/src/views/system/employee/components/department-tree/index.vue

@@ -18,7 +18,7 @@
       v-model:checkedKeys="checkedKeys"
       class="tree"
       :treeData="departmentTreeData"
-      :fieldNames="{ title: 'name', key: 'departmentId', value: 'departmentId' }"
+      :fieldNames="{ title: 'departmentName', key: 'departmentId', value: 'departmentId' }"
       style="width: 100%; overflow-x: auto"
       :style="[!height ? '' : { height: `${height}px`, overflowY: 'auto' }]"
       :checkable="props.checkable"
@@ -28,7 +28,7 @@
       @select="treeSelectChange"
     >
       <template #title="item">
-        <div>{{ item.name }}</div>
+        <div>{{ item.departmentName }}</div>
       </template>
     </a-tree>
     <div class="no-data" v-else>暂无结果</div>
@@ -158,7 +158,7 @@
     selectedDepartmentChildren.value = departmentList.value.filter((e) => e.parentId == id);
     let filterDepartmentList = [];
     recursionFilterDepartment(filterDepartmentList, id, true);
-    breadcrumb.value = filterDepartmentList.map((e) => e.name);
+    breadcrumb.value = filterDepartmentList.map((e) => e.departmentName);
   }
 
   // -----------------------  筛选 ---------------------
@@ -181,7 +181,7 @@
       return;
     }
     // 筛选出名称符合的部门
-    let filterDepartment = originData.filter((e) => e.name.indexOf(keywords.value) > -1);
+    let filterDepartment = originData.filter((e) => e.departmentName.indexOf(keywords.value) > -1);
     let filterDepartmentList = [];
     // 循环筛选出的部门 构建部门树
     filterDepartment.forEach((e) => {