fix: [系统管理] 系统管理下的双语修改

src/lang/en/system/user.js

@@ -2,6 +2,7 @@ export default {
   userName: 'User',
   name: 'Name',
   phone: 'Phone',
+  email: 'Email',
   department: 'Department',
   role: 'Owned Role',
   status: 'Status',
@@ -16,7 +17,5 @@ export default {
   history: 'Role History',
 
   addUser: 'Create',
-  modifyUser: 'Edit',
-  notEmpty: ' Can Not Be Empty',
-  phoneError: 'Please Enter A Correct Phone Number'
+  modifyUser: 'Edit'
 }

src/lang/zh/system/user.js

@@ -2,6 +2,7 @@ export default {
   userName: '账号',
   name: '姓名',
   phone: '手机',
+  email: '邮箱',
   department: '所属部门/学科',
   role: '所属角色',
   status: '状态',

src/views/system/dept/index.vue

@@ -74,7 +74,7 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
+      <el-table-column :label="$t('form.operate')" align="center" class-name="small-padding fixed-width" width="200">
         <template slot-scope="scope">
           <el-button
            
@@ -212,13 +212,13 @@ export default {
       // 表单校验
       rules: {
         parentId: [
-          { required: true, message: this.$t('page.system.dept.parent')+ this.$t('page.system.dept.notEmpty'), trigger: "change" }
+          { required: true, message: this.$t('form.placeholderSelect'), trigger: "change" }
         ],
         deptName: [
-          { required: true, message: this.$t('page.system.dept.name')+ this.$t('page.system.dept.notEmpty'), trigger: "blur" }
+          { required: true, message: this.$t('form.placeholderInput'), trigger: "blur" }
         ],
         type: [
-          { required: true, message: this.$t('page.system.dept.type')+ this.$t('page.system.dept.notEmpty'), trigger: "change" }
+          { required: true, message: this.$t('form.placeholderSelect'), trigger: "change" }
         ],
         // orderNum: [
         //   { required: true, message: "显示排序不能为空", trigger: "blur" }

src/views/system/role/index.vue

@@ -389,13 +389,13 @@ export default {
       // 表单校验
       rules: {
         roleName: [
-          { required: true, message: this.$t('page.system.role.name')+this.$t('page.system.role.notEmpty'), trigger: "blur" }
+          { required: true, message: this.$t('form.placeholderInput'), trigger: "blur" }
         ],
         roleKey: [
-          { required: true, message: this.$t('page.system.role.key')+this.$t('page.system.role.notEmpty'), trigger: "blur" }
+          { required: true, message: this.$t('form.placeholderInput'), trigger: "blur" }
         ],
         status: [
-          { required: true, message: this.$t('page.system.role.status')+this.$t('page.system.role.notEmpty'), trigger: "change" }
+          { required: true, message: this.$t('form.placeholderSelect'), trigger: "change" }
         ],
       },
 

src/views/system/user/index.vue

@@ -18,14 +18,14 @@
           <el-col>
             <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
               <el-form-item :label="$t('page.system.user.userName')+'：'" prop="userName">
-                <el-input v-model="queryParams.userName" :placeholder="$t('form.placeholderInput')" clearable style="width: 100px" @keyup.enter.native="handleQuery" />
+                <el-input v-model="queryParams.userName" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="handleQuery" />
               </el-form-item>
               <el-form-item :label="$t('page.system.user.name')+'：'" prop="nickName">
-                <el-input v-model="queryParams.nickName" :placeholder="$t('form.placeholderInput')" clearable style="width: 100px" @keyup.enter.native="handleQuery" />
+                <el-input v-model="queryParams.nickName" :placeholder="$t('form.placeholderInput')" clearable style="width: 150px" @keyup.enter.native="handleQuery" />
               </el-form-item>
-              <el-form-item :label="$t('page.system.user.phone')+'：'" prop="phonenumber">
+              <!-- <el-form-item :label="$t('page.system.user.phone')+'：'" prop="phonenumber">
                 <el-input v-model="queryParams.phonenumber" :placeholder="$t('form.placeholderInput')" clearable style="width: 100px" @keyup.enter.native="handleQuery" />
-              </el-form-item>
+              </el-form-item> -->
               <el-form-item :label="$t('page.system.user.department')+'：'" prop="deptId">
                 <treeselect v-model="queryParams.deptId" :options="enabledDeptOptions" :show-count="true" :placeholder="$t('form.placeholderSelect')" style="width: 200px" />
               </el-form-item>
@@ -34,7 +34,7 @@
                   v-model="queryParams.status"
                   :placeholder="$t('form.placeholderSelect')"
                   clearable
-                  style="width: 100px"
+                  style="width: 150px"
                 >
                   <el-option key="0" :label="$t('page.system.user.statusEnable')" value="0" />
                   <el-option key="1" :label="$t('page.system.user.statusDisable')" value="1" />
@@ -73,14 +73,15 @@
               <!-- <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns.userId.visible" /> -->
               <el-table-column :label="$t('page.system.user.userName')" align="center" key="userName" prop="userName" v-if="columns.userName.visible" :show-overflow-tooltip="true" width="150" />
               <el-table-column :label="$t('page.system.user.name')" align="center" key="nickName" prop="nickName" v-if="columns.nickName.visible" :show-overflow-tooltip="true" width="150" />
-              <el-table-column :label="$t('page.system.user.phone')" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" />
+              <el-table-column :label="$t('page.system.user.email')" align="center" key="email" prop="email" v-if="columns.phonenumber.visible" width="120" />
+              <!-- <el-table-column :label="$t('page.system.user.phone')" align="center" key="phonenumber" prop="phonenumber" v-if="columns.phonenumber.visible" width="120" /> -->
               <el-table-column :label="$t('page.system.user.department')" align="center" key="deptName" prop="dept.deptName" v-if="columns.deptName.visible" :show-overflow-tooltip="true" width="150" />
               <el-table-column :label="$t('page.system.user.role')" align="center" key="roleName" prop="role.roleName" v-if="columns.deptName.visible" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
                   {{getRoleName(scope.row)}}
                 </template>
               </el-table-column>
-              <el-table-column label="状态" align="center" key="status" v-if="columns.status.visible" width="100">
+              <el-table-column :label="$t('page.system.user.status')" align="center" key="status" v-if="columns.status.visible" width="100">
                 <template slot-scope="scope">
                   <span v-if="scope.row.status==='0'">{{$t('page.system.user.statusEnable')}}</span>
                   <span v-if="scope.row.status==='1'">{{$t('page.system.user.statusDisable')}}</span>
@@ -154,10 +155,15 @@
               <el-input v-model="form.nickName" :placeholder="$t('form.placeholderInput')" maxlength="30" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
+          <!-- <el-col :span="24">
             <el-form-item :label="$t('page.system.user.phone')+'：'" prop="phonenumber">
               <el-input v-model="form.phonenumber" :placeholder="$t('form.placeholderInput')" maxlength="11" />
             </el-form-item>
+          </el-col> -->
+          <el-col :span="24">
+            <el-form-item :label="$t('page.system.user.email')+'：'" prop="email">
+              <el-input v-model="form.email" :placeholder="$t('form.placeholderInput')" maxlength="50" />
+            </el-form-item>
           </el-col>
           <el-col :span="24">
             <el-form-item :label="$t('page.system.user.department')+'：'" prop="deptId">
@@ -347,11 +353,11 @@ export default {
       // 表单校验
       rules: {
         userName: [
-          { required: true, message: this.$t('page.system.user.userName')+ this.$t('page.system.user.notEmpty'), trigger: "blur" },
+          { required: true, message: this.$t('form.placeholderInput'), trigger: "blur" },
           // { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
         nickName: [
-          { required: true, message: this.$t('page.system.user.name')+ this.$t('page.system.user.notEmpty'), trigger: "blur" }
+          { required: true, message: this.$t('form.placeholderInput'), trigger: "blur" }
         ],
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
@@ -359,29 +365,30 @@ export default {
           { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
         ],
         deptId: [
-          { required: true, message: this.$t('page.system.user.department')+ this.$t('page.system.user.notEmpty'), trigger: "change" }
+          { required: true, message: this.$t('form.placeholderSelect'), trigger: "change" }
         ],
         roleIds: [
-          { required: true, message: this.$t('page.system.user.role')+ this.$t('page.system.user.notEmpty'), trigger: "change" }
+          { required: true, message: this.$t('form.placeholderSelect'), trigger: "change" }
         ],
         status: [
-          { required: true, message: this.$t('page.system.user.status')+ this.$t('page.system.user.notEmpty'), trigger: "change" }
+          { required: true, message: this.$t('form.placeholderSelect'), trigger: "change" }
         ],
-        // email: [
-        //   {
-        //     type: "email",
-        //     message: "请输入正确的邮箱地址",
-        //     trigger: ["blur", "change"]
-        //   }
-        // ],
-        phonenumber: [
-          { required: true, message: this.$t('page.system.user.phone')+ this.$t('page.system.user.notEmpty'), trigger: "blur" },
+        email: [
+          { required: true, message: this.$t('form.placeholderInput'), trigger: "blur" },
           {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: this.$t('page.system.user.phoneError'),
-            trigger: "blur"
+            type: "email",
+            message: this.$t('form.placeholderInput'),
+            trigger: ["blur", "change"]
           }
-        ]
+        ],
+        // phonenumber: [
+        //   { required: true, message: this.$t('form.placeholderInput'), trigger: "blur" },
+        //   {
+        //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        //     message: this.$t('page.system.user.phoneError'),
+        //     trigger: "blur"
+        //   }
+        // ]
       }
     }
   },
@@ -394,9 +401,9 @@ export default {
   created() {
     this.getList()
     this.getDeptTree()
-    this.getConfigKey("sys.user.initPassword").then(response => {
-      this.initPassword = response.msg
-    })
+    // this.getConfigKey("sys.user.initPassword").then(response => {
+    //   this.initPassword = response.msg
+    // })
   },
   methods: {
     /** 查询用户列表 */