Merge branch 'lang_dev_jw' into lang_dev

src/components/searchDistPicker.vue

@@ -3,7 +3,7 @@
     <div class="select-dist-picker">
         <!-- 省选择器 -->
         <el-select
-            placeholder="请选择省"
+            :placeholder="$t('SystemManage.DepartManage.user_add_placeholder10')"
             filterable
             v-model="province"
             value-key="provinceKey"
@@ -19,7 +19,7 @@
         </el-select>
         <!-- 市选择器 -->
         <el-select
-            placeholder="请选择市"
+            :placeholder="$t('SystemManage.DepartManage.user_add_placeholder11')"
             filterable
             v-model="city"
             value-key="cityKey"

src/lang/modules/systemManage/DataAuth.js

@@ -13,7 +13,8 @@ export const DataAuthEn = {
     add_category:'Add Category',
     edit_category:'Edit Category',
     parent_classify:'Parent Category',
-    classify_name:'Category Name'
+    classify_name:'Category Name',
+    placehloder_msg03:'First level classification cannot be empty',
 };
   
 /* 中文 */
@@ -27,7 +28,8 @@ export const DataAuthZh = {
     add_category:'添加分类',
     edit_category:'编辑分类',
     parent_classify:'上级分类',
-    classify_name:'分类名称'
+    classify_name:'分类名称',
+    placehloder_msg03:'一级分类不能为空',
 };
   
 /**

src/lang/modules/systemManage/DepartManage.js

@@ -79,6 +79,9 @@ export const DepartManageEn = {
     confirm_pwd:'Confirm Password',
 
     del_msg:'Are you sure you want to delete user',
+
+    user_add_placeholder10:'Please select the province',
+    user_add_placeholder11:'Please select the city'
 };
   
 /* 中文 */
@@ -162,6 +165,9 @@ export const DepartManageZh = {
 
     del_msg:'是否确认删除用户',
 
+    user_add_placeholder10:'请选择省',
+    user_add_placeholder11:'请选择市'
+
 };
   
 /**

src/lang/modules/systemManage/OperateAuth.js

@@ -35,7 +35,8 @@ export const OperateAuthEn = {
     permission_title02:'批量权限设置',
     invisible_users:'Invisible Users',
     permission_confirm_msg:"Are you sure you want to delete the user's invisible permission?",
-    set_success:'Setting Successful'
+    set_success:'Setting Successful',
+    placeholder05:'New creator cannot be empty',
 };
   
 /* 中文 */
@@ -71,7 +72,9 @@ export const OperateAuthZh = {
     permission_title02:'批量权限设置',
     invisible_users:'不可见用户',
     permission_confirm_msg:'是否确认删除该用户的不可见权限?',
-    set_success:'配置成功'
+    set_success:'配置成功',
+    placeholder05:'新创建人不能为空',
+
 };
   
 /**

src/views/system_manage/components/authDialog.vue

@@ -79,10 +79,10 @@ export default {
 		return {
 			formRules: {
 				classify:[
-					{ required: true, message: '一级分类不能为空', trigger: 'blur' },
+					{ required: true, message: this.$t('SystemManage.DataAuth.placehloder_msg03')||'一级分类不能为空', trigger: 'blur' },
 				],
 				nodeName:[
-					{ required: true, message: '分类名称不能为空', trigger: 'blur' },
+					{ required: true, message: this.$t('StatisticAnalysis.ChartRelevance.classify_name_tips')||'分类名称不能为空', trigger: 'blur' },
 				],
 			},
 			classifyArr:[],

src/views/system_manage/enAuthManage.vue

@@ -336,7 +336,7 @@ export default {
         AdminIds: adminArr.join(","),
       });
       if (res.Ret === 200) {
-        this.$message.success("配置成功");
+        this.$message.success(this.$t('MsgPrompt.set_success_msg')||"配置成功");
         this.page_no = 1;
         this.getTableData();
       }

src/views/system_manage/operateAuthManage.vue

@@ -258,7 +258,7 @@ export default {
       },
       dialogFormRules: {
         new_user: [
-          { required: true, message: '新创建人不能为空', trigger: 'change' }
+          { required: true, message: this.$t('SystemManage.OperateAuth.placeholder05'), trigger: 'change' }
         ]
       },