kz-ui-base 1.0.154 → 1.0.156

package/common/src/components/base/dialog/editDialog.vue

@@ -241,9 +241,6 @@ export default {
     console.log("editDialog");
   },
   methods: {
-    t(key) {
-      return this.$t(key) || key
-    },
     //当前绑定实体字段值变更事件
     onChangeEvent(args) {
       this.$emit("change", args);

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/components/base/dialog/MultiLanguageDialog.vue

@@ -77,9 +77,6 @@ export default {
     }
   },
   methods: {
-    t(key) {
-      return this.$t(key) || key
-    },
     getLabelByKey(key) {
       const labelMap = {
         configName: this.t('config.config_name'),

package/components/customForm/OpMenus.vue

@@ -8,7 +8,7 @@
                     opMenu.permission,
                     `${moduleName}:${serviceName}:${opMenu.permission}`,
                   ]">
-            {{ opMenu.text }}
+            {{ opMenu.text || t(opMenu.i18nKey) }}
           </el-button>
         </el-col>
       </template>
@@ -20,7 +20,7 @@
                     opMenu.permission,
                     `${moduleName}:${serviceName}:${opMenu.permission}`,
                   ]">
-            {{ opMenu.text }}
+            {{ opMenu.text || t(opMenu.i18nKey) }}
           </el-button>
         </el-col>
       </template>
@@ -69,7 +69,7 @@ export default {
       default:()=>[
         {
           visible: true,
-          text: "添加",
+          i18nKey: "opMenus.add",
           icon: "el-icon-plus",
           permission: "add",
           name: "add",
@@ -79,7 +79,7 @@ export default {
         },
         {
           visible: true,
-          text: "修改",
+          i18nKey: "opMenus.update",
           icon: "el-icon-edit",
           permission: "edit",
           name: "update",
@@ -89,7 +89,7 @@ export default {
         },
         {
           visible: true,
-          text: "删除",
+          i18nKey: "opMenus.delete",
           icon: "el-icon-delete",
           permission: "remove",
           name: "delete",

package/list-base-page/listBasePageTs.vue

@@ -1294,7 +1294,7 @@ import { getToken } from "@utils/auth";
 import _ from "lodash";
 import KZ_DropDownList from "@srcComponents/customForm/dropDownList.vue";
 import KZ_TextBox from "@srcComponents/customForm/textBox.vue";
-import EditDialog from "@components/base/dialog/editDialog.vue";
+import EditDialog from "./common/src/components/base/dialog/editDialog.vue";
 import KZ_CheckBox from "@srcComponents/customForm/checkBox.vue";
 import KZ_DatePicker from "@srcComponents/customForm/datePicker.vue";
 import KZ_Switch from "@srcComponents/customForm/switch.vue";
@@ -1305,7 +1305,7 @@ import KZ_Radio from "@srcComponents/customForm/radio.vue";
 import UploadDialog from "@srcComponents/customForm/uploadDialog.vue";
 import PrintDialog from "@srcComponents/customForm/printDialog.vue";
 import KZ_Lookup from "@srcComponents/customForm/lookup.vue";
-import MultiLanguageDialog from "@srcComponents/base/dialog/MultiLanguageDialog.vue";
+import MultiLanguageDialog from ".components/base/dialog/MultiLanguageDialog.vue";
 import { batchGetTranslation } from "@srcComponents/base/dialog/config.js";
 @Component({
   components: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kz-ui-base",
-  "version": "1.0.154",
+  "version": "1.0.156",
   "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
     }