kz-ui-base 1.0.153 → 1.0.155

package/common/src/views/login.vue

@@ -175,7 +175,12 @@ export default {
   created() {
     this.$store.dispatch("LogOut").then(() => {
       this.$store.dispatch("tagsView/delAllViews");
+        // 清空localStorage但保留语言设置
+        const locale = localStorage.getItem("locale");
         localStorage.clear();
+        if (locale) {
+          localStorage.setItem("locale", locale);
+        }
         localforage.clear();
         removeToken();
         let enterpriseName = Cookies.get("enterpriseName");

package/common/src/views/tenantLogin.vue

@@ -174,7 +174,12 @@ export default {
   created() {
     this.$store.dispatch("LogOut").then(() => {
       this.$store.dispatch("tagsView/delAllViews");
+        // 清空localStorage但保留语言设置
+        const locale = localStorage.getItem("locale");
         localStorage.clear();
+        if (locale) {
+          localStorage.setItem("locale", locale);
+        }
         localforage.clear();
         removeToken();
         this.axios.get("/config.json").then((res) => {

package/list-base-page/listBasePageTs.vue

@@ -132,10 +132,10 @@
                 icon="el-icon-search"
                 size="mini"
                 @click="handleQuery"
-                >{{ this.t('common.search') }}</el-button
+                >{{ t('common.search') }}</el-button
               >
               <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
-                >{{ this.t('common.reset') }}</el-button
+                >{{ t('common.reset') }}</el-button
               >
               <AdvancedQuery
                 style="margin-left: 10px"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kz-ui-base",
-  "version": "1.0.153",
+  "version": "1.0.155",
   "description": "",
   "main": "index.js",
   "scripts": {

package/views/bd/common/modal/CustomerModal.vue

@@ -13,46 +13,9 @@ export default class CustomerList extends ListBasePage {
   //表格是否自动加载数据
   isAutoLoad = false;
   // 列表列信息
-  listColumns = [
-    //{key: 0, label: "序号", visible: true},
-    { text: "客户编号", property: "customerNo", width: 100 },
-    { text: "客户名称", property: "customerName", width: 260 },
-    { text: "客户简称", property: "customerAbbr", width: 200 },
-    { text: "国家", property: "countryCode" },
-    { text: "地区", property: "areaCode" },
-    { text: "省份", property: "provinceCode" },
-    { text: "城市", property: "cityCode" },
-    { text: "电话", property: "telNo", width: 120 },
-    { text: "传真", property: "faxNo", width: 120 },
-    { text: "邮编", property: "postalNo" },
-    { text: "地址", property: "address", width: 220 },
-    { text: "纳税登记号", property: "taxRegistrationNo", width: 160 },
-    { text: "注册资本", property: "registeredCapital", width: 100 },
-    { text: "公司类别", property: "companyCategoryCode" },
-    { text: "公司性质", property: "companyNatureCode" },
-    { text: "公司规模", property: "companySizeCode" },
-    { text: "客户行业ID", property: "customerIndustryId" },
-    { text: "客户区域ID", property: "customerAreaId" },
-    { text: "经营状况", property: "businessStatus" },
-    { text: "客户等级", property: "customerGradeCode" },
-    { text: "销售类型", property: "salesTypeCode" },
-    { text: "纳税分类", property: "taxClassCode" },
-    { text: "发票类型", property: "invoiceTypeCode" },
-    { text: "税率类型", property: "taxrateTypeCode" },
-  ];
+  listColumns = [];
   // 查询条件
-  searchRules = [
-    { text: "客户编号", op: "LI", property: "customerNo", displayType: "TextBox" },
-    { text: "客户名称", op: "LI", property: "customerName", displayType: "TextBox",principal:true, },
-    { text: "负责销售组织", op: "EQ", property: "salesSiteId", displayType: "DropDownList", disabled: false, setting: {
-        url: "/fd/fd/getUserSitesByParam",
-        //指定显示字段和取值字段
-        displayField: "componentName",
-        valueField: "id",
-        parameter: { isSales: 1 },
-      }
-    },
-  ];
+  searchRules = [];
   isMultiple = true;
   listSetting = {
     //获取列表数据的api方法名
@@ -64,18 +27,57 @@ export default class CustomerList extends ListBasePage {
     isShowIndexColumn: true,  // 显示行号
     multipleChoice: false,
   };
-  opMenus = [
-  ];
+  opMenus = [];
   // 表单校验
-  editRules = {
-    customerNo: [
-      { required: true, message: "客户编号不能为空", trigger: "blur" }
-    ],
-    customerName: [
-      { required: true, message: "客户名称不能为空", trigger: "blur" }
-    ]
-  };
+  editRules = {};
   created(){
+    this.listColumns = [
+      //{key: 0, label: "序号", visible: true},
+      { text: this.t('customerModal.customerNo'), property: "customerNo", width: 100 },
+      { text: this.t('customerModal.customerName'), property: "customerName", width: 260 },
+      { text: this.t('customerModal.customerAbbr'), property: "customerAbbr", width: 200 },
+      { text: this.t('customerModal.countryCode'), property: "countryCode" },
+      { text: this.t('customerModal.areaCode'), property: "areaCode" },
+      { text: this.t('customerModal.provinceCode'), property: "provinceCode" },
+      { text: this.t('customerModal.cityCode'), property: "cityCode" },
+      { text: this.t('customerModal.telNo'), property: "telNo", width: 120 },
+      { text: this.t('customerModal.faxNo'), property: "faxNo", width: 120 },
+      { text: this.t('customerModal.postalNo'), property: "postalNo" },
+      { text: this.t('customerModal.address'), property: "address", width: 220 },
+      { text: this.t('customerModal.taxRegistrationNo'), property: "taxRegistrationNo", width: 160 },
+      { text: this.t('customerModal.registeredCapital'), property: "registeredCapital", width: 100 },
+      { text: this.t('customerModal.companyCategoryCode'), property: "companyCategoryCode" },
+      { text: this.t('customerModal.companyNatureCode'), property: "companyNatureCode" },
+      { text: this.t('customerModal.companySizeCode'), property: "companySizeCode" },
+      { text: this.t('customerModal.customerIndustryId'), property: "customerIndustryId" },
+      { text: this.t('customerModal.customerAreaId'), property: "customerAreaId" },
+      { text: this.t('customerModal.businessStatus'), property: "businessStatus" },
+      { text: this.t('customerModal.customerGradeCode'), property: "customerGradeCode" },
+      { text: this.t('customerModal.salesTypeCode'), property: "salesTypeCode" },
+      { text: this.t('customerModal.taxClassCode'), property: "taxClassCode" },
+      { text: this.t('customerModal.invoiceTypeCode'), property: "invoiceTypeCode" },
+      { text: this.t('customerModal.taxrateTypeCode'), property: "taxrateTypeCode" },
+    ];
+    this.searchRules = [
+      { text: this.t('customerModal.customerNo'), op: "LI", property: "customerNo", displayType: "TextBox" },
+      { text: this.t('customerModal.customerName'), op: "LI", property: "customerName", displayType: "TextBox",principal:true, },
+      { text: this.t('customerModal.salesSiteId'), op: "EQ", property: "salesSiteId", displayType: "DropDownList", disabled: false, setting: {
+          url: "/fd/fd/getUserSitesByParam",
+          //指定显示字段和取值字段
+          displayField: "componentName",
+          valueField: "id",
+          parameter: { isSales: 1 },
+        }
+      },
+    ];
+    this.editRules = {
+      customerNo: [
+        { required: true, message: this.t('customerModal.required.customerNo'), trigger: "blur" }
+      ],
+      customerName: [
+        { required: true, message: this.t('customerModal.required.customerName'), trigger: "blur" }
+      ]
+    };
     if(this.setting?.data?.isMultipleStatus!=undefined){
       this.isMultiple = this.setting.data.isMultipleStatus
     }

package/views/bd/common/modal/DeptModal.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="wrapper-container" v-show="showSearch">
       <el-form :model="queryParams" ref="queryForm" :inline="true">
-        <el-form-item label="业务组织" prop="siteId" required>
+        <el-form-item :label="t('deptModal.siteId')" prop="siteId" required>
           <entity-select
             v-model="queryParams.siteId"
             clearable
@@ -16,20 +16,20 @@
           ></entity-select>
         </el-form-item>
 
-        <el-form-item label="部门编码" prop="deptCode">
+        <el-form-item :label="t('deptModal.deptCode')" prop="deptCode">
           <el-input
             v-model="queryParams.deptCode"
-            placeholder="请输入部门编码"
+            :placeholder="t('deptModal.placeholder.deptCode')"
             clearable
             size="small"
             @keyup.native="filterData"
             @clear="filterData"
           />
         </el-form-item>
-        <el-form-item label="部门名称" prop="deptName">
+        <el-form-item :label="t('deptModal.deptName')" prop="deptName">
           <el-input
             v-model="queryParams.deptName"
-            placeholder="请输入部门名称"
+            :placeholder="t('deptModal.placeholder.deptName')"
             clearable
             size="small"
             @keyup.native="filterData"
@@ -50,13 +50,13 @@
         @current-change="handleCurrentChange"
         :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
         <el-table-column type="index" width="50" />
-        <el-table-column prop="label" label="部门名称" min-width="120"/>
-        <el-table-column prop="code" label="部门编码" min-width="120"/>
+        <el-table-column prop="label" :label="t('deptModal.deptName')" min-width="120"/>
+        <el-table-column prop="code" :label="t('deptModal.deptCode')" min-width="120"/>
       </el-table>
       <div class="table-container-supplement"/>
       <div slot="footer" class="dialog-footer">
-        <el-button type="primary" :loading="submitLoading" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
+        <el-button type="primary" :loading="submitLoading" @click="submitForm">{{ t('deptModal.confirm') }}</el-button>
+        <el-button @click="cancel">{{ t('deptModal.cancel') }}</el-button>
       </div>
     </div>
   </div>
@@ -118,7 +118,7 @@ export default class DeptModal extends Vue {
     let deptId = site.relatedDeptId;
     this.relatedSiteId = siteId
     if(!deptId){
-      this.msgError("业务组织未关联部门");
+      this.msgError(this.t('deptModal.siteNotRelatedDept'));
       this.loading = false;
       return;
     }

package/views/bd/common/modal/EmployeeModal.vue

@@ -2,7 +2,7 @@
   <base-dialog
     :visible.sync="visible"
     width="960px"
-    title="人员选择"
+    :title="t('employeeModal.title')"
     append-to-body
     @on-confirm="handleConfirm"
     @on-cancel="handleCancel"
@@ -18,8 +18,8 @@
       >
         <el-row class="mb8">
           <el-col :span="8">
-            <el-form-item label="业务组织" prop="siteId">
-              <el-select v-model="listQueryParams.siteId" placeholder="请选择" @change="siteChangeEvent" :disabled="siteDisabled">
+            <el-form-item :label="t('employeeModal.siteId')" prop="siteId">
+              <el-select v-model="listQueryParams.siteId" :placeholder="t('employeeModal.placeholder.siteId')" @change="siteChangeEvent" :disabled="siteDisabled">
                 <el-option
                   v-for="item in siteOptions"
                   :key="item.id"
@@ -31,7 +31,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="部门名称" prop="deptId">
+            <el-form-item :label="t('employeeModal.deptId')" prop="deptId">
               <el-cascader
                 v-model="listQueryParams.deptId"
                 :options="deptOptions"
@@ -45,8 +45,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="岗位名称" prop="postId">
-              <el-select v-model="listQueryParams.postId" placeholder="请选择" clearable>
+            <el-form-item :label="t('employeeModal.postId')" prop="postId">
+              <el-select v-model="listQueryParams.postId" :placeholder="t('employeeModal.placeholder.postId')" clearable>
                 <el-option
                   v-for="item in postOptions"
                   :key="item.postId"
@@ -60,12 +60,12 @@
         </el-row>
         <el-row class="mb8">
           <el-col :span="8">
-            <el-form-item label="员工编号" prop="employeeNo">
+            <el-form-item :label="t('employeeModal.employeeNo')" prop="employeeNo">
               <el-input v-model="listQueryParams.employeeNo" clearable/>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="员工名称" prop="employeeName">
+            <el-form-item :label="t('employeeModal.employeeName')" prop="employeeName">
               <el-input v-model="listQueryParams.employeeName" clearable/>
             </el-form-item>
           </el-col>
@@ -76,13 +76,13 @@
                 icon="el-icon-search"
                 size="mini"
                 @click="handleQuery"
-              >查询
+              >{{ t('employeeModal.search') }}
               </el-button>
               <el-button
                 icon="el-icon-refresh"
                 size="mini"
                 @click="resetQuery"
-              >重置
+              >{{ t('employeeModal.reset') }}
               </el-button>
             </el-form-item>
           </el-col>
@@ -103,10 +103,10 @@
         @selection-change="onSelectionChange"
       >
         <el-table-column type="selection" min-width="50" align="center" />
-        <el-table-column prop="employeeNo" label="员工编号" min-width="100" align="left" show-overflow-tooltip />
-        <el-table-column prop="employeeName" label="员工名称" min-width="100" align="left" show-overflow-tooltip />
-        <el-table-column prop="deptName" label="部门名称" min-width="100" align="left" show-overflow-tooltip/>
-        <el-table-column prop="postName" label="岗位名称" min-width="100" align="left" show-overflow-tooltip/>
+        <el-table-column prop="employeeNo" :label="t('employeeModal.employeeNo')" min-width="100" align="left" show-overflow-tooltip />
+        <el-table-column prop="employeeName" :label="t('employeeModal.employeeName')" min-width="100" align="left" show-overflow-tooltip />
+        <el-table-column prop="deptName" :label="t('employeeModal.deptId')" min-width="100" align="left" show-overflow-tooltip/>
+        <el-table-column prop="postName" :label="t('employeeModal.postId')" min-width="100" align="left" show-overflow-tooltip/>
       </el-table>
       <pagination
         :total="listQueryParams.total"
@@ -186,7 +186,7 @@ export default {
       postOptions: [],
       rules: {
         siteId: [
-          { required: true, message: '请选择业务组织', trigger: 'blur' }
+          { required: true, message: this.t('employeeModal.placeholder.siteId'), trigger: 'blur' }
         ]
       },
       relatedDeptId: undefined
@@ -261,7 +261,7 @@ export default {
     },
     getList() {
       if (!this.relatedDeptId) {
-        this.msgError("该业务组织未关联部门，请先设置关联部门。");
+        this.msgError(this.t('employeeModal.siteNotRelatedDept'));
         return
       }
       this.loading = true
@@ -295,7 +295,7 @@ export default {
     },
     handleConfirm() {
       if (!this.multipleSelection || this.multipleSelection.length === 0) {
-        this.msgError("请选择一笔员工数据！");
+        this.msgError(this.t('employeeModal.selectEmployeeTip'));
       } else {
         if(this.multipleChoice) {
           this.confirm(this.multipleSelection)
@@ -315,7 +315,7 @@ export default {
       if(!selectOption) return;
       this.relatedDeptId = selectOption.relatedDeptId;
       if(!this.relatedDeptId){
-        this.msgError("该业务组织未关联部门，请先设置关联部门。");
+        this.msgError(this.t('employeeModal.siteNotRelatedDept'));
         return;
       }
       this.getDept(this.relatedDeptId);

package/views/bd/common/modal/VendorModal.vue

@@ -9,26 +9,15 @@ export default class VendorList extends ListBasePage {
   serviceName = "Vendor";
   pkField = "id";
   // 列表列信息
-  listColumns = [
-//{key: 0, label: "序号", visible: true},
-    {text: "供应商编号", property: "vendorNo"},
-    {text: "供应商名称", property: "vendorName"},
-  ];
+  listColumns = [];
   //是否多选
   isMultiple = true;
   // 查询条件
-  searchRules = [
-    {text: "供应商编号", op: "LI", property: "vendorNo", displayType: "TextBox"},
-    {text: "供应商名称", op: "LI", property: "vendorName", displayType: "TextBox"},
-  ];
+  searchRules = [];
   // 列信息
-  editColumns = [
-    {text: "供应商编号", property: "vendorNo", displayType: "TextBox"},
-    {text: "供应商名称", property: "vendorName", displayType: "TextBox"},
-  ];
-  opMenus = [
-    ];
-    listSetting = {
+  editColumns = [];
+  opMenus = [];
+  listSetting = {
     //获取列表数据的api方法名
     getListAction: "list",
     //主键字段
@@ -49,14 +38,29 @@ export default class VendorList extends ListBasePage {
   ];
 
   // 表单校验
-  editRules = {
-    vendorNo: [
-      {required: true, message: "供应商编号不能为空", trigger: "blur"}
-    ],
-    vendorName: [
-      {required: true, message: "供应商名称不能为空", trigger: "blur"}
-    ],
-  };
+  editRules = {};
+  created() {
+    this.listColumns = [
+      {text: this.t('vendorModal.vendorNo'), property: "vendorNo"},
+      {text: this.t('vendorModal.vendorName'), property: "vendorName"},
+    ];
+    this.searchRules = [
+      {text: this.t('vendorModal.vendorNo'), op: "LI", property: "vendorNo", displayType: "TextBox"},
+      {text: this.t('vendorModal.vendorName'), op: "LI", property: "vendorName", displayType: "TextBox"},
+    ];
+    this.editColumns = [
+      {text: this.t('vendorModal.vendorNo'), property: "vendorNo", displayType: "TextBox"},
+      {text: this.t('vendorModal.vendorName'), property: "vendorName", displayType: "TextBox"},
+    ];
+    this.editRules = {
+      vendorNo: [
+        {required: true, message: this.t('vendorModal.required.vendorNo'), trigger: "blur"}
+      ],
+      vendorName: [
+        {required: true, message: this.t('vendorModal.required.vendorName'), trigger: "blur"}
+      ],
+    };
+  }
   mounted() {
     // 根据传参：multipleChoice 判断是否可以多选，不设值则基类默认false(单选)
     if (!!this.value?.hasOwnProperty('multipleChoice')) {

package/views/bd/common/modal/WorkGroupModal.vue

@@ -9,42 +9,15 @@ export default class WorkGroupList extends ListBasePage {
   serviceName = "WorkGroup";
   pkField = "id";
   // 列表列信息
-  listColumns = [
-//{key: 0, label: "序号", visible: true},
-    {text: "组织", property: "siteId", setting: { type: "Site" }  },
-    {text: "班组编号", property: "workGroupNo"},
-    {text: "班组名称", property: "workGroupName"},
-  ];
+  listColumns = [];
   //是否多选
   isMultiple = true;
   // 查询条件
-  searchRules = [
-    {
-      text: `组织`,
-      property: "siteId",
-      displayType: "DropDownList",
-      op:"EQ",
-      setting: {
-        type: "site",
-        url: "fd/fd/getUserSites",
-        displayField: "componentName",
-        valueField: "id",
-        isShowPleaseChoose: false,
-      },
-      siteId: this.value?.siteId,
-      disabled: !!this.value?.siteId
-    },
-    {text: "班组编号", op: "LI", property: "workGroupNo", displayType: "TextBox"},
-    {text: "班组名称", op: "LI", property: "workGroupName", displayType: "TextBox"},
-  ];
+  searchRules = [];
   // 列信息
-  editColumns = [
-    {text: "班组编号", property: "workGroupNo", displayType: "TextBox"},
-    {text: "班组名称", property: "workGroupName", displayType: "TextBox"},
-  ];
-  opMenus = [
-    ];
-    listSetting = {
+  editColumns = [];
+  opMenus = [];
+  listSetting = {
     //获取列表数据的api方法名
     getListAction: "list",
     //主键字段
@@ -65,14 +38,45 @@ export default class WorkGroupList extends ListBasePage {
   ];
 
   // 表单校验
-  editRules = {
-    vendorNo: [
-      {required: true, message: "班组编号不能为空", trigger: "blur"}
-    ],
-    vendorName: [
-      {required: true, message: "班组名称不能为空", trigger: "blur"}
-    ],
-  };
+  editRules = {};
+  created() {
+    this.listColumns = [
+      {text: this.t('workGroupModal.siteId'), property: "siteId", setting: { type: "Site" }  },
+      {text: this.t('workGroupModal.workGroupNo'), property: "workGroupNo"},
+      {text: this.t('workGroupModal.workGroupName'), property: "workGroupName"},
+    ];
+    this.searchRules = [
+      {
+        text: this.t('workGroupModal.siteId'),
+        property: "siteId",
+        displayType: "DropDownList",
+        op:"EQ",
+        setting: {
+          type: "site",
+          url: "fd/fd/getUserSites",
+          displayField: "componentName",
+          valueField: "id",
+          isShowPleaseChoose: false,
+        },
+        siteId: this.value?.siteId,
+        disabled: !!this.value?.siteId
+      },
+      {text: this.t('workGroupModal.workGroupNo'), op: "LI", property: "workGroupNo", displayType: "TextBox"},
+      {text: this.t('workGroupModal.workGroupName'), op: "LI", property: "workGroupName", displayType: "TextBox"},
+    ];
+    this.editColumns = [
+      {text: this.t('workGroupModal.workGroupNo'), property: "workGroupNo", displayType: "TextBox"},
+      {text: this.t('workGroupModal.workGroupName'), property: "workGroupName", displayType: "TextBox"},
+    ];
+    this.editRules = {
+      workGroupNo: [
+        {required: true, message: this.t('workGroupModal.required.workGroupNo'), trigger: "blur"}
+      ],
+      workGroupName: [
+        {required: true, message: this.t('workGroupModal.required.workGroupName'), trigger: "blur"}
+      ],
+    };
+  }
   mounted() {
     // 根据传参：multipleChoice 判断是否可以多选，不设值则基类默认false(单选)
     if (!!this.value?.hasOwnProperty('multipleChoice')) {

package/views/system/common/modal/UserModal.vue

@@ -7,7 +7,7 @@
           <div class="head-container">
             <el-input
               v-model="deptName"
-              placeholder="请输入部门|岗位名称"
+              :placeholder="t('userModal.placeholder.deptPostName')"
               clearable
               size="small"
               prefix-icon="el-icon-search"
@@ -34,50 +34,50 @@
       <el-col :span="20" :xs="24">
         <div class="wrapper-container" v-show="showSearch">
           <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
-            <el-form-item label="用户编码" prop="userCode">
+            <el-form-item :label="t('userModal.userCode')" prop="userCode">
               <el-input
                 v-model="queryParams.userCode"
-                placeholder="请输入用户编码"
+                :placeholder="t('userModal.placeholder.userCode')"
                 clearable
                 size="small"
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="用户账号" prop="userName">
+            <el-form-item :label="t('userModal.userName')" prop="userName">
               <el-input
                 v-model="queryParams.userName"
-                placeholder="请输入用户账号"
+                :placeholder="t('userModal.placeholder.userName')"
                 clearable
                 size="small"
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="用户名称" prop="nickName">
+            <el-form-item :label="t('userModal.nickName')" prop="nickName">
               <el-input
                 v-model="queryParams.nickName"
-                placeholder="请输入用户名称"
+                :placeholder="t('userModal.placeholder.nickName')"
                 clearable
                 size="small"
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="手机号码" prop="phone">
+            <el-form-item :label="t('userModal.phone')" prop="phone">
               <el-input
                 v-model="queryParams.phone"
-                placeholder="请输入手机号码"
+                :placeholder="t('userModal.placeholder.phone')"
                 clearable
                 size="small"
                 style="width: 240px"
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
-            <el-form-item label="在职状态" prop="status">
+            <el-form-item :label="t('userModal.status')" prop="status">
               <el-select
                 v-model="queryParams.status"
-                placeholder="在职状态"
+                :placeholder="t('userModal.placeholder.status')"
                 clearable
                 size="small"
                 style="width: 240px"
@@ -90,7 +90,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="创建时间">
+            <el-form-item :label="t('userModal.createTime')">
               <el-date-picker
                 v-model="dateRange"
                 size="small"
@@ -98,13 +98,13 @@
                 value-format="yyyy-MM-dd"
                 type="daterange"
                 range-separator="-"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
+                :start-placeholder="t('userModal.placeholder.startDate')"
+                :end-placeholder="t('userModal.placeholder.endDate')"
               ></el-date-picker>
             </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('userModal.search') }}</el-button>
+              <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{ t('userModal.reset') }}</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -119,20 +119,20 @@
                     @select="handleSelect"
                     @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50" align="center" />
-            <el-table-column label="用户编码" align="center" key="userCode" prop="userCode" v-if="columns[0].visible" min-width="120" />
-            <el-table-column label="用户账号" align="center" key="userName" prop="userName" v-if="columns[1].visible"
+            <el-table-column :label="t('userModal.userCode')" align="center" key="userCode" prop="userCode" v-if="columns[0].visible" min-width="120" />
+            <el-table-column :label="t('userModal.userName')" align="center" key="userName" prop="userName" v-if="columns[1].visible"
                              :show-overflow-tooltip="true" min-width="120" />
-            <el-table-column label="用户名称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
+            <el-table-column :label="t('userModal.nickName')" align="center" key="nickName" prop="nickName" v-if="columns[2].visible"
                              :show-overflow-tooltip="true" min-width="120" />
-            <el-table-column label="部门|岗位" align="center" key="post.postName" v-if="columns[3].visible"
+            <el-table-column :label="t('userModal.deptPost')" align="center" key="post.postName" v-if="columns[3].visible"
                              :show-overflow-tooltip="true" min-width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.dept.deptName }}/{{ scope.row.post.postName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="手机号码" align="center" key="phone" prop="phone" v-if="columns[4].visible"
+            <el-table-column :label="t('userModal.phone')" align="center" key="phone" prop="phone" v-if="columns[4].visible"
                              min-width="120" />
-            <el-table-column label="在职状态" align="center" key="status" v-if="columns[5].visible" min-width="120">
+            <el-table-column :label="t('userModal.status')" align="center" key="status" v-if="columns[5].visible" min-width="120">
               <template slot-scope="scope">
                 <el-switch v-model="scope.row.status"
                            active-value="0"
@@ -140,12 +140,12 @@
                            @change="handleStatusChange(scope.row)"></el-switch>
               </template>
             </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" min-width="160">
+            <el-table-column :label="t('userModal.createTime')" align="center" prop="createTime" v-if="columns[6].visible" min-width="160">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createTime) }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[7].visible" min-width="160" :formatter="userDisplayFormat">
+            <el-table-column :label="t('userModal.createBy')" align="center" prop="createBy" v-if="columns[7].visible" min-width="160" :formatter="userDisplayFormat">
             </el-table-column>
           </el-table>
           <pagination
@@ -158,8 +158,8 @@
         </div>
       </el-col>
         <div v-if="value && value.btnShow" class="dialog-footer" style="margin-top: 10px;position:static;">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitForm">{{ t('userModal.confirm') }}</el-button>
+          <el-button @click="cancel">{{ t('userModal.cancel') }}</el-button>
         </div>
     </el-row>
   </div>
@@ -280,49 +280,9 @@ export default {
         postId: undefined
       },
       // 列信息
-      columns: [
-        {key: 0, label: `用户编码`, visible: true},
-        {key: 1, label: `用户账号`, visible: true},
-        {key: 2, label: `用户名称`, visible: true},
-        {key: 3, label: `部门|岗位`, visible: true},
-        {key: 4, label: `手机号码`, visible: true},
-        {key: 5, label: `状态`, visible: true},
-        { key: 6, label: `创建时间`, visible: true },
-        { key: 7, label: `创建人`, visible: true }
-      ],
+      columns: [],
       // 表单校验
-      rules: {
-        postId: [
-          {required: true, message: "部门|岗位不能为空", trigger: "blur"}
-        ],
-        userCode: [
-          {required: true, message: "用户编码不能为空", trigger: "blur"}
-        ],
-        userName: [
-          {required: true, message: "用户账号不能为空", trigger: "blur"}
-        ],
-        nickName: [
-          {required: true, message: "用户名称不能为空", trigger: "blur"}
-        ],
-        password: [
-          {required: true, message: "用户密码不能为空", trigger: "blur"},
-          {min: 6, max: 20, message: '用户密码长度必须介于 6 和 20 之间', trigger: 'blur'}
-        ],
-        email: [
-          {
-            type: "email",
-            message: "'请输入正确的邮箱地址",
-            trigger: ["blur", "change"]
-          }
-        ],
-        phone: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
-      }
+      rules: {}
     }
   },
   watch: {
@@ -341,6 +301,48 @@ export default {
     }
   },
   created() {
+    this.columns = [
+      {key: 0, label: this.t('userModal.userCode'), visible: true},
+      {key: 1, label: this.t('userModal.userName'), visible: true},
+      {key: 2, label: this.t('userModal.nickName'), visible: true},
+      {key: 3, label: this.t('userModal.deptPost'), visible: true},
+      {key: 4, label: this.t('userModal.phone'), visible: true},
+      {key: 5, label: this.t('userModal.status'), visible: true},
+      {key: 6, label: this.t('userModal.createTime'), visible: true},
+      {key: 7, label: this.t('userModal.createBy'), visible: true}
+    ];
+    this.rules = {
+      postId: [
+        {required: true, message: this.t('userModal.required.deptPost'), trigger: "blur"}
+      ],
+      userCode: [
+        {required: true, message: this.t('userModal.required.userCode'), trigger: "blur"}
+      ],
+      userName: [
+        {required: true, message: this.t('userModal.required.userName'), trigger: "blur"}
+      ],
+      nickName: [
+        {required: true, message: this.t('userModal.required.nickName'), trigger: "blur"}
+      ],
+      password: [
+        {required: true, message: this.t('userModal.required.password'), trigger: "blur"},
+        {min: 6, max: 20, message: this.t('userModal.required.passwordLength'), trigger: 'blur'}
+      ],
+      email: [
+        {
+          type: "email",
+          message: this.t('userModal.required.email'),
+          trigger: ["blur", "change"]
+        }
+      ],
+      phone: [
+        {
+          pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+          message: this.t('userModal.required.phone'),
+          trigger: "blur"
+        }
+      ]
+    };
     this.getList()
     this.getTreeSelect()
     this.getDicts("sys_normal_disable").then(response => {
@@ -468,13 +470,13 @@ export default {
       debugger
       if (this.isReturnEntity) {
         if (!this.multipleSelection || this.multipleSelection.length === 0) {
-          this.msgError("请选择一笔用户数据！");
+          this.msgError(this.t('userModal.selectUserTip'));
         } else {
           this.$emit("confirm", this.multipleChoice ? this.multipleSelection : this.multipleSelection?.[0])
         }
       } else {
         if (! this.ids ||  this.ids.length === 0) {
-          this.msgError("请选择一笔用户数据！");
+          this.msgError(this.t('userModal.selectUserTip'));
         } else {
           this.$emit("confirm", this.ids);
         }