岗位管理国际化修改和部门角色管理字段错误修改

ruoyi-ui/src/lang/en.js

@@ -780,8 +780,8 @@ export default {
       MainTitle: 'MainTitle',
 
       //---函数：handleDelete---
-      txtDeleteConfirm1: 'Are you sure to delete the data item with menu name "',
+      textDeleteConfirm1: 'Are you sure to delete the data item with menu name "',
-      txtDeleteConfirm2: '"?',
+      textDeleteConfirm2: '"?',
 
     //--------------操作提示--------------
     addSuccessInfo: 'Add Success',
@@ -793,8 +793,71 @@ export default {
     checkOrderNumIsNull: 'OrderNum cannot be null',
     checkRouterPathIsNull: 'RouterPath cannot be null',
 
+  },
+
+
+  //=====================系统管理:部门管理=====================
+  systemManagement_DeptManagement: {
+    //--------------数据表标题--------------
+    deptName: 'DeptName',
+    orderNum: 'OrderNum',
+    status: 'Status',
+    createTime: 'CreateTime',
+    operation: 'Operation',
+
+    //--------------交互框操作提示--------------
+    placeholderDeptName: 'Enter DeptName',
+    placeholderStatus: 'Select ParentDept',
+
+      //--------------二级窗口标题--------------
+      addDeptItem: 'Add Department',
+      editDeptItem: 'Edit Department',
+    
+      parentDept: 'Parent Department',
+      setOrderNum: 'OrderNumber',
+      leader : 'Leader',
+      phoneNumber: 'PhoneNumber',
+      email: 'Email',
+
+      //--------------二级窗口操作提示--------------
+      placeholderParentDept: 'Select Parent Department',
+      placeholderLeader : 'Enter Leader',
+      placeholderPhoneNumber: 'Enter PhoneNumber',
+      placeholderEmail: 'Enter Email',
+
+    //--------------交互按钮--------------
+    btnSearch: 'Search',
+    btnReset: 'Reset',
+    btnAdd: 'Add',
+    btnEdit: 'Edit',
+    btnDelete: 'Delete',
+    btnImport: 'Import',
+    btnExport: 'Export',
+    btnSubmit: 'Submit',
+    btnCancel: 'Cancel',
+    btnExpandOrCollapse: 'Expand/Collapse',
+
+    //--------------提示文本--------------
+
+      //---handleDelete---
+      textDeleteConfirm1: 'Are you sure to delete the data item with menu name "',
+      textDeleteConfirm2: '"?',
+
+    //--------------操作提示--------------
+    addSuccessInfo: 'Add Success',
+    editSuccessInfo: 'Edit Success',
+    deleteSuccessInfo: 'Delete Success',
+
+    //--------------校验提示--------------
+    checkParentDeptIsNull: 'Parent Department cannot be null',
+    checkDeptNameIsNull: 'Department Name cannot be null',
+    checkOrderNumIsNull: 'Order Number cannot be null',
+    checkPhoneNumberFormat: 'Please enter a valid phone number',
+    checkEmailFormat: 'Please enter a valid email address',
 
   },
 
 
+
+
 }

ruoyi-ui/src/lang/zh.js

@@ -799,8 +799,63 @@ export default {
       MainTitle: '主类目',
 
       //---函数：handleDelete---
-      txtDeleteConfirm1: '是否确认删除菜单名称为"',
+      textDeleteConfirm1: '是否确认删除菜单名称为"',
-      txtDeleteConfirm2: '"的数据项？',
+      textDeleteConfirm2: '"的数据项？',
+
+    //--------------操作提示--------------
+    addSuccessInfo: '新增成功',
+    editSuccessInfo: '编辑成功',
+    deleteSuccessInfo: '删除成功',
+
+    //--------------校验提示--------------
+    checkMenuNameIsNull: '菜单名称不能为空',
+    checkOrderNumIsNull: '菜单顺序不能为空',
+    checkRouterPathIsNull: '路由地址不能为空',
+
+  },
+
+  //=====================系统管理:部门管理=====================
+  systemManagement_DeptManagement: {
+    //--------------数据表标题--------------
+    deptName: '部门名称',
+    orderNum: '排序',
+    status: '部门状态',
+    createTime: '创建时间',
+    operation: '操作',
+
+    //--------------交互框操作提示--------------
+    placeholderDeptName: '请输入部门名称',
+    placeholderStatus: '选择部门状态',
+
+      //--------------二级窗口标题--------------
+      addDeptItem: '添加部门',
+      editDeptItem: '添加部门',
+
+      parentDept: '上级部门',
+      setOrderNum: '显示排序',
+      leader : '负责人',
+      phoneNumber: '联系电话',
+      email: '邮箱',
+
+      //--------------二级窗口操作提示--------------
+      placeholderParentDept: '请选择上级部门',
+      placeholderLeader : '请输入负责人',
+      placeholderPhoneNumber: '请输入联系电话',
+      placeholderEmail: '请输入邮箱',
+
+    //--------------交互按钮--------------
+    btnSearch: '搜索',
+    btnReset: '重置',
+    btnAdd: '新增',
+    btnEdit: '修改',
+    btnDelete: '删除',
+    btnImport: '导入',
+    btnExport: '导出',
+    btnSubmit: '确定',
+    btnCancel: '取消',
+    btnExpandOrCollapse: '展开/折叠',
+
+    //--------------提示文本--------------
 
       //---handleDelete---
       textDeleteConfirm1: '是否确认删除用户编号为"',
@@ -812,9 +867,17 @@ export default {
     deleteSuccessInfo: '删除成功',
 
     //--------------校验提示--------------
-    checkMenuNameIsNull: '校验：菜单名称不能为空',
+    checkParentDeptIsNull: '上级部门不能为空',
-    checkOrderNumIsNull: '菜单顺序不能为空',
+    checkDeptNameIsNull: '部门名称不能为空',
-    checkRouterPathIsNull: '路由地址不能为空',
+    checkOrderNumIsNull: '显示排序不能为空',
+    checkPhoneNumberFormat: '请输入正确的邮箱地址',
+    checkEmailFormat: '请输入正确的手机号',
+
+  },
+
+  
+  //=====================系统管理:岗位管理=====================
+  systemManagement_PostManagement: {
 
   },
 

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

@@ -1,16 +1,18 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
-      <el-form-item label="部门名称" prop="deptName">
+      <!-- 部门名称 -->
+      <el-form-item :label="$t('systemManagement_DeptManagement.deptName')" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
+          :placeholder="$t('systemManagement_DeptManagement.placeholderDeptName')"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="status">
+      <!-- 部门状态 -->
-        <el-select v-model="queryParams.status" placeholder="部门状态" clearable>
+      <el-form-item :label="$t('systemManagement_DeptManagement.status')" prop="status">
+        <el-select v-model="queryParams.status" :placeholder="$t('systemManagement_DeptManagement.placeholderStatus')" clearable>
           <el-option
             v-for="dict in dict.type.sys_normal_disable"
             :key="dict.value"
@@ -20,13 +22,16 @@
         </el-select>
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <!-- 【查询】按钮 -->
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{ $t('systemManagement_DeptManagement.btnSearch') }}</el-button>
+        <!-- 【重置】按钮 -->
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ $t('systemManagement_DeptManagement.btnReset') }}</el-button>
       </el-form-item>
     </el-form>
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
+        <!-- 【新增】按钮 -->
         <el-button
           type="primary"
           plain
@@ -34,16 +39,17 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['system:dept:add']"
-        >新增</el-button>
+        >{{ $t('systemManagement_DeptManagement.btnAdd') }}</el-button>
       </el-col>
       <el-col :span="1.5">
+        <!-- 【展开/折叠】按钮 -->
         <el-button
           type="info"
           plain
           icon="el-icon-sort"
           size="mini"
           @click="toggleExpandAll"
-        >展开/折叠</el-button>
+        >{{ $t('systemManagement_DeptManagement.btnExpandOrCollapse') }}</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -56,34 +62,42 @@
       :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="deptName" :label="$t('systemManagement_DeptManagement.deptName')" width="260"></el-table-column>
-      <el-table-column prop="status" label="状态" width="100">
+      <!-- 排序 -->
+      <el-table-column prop="orderNum" :label="$t('systemManagement_DeptManagement.orderNum')" width="200"></el-table-column>
+      <!-- 部门状态 -->
+      <el-table-column prop="status" :label="$t('systemManagement_DeptManagement.status')" 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 :label="$t('systemManagement_DeptManagement.createTime')" align="center" prop="createTime" width="200">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- 操作 -->
+      <el-table-column :label="$t('systemManagement_DeptManagement.operation')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
+          <!-- 人工操作---【修改】按钮 -->
           <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['system:dept:edit']"
-          >修改</el-button>
+          >{{ $t('systemManagement_DeptManagement.btnEdit') }}</el-button>
+          <!-- 人工操作---【新增】按钮 -->
           <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
             v-hasPermi="['system:dept:add']"
-          >新增</el-button>
+          >{{ $t('systemManagement_DeptManagement.btnAdd') }}</el-button>
+          <!-- 人工操作---【删除】按钮 -->
           <el-button
             v-if="scope.row.parentId != 0"
             size="mini"
@@ -91,7 +105,7 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['system:dept:remove']"
-          >删除</el-button>
+          >{{ $t('systemManagement_DeptManagement.btnDelete') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -100,44 +114,51 @@
     <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-form-item label="上级部门" prop="parentId">
+            <el-form-item :label="$t('systemManagement_DeptManagement.parentDept')" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
+              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" :placeholder="$t('systemManagement_DeptManagement.placeholderParentDept')" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
+          <!-- 部门名称 -->
           <el-col :span="12">
-            <el-form-item label="部门名称" prop="deptName">
+            <el-form-item :label="$t('systemManagement_DeptManagement.deptName')" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入部门名称" />
+              <el-input v-model="form.deptName" :placeholder="$t('systemManagement_DeptManagement.placeholderDeptName')" />
             </el-form-item>
           </el-col>
+          <!-- 排序 -->
           <el-col :span="12">
-            <el-form-item label="显示排序" prop="orderNum">
+            <el-form-item :label="$t('systemManagement_DeptManagement.setOrderNum')" 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-form-item :label="$t('systemManagement_DeptManagement.leader')" prop="leader">
-              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
+              <el-input v-model="form.leader" :placeholder="$t('systemManagement_DeptManagement.placeholderLeader')" maxlength="20" />
             </el-form-item>
           </el-col>
+          <!-- 联系电话 -->
           <el-col :span="12">
-            <el-form-item label="联系电话" prop="phone">
+            <el-form-item :label="$t('systemManagement_DeptManagement.phoneNumber')" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
+              <el-input v-model="form.phone" :placeholder="$t('systemManagement_DeptManagement.placeholderPhoneNumber')" maxlength="11" />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
+          <!-- 邮箱 -->
           <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
+            <el-form-item :label="$t('systemManagement_DeptManagement.email')" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+              <el-input v-model="form.email" :placeholder="$t('systemManagement_DeptManagement.placeholderEmail')" maxlength="50" />
             </el-form-item>
           </el-col>
+          <!-- 部门状态 -->
           <el-col :span="12">
-            <el-form-item label="部门状态">
+            <el-form-item :label="$t('systemManagement_DeptManagement.status')">
               <el-radio-group v-model="form.status">
                 <el-radio
                   v-for="dict in dict.type.sys_normal_disable"
@@ -150,8 +171,10 @@
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <!-- 二级画面---【确定】按钮 -->
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" @click="submitForm">{{ $t('systemManagement_DeptManagement.btnSubmit') }}</el-button>
+        <!-- 二级画面---【取消】按钮 -->
+        <el-button @click="cancel">{{ $t('systemManagement_DeptManagement.btnCancel') }}</el-button>
       </div>
     </el-dialog>
   </div>
@@ -194,25 +217,30 @@ export default {
       // 表单校验
       rules: {
         parentId: [
-          { required: true, message: "上级部门不能为空", trigger: "blur" }
+          // 校验：上级部门不能为空
+          { required: true, message: this.$t('systemManagement_DeptManagement.checkParentDeptIsNull'), trigger: "blur" }
         ],
         deptName: [
-          { required: true, message: "部门名称不能为空", trigger: "blur" }
+          // 校验：部门名称不能为空
+          { required: true, message: this.$t('systemManagement_DeptManagement.checkDeptNameIsNull'), trigger: "blur" }
         ],
         orderNum: [
-          { required: true, message: "显示排序不能为空", trigger: "blur" }
+          // 校验：显示排序不能为空
+          { required: true, message: this.$t('systemManagement_DeptManagement.checkOrderNumIsNull'), trigger: "blur" }
         ],
         email: [
           {
             type: "email",
-            message: "请输入正确的邮箱地址",
+            // 校验：邮箱格式不正确
+            message: this.$t('systemManagement_DeptManagement.checkPhoneNumberFormat'),
             trigger: ["blur", "change"]
           }
         ],
         phone: [
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
+            // 校验：手机号码格式不正确
+            message: this.$t('systemManagement_DeptManagement.checkEmailFormat'),
             trigger: "blur"
           }
         ]
@@ -277,7 +305,8 @@ export default {
         this.form.parentId = row.deptId
       }
       this.open = true
-      this.title = "添加部门"
+      // 标题: 添加部门
+      this.title = this.$t('systemManagement_DeptManagement.addDeptItem')
       listDept().then(response => {
         this.deptOptions = this.handleTree(response.data, "deptId")
       })
@@ -296,7 +325,8 @@ export default {
       getDept(row.deptId).then(response => {
         this.form = response.data
         this.open = true
-        this.title = "修改部门"
+        // 标题: 修改部门
+        this.title = this.$t('systemManagement_DeptManagement.editDeptItem')
         listDeptExcludeChild(row.deptId).then(response => {
           this.deptOptions = this.handleTree(response.data, "deptId")
           if (this.deptOptions.length == 0) {
@@ -312,13 +342,15 @@ export default {
         if (valid) {
           if (this.form.deptId != undefined) {
             updateDept(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功")
+              // 提示：修改成功
+              this.$modal.msgSuccess($t('systemManagement_MenuManagement.editSuccessInfo'))
               this.open = false
               this.getList()
             })
           } else {
             addDept(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功")
+              // 提示：新增成功
+              this.$modal.msgSuccess($this.$t('systemManagement_MenuManagement.addSuccessInfo'))
               this.open = false
               this.getList()
             })
@@ -328,11 +360,13 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {
+      // 文本提示：是否确认删除名称为"xxx"的数据项？
+      this.$modal.confirm(this.$t('systemManagement_DeptManagement.textDeleteConfirm1') + row.deptName + this.$t('systemManagement_DeptManagement.textDeleteConfirm2')).then(function() {
         return delDept(row.deptId)
       }).then(() => {
         this.getList()
-        this.$modal.msgSuccess("删除成功")
+        // 提示：删除成功
+        this.$modal.msgSuccess(this.$t('systemManagement_DeptManagement.deleteSuccessInfo'))
       }).catch(() => {})
     }
   }

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

@@ -544,7 +544,8 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm(this.$t('systemManagement_MenuManagement.txtDeleteConfirm1') + row.menuName + this.$t('systemManagement_MenuManagement.txtDeleteConfirm2')).then(function() {
+      // 确认删除
+      this.$modal.confirm(this.$t('systemManagement_MenuManagement.textDeleteConfirm1') + row.menuName + this.$t('systemManagement_MenuManagement.textDeleteConfirm2')).then(function() {
         return delMenu(row.menuId)
       }).then(() => {
         this.getList()