diff --git a/src/views/modules/base/factoryInformation.vue b/src/views/modules/base/factoryInformation.vue
index 7714905..540ed38 100644
--- a/src/views/modules/base/factoryInformation.vue
+++ b/src/views/modules/base/factoryInformation.vue
@@ -138,6 +138,25 @@
       getCompanyData,
       siteSave
     } from "@/api/base/site.js"
+    import {
+      searchSysLanguagePackList,
+      searchSysLanguageParam,
+      searchFunctionButtonList,
+      saveButtonList,
+      searchSysLanguage,
+      searchLanguageListByLanguageCode,
+      saveSysLanguageOne,
+      searchPageLanguageData,
+      removerLanguage
+    } from "@/api/sysLanguage.js"
+    import {
+      saveTableDefaultList,
+      saveTableUser,
+      getTableDefaultListLanguage,
+      getTableUserListLanguage,
+      removerDefault,
+      removerUser
+    } from "@/api/table.js"
     import Chooselist from '@/views/modules/common/Chooselist'
 
     export default {
@@ -154,6 +173,147 @@
           exportHeader: ["工厂信息"],
           exportFooter: [],
           // 导出 end
+          // 多语言 start
+          buttonList: [
+            {
+              functionId: this.$route.meta.menuId,
+              languageValue: '设置默认配置',
+              objectId: 'defaultTable',
+              objectType: "button",
+              tableId: "100001002Table"
+            },
+            {
+              functionId: this.$route.meta.menuId,
+              languageValue: '查询',
+              objectId: 'search',
+              objectType: "button",
+              tableId: "100001002Table"
+            },
+            {
+              functionId: this.$route.meta.menuId,
+              languageValue: '导出',
+              objectId: 'download',
+              objectType: "button",
+              tableId: "100001002Table"
+            },
+            {
+              functionId: this.$route.meta.menuId,
+              languageValue: '设置列表',
+              objectId: 'settingTable',
+              objectType: "button",
+              tableId: "100001002Table"
+            },
+            {
+              functionId: this.$route.meta.menuId,
+              languageValue: '工厂编码',
+              objectId: 'site',
+              objectType: "button",
+              tableId: "100001002Table"
+            },
+
+            {
+              functionId: this.$route.meta.menuId,
+              languageValue: '全部',
+              objectId: 'all',
+              objectType: "button",
+              tableId: "100001002Table"
+            },
+            {
+              functionId: this.$route.meta.menuId,
+              languageValue: '是',
+              objectId: 'yes',
+              objectType: "button",
+              tableId: "100001002Table"
+            },
+            {
+              functionId: this.$route.meta.menuId,
+              languageValue: '否',
+              objectId: 'no',
+              objectType: "button",
+              tableId: "100001002Table"
+            },
+            {
+              functionId: this.$route.meta.menuId,
+              languageValue: '在用',
+              objectId: 'active',
+              objectType: "button",
+              tableId: "100001002Table"
+            },
+            {
+              functionId: this.$route.meta.menuId,
+              languageValue: '物料编码',
+              objectId: 'partNo',
+              objectType: "button",
+              tableId: "100001002Table"
+            },
+            {
+              functionId: this.$route.meta.menuId,
+              languageValue: '物料名称',
+              objectId: 'partDescription',
+              objectType: "button",
+              tableId: "100001002Table"
+            },
+            {
+              functionId: this.$route.meta.menuId,
+              languageValue: '规则型号',
+              objectId: 'spec',
+              objectType: "button",
+              tableId: "100001002Table"
+            },
+            {
+              functionId: this.$route.meta.menuId,
+              languageValue: '新增日期',
+              objectId: 'newDate',
+              objectType: "button",
+              tableId: "100001002Table"
+            },
+            {
+              functionId: this.$route.meta.menuId,
+              languageValue: '至',
+              objectId: 'to',
+              objectType: "button",
+              tableId: "100001002Table"
+            }
+          ],
+          showDefault:false,
+          // 语言词典集合
+          sysLanguageParams: [],
+          dataListLoading: false,
+          // 用户table 配置集合
+          userColumnList: [],
+          queryTableUser: {
+            userId: this.$store.state.user.name,
+            functionId: this.$route.meta.menuId,
+            tableId: "100001002Table",
+            status: true,
+            languageCode: this.$i18n.locale
+          },
+          buttons:{
+            defaultTable:'设置默认配置',
+            search:'查询',
+            download:'导出',
+            settingTable: '设置列表',
+            site:'工厂编码',
+            active:'在用',
+            all:'全部',
+            yes:'是',
+            no:'否',
+            partNo:'物料编码',
+            partDescription:'物料名称',
+            spec:'规则型号',
+            newDate:'新增日期',
+            to:'至',
+          },
+          // 默认table 查询参数
+          queryTable: {
+            functionId: this.$route.meta.menuId,
+            tableId: "100001002Table",
+            languageCode: this.$i18n.locale
+          },
+          languageList: [],
+          queryLanguage: {},
+          visible:false,
+          // 多语言 end
           height: 200,
           siteFlag:false,
           siteInputFlag:true,
@@ -176,16 +336,12 @@
             referenceCustomerID:'',
           },
           dataList:[],
-          dataListLoading: false,
-          buttons:{
-            download:'导出',
-          },
           columnList: [
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableSiteID',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TableSiteID',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "siteID",
               headerAlign: "center",
@@ -201,9 +357,9 @@
             },
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableSiteName',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TableSiteName',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "siteName",
               headerAlign: "center",
@@ -219,9 +375,9 @@
             },
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableSiteNameE',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TableSiteNameE',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "siteNameE",
               headerAlign: "center",
@@ -237,9 +393,9 @@
             },
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableCompanyID',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TableCompanyID',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "companyID",
               headerAlign: "center",
@@ -255,9 +411,9 @@
             },
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableCompanyName',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TableCompanyName',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "companyName",
               headerAlign: "center",
@@ -273,9 +429,9 @@
             },
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableAddress',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TableAddress',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "address",
               headerAlign: "center",
@@ -291,9 +447,9 @@
             },
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableAddressE',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TableAddressE',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "addressE",
               headerAlign: "center",
@@ -309,9 +465,9 @@
             },
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableWebsite',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TableWebsite',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "website",
               headerAlign: "center",
@@ -327,9 +483,9 @@
             },
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableContactName',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TableContactName',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "contactName",
               headerAlign: "center",
@@ -345,9 +501,9 @@
             },
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TablePostCode',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TablePostCode',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "postCode",
               headerAlign: "center",
@@ -363,9 +519,9 @@
             },
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TablePhoneNo',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TablePhoneNo',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "phoneNo",
               headerAlign: "center",
@@ -381,9 +537,9 @@
             },
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableFaxNo',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TableFaxNo',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "faxNo",
               headerAlign: "center",
@@ -399,9 +555,9 @@
             },
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableEmail',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TableEmail',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "email  ",
               headerAlign: "center",
@@ -417,9 +573,9 @@
             },
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableActive',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TableActive',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "active",
               headerAlign: "center",
@@ -435,9 +591,9 @@
             },
             {
               userId: this.$store.state.user.name,
-              functionId: 6001,
-              serialNumber: '6001TableShipTime',
-              tableId: "6001Table",
+              functionId: 100001002,
+              serialNumber: '100001002TableShipTime',
+              tableId: "100001002Table",
               tableName: "工厂信息表",
               columnProp: "shipTime",
               headerAlign: "center",
@@ -597,7 +753,99 @@
           let inData={companyID:row.companyID,companyName:row.companyName};
          localStorage.setItem('companyInformation', JSON.stringify(inData))
           this.$router.replace('base-companyInformation')
-        }
+        },
+        //多语言start
+        // 获取页面多语言
+        getMsgLanguage() {
+          this.dataListLoading = true
+          let queryLang = {
+            functionId: this.$route.meta.menuId,
+            table_id: '100001002Table',
+            languageCode: this.$i18n.locale
+          }
+          searchPageLanguageData(queryLang).then((data) => {
+            if (JSON.stringify(data.data) != '{}') {
+              this.pageLanguageData = data.data
+            } else {
+            }
+          })
+          this.dataListLoading = false
+        },
+        // 获取button的词典
+        getFunctionButtonList() {
+          searchFunctionButtonList(this.queryTable).then(({data}) => {
+            if (JSON.stringify(data.data) != '{}') {
+              this.buttons = data.data
+            } else {
+              // saveButtonList(this.buttonList).then(({data}) => {
+              // })
+            }
+          })
+        },
+        // 获取语言词典
+        getSysLanguageParamList() {
+          searchSysLanguageParam(this.queryTable).then(({data}) => {
+            this.sysLanguageParams = data.rows
+          })
+        },
+        // 打开页面设置
+        userSetting() {
+          this.visible = true;
+          let queryTable = {
+            userId: this.$store.state.user.name,
+            functionId: this.$route.meta.menuId,
+            tableId: "100001002Table",
+            languageCode: this.$i18n.locale
+          }
+          this.$nextTick(() => {
+            this.$refs.column.init(queryTable);
+          });
+        },
+        // 获取 用户保存的 格式列
+        getTableUserColumn() {
+          getTableUserListLanguage(this.queryTableUser).then(({data}) => {
+            if (data.rows.length>0) {
+              //this.columnList = []
+              this.columnList = data.rows
+            } else {
+              this.getColumnList()
+            }
+
+          })
+        },
+        // 保存 默认配置 列
+        saveColumnList() {
+          // 删除所有的该页面下保存的数据
+          if (this.userColumnList) {
+            //删除 user自定义的数据
+            removerUser(this.queryTable)
+          }
+          // 删除默认配置
+          removerDefault(this.queryTable)
+          // 删除语言
+          removerLanguage(this.queryTable)
+          // 保存页面 table属性
+          let sumColumnList = this.columnList;
+          saveTableDefaultList(sumColumnList).then(({data}) => {
+          })
+          // 保存页面 button label title 属性
+          saveButtonList(this.buttonList).then(({data}) => {
+          })
+          this.getFunctionButtonList()
+          this.getColumnList()
+        },
+        // 获取 tableDefault 列
+        getColumnList() {
+          getTableDefaultListLanguage(this.queryTable).then(({data}) => {
+            if (data.rows.length>0) {
+              this.showDefault = false
+              this.columnList = data.rows
+            } else {
+              this.showDefault = true
+            }
+          })
+        },
+        //多语言 end
       },
       created() {
         this.getData();
diff --git a/src/views/modules/base/searchPartNo.vue b/src/views/modules/base/searchPartNo.vue
index f4cd986..0ee1b89 100644
--- a/src/views/modules/base/searchPartNo.vue
+++ b/src/views/modules/base/searchPartNo.vue
@@ -125,35 +125,35 @@
             languageValue: '设置默认配置',
             objectId: 'defaultTable',
             objectType: "button",
-            tableId: "6004Table"
+            tableId: "100005Table"
           },
           {
             functionId: this.$route.meta.menuId,
             languageValue: '查询',
             objectId: 'search',
             objectType: "button",
-            tableId: "6004Table"
+            tableId: "100005Table"
           },
           {
             functionId: this.$route.meta.menuId,
             languageValue: '导出',
             objectId: 'download',
             objectType: "button",
-            tableId: "6004Table"
+            tableId: "100005Table"
           },
           {
             functionId: this.$route.meta.menuId,
             languageValue: '设置列表',
             objectId: 'settingTable',
             objectType: "button",
-            tableId: "6004Table"
+            tableId: "100005Table"
           },
           {
             functionId: this.$route.meta.menuId,
             languageValue: '工厂编码',
             objectId: 'site',
             objectType: "button",
-            tableId: "6004Table"
+            tableId: "100005Table"
           },
 
           {
@@ -161,63 +161,63 @@
             languageValue: '全部',
             objectId: 'all',
             objectType: "button",
-            tableId: "6004Table"
+            tableId: "100005Table"
           },
           {
             functionId: this.$route.meta.menuId,
             languageValue: '是',
             objectId: 'yes',
             objectType: "button",
-            tableId: "6004Table"
+            tableId: "100005Table"
           },
           {
             functionId: this.$route.meta.menuId,
             languageValue: '否',
             objectId: 'no',
             objectType: "button",
-            tableId: "6004Table"
+            tableId: "100005Table"
           },
           {
             functionId: this.$route.meta.menuId,
             languageValue: '在用',
             objectId: 'active',
             objectType: "button",
-            tableId: "6004Table"
+            tableId: "100005Table"
           },
           {
             functionId: this.$route.meta.menuId,
             languageValue: '物料编码',
             objectId: 'partNo',
             objectType: "button",
-            tableId: "6004Table"
+            tableId: "100005Table"
           },
           {
             functionId: this.$route.meta.menuId,
             languageValue: '物料名称',
             objectId: 'partDescription',
             objectType: "button",
-            tableId: "6004Table"
+            tableId: "100005Table"
           },
           {
             functionId: this.$route.meta.menuId,
             languageValue: '规则型号',
             objectId: 'spec',
             objectType: "button",
-            tableId: "6004Table"
+            tableId: "100005Table"
           },
           {
             functionId: this.$route.meta.menuId,
             languageValue: '新增日期',
             objectId: 'newDate',
             objectType: "button",
-            tableId: "6004Table"
+            tableId: "100005Table"
           },
           {
             functionId: this.$route.meta.menuId,
             languageValue: '至',
             objectId: 'to',
             objectType: "button",
-            tableId: "6004Table"
+            tableId: "100005Table"
           }
         ],
         showDefault:false,
@@ -229,7 +229,7 @@
         queryTableUser: {
           userId: this.$store.state.user.name,
           functionId: this.$route.meta.menuId,
-          tableId: "6004Table",
+          tableId: "100005Table",
           status: true,
           languageCode: this.$i18n.locale
         },
@@ -252,7 +252,7 @@
         // 默认table 查询参数
         queryTable: {
           functionId: this.$route.meta.menuId,
-          tableId: "6004Table",
+          tableId: "100005Table",
           languageCode: this.$i18n.locale
         },
         languageList: [],
@@ -284,8 +284,8 @@
           {
             userId: this.$store.state.user.name,
             functionId: this.$route.meta.menuId,
-            serialNumber: '6004TablePartNo',
-            tableId: "6004Table",
+            serialNumber: '100005TablePartNo',
+            tableId: "100005Table",
             tableName: "查询物料编码表",
             columnProp: "partNo",
             headerAlign: "center",
@@ -302,8 +302,8 @@
           {
             userId: this.$store.state.user.name,
             functionId: this.$route.meta.menuId,
-            serialNumber: '6004TablePartDescription',
-            tableId: "6004Table",
+            serialNumber: '100005TablePartDescription',
+            tableId: "100005Table",
             tableName: "查询物料编码表",
             columnProp: "partDescription",
             headerAlign: "center",
@@ -320,8 +320,8 @@
           {
             userId: this.$store.state.user.name,
             functionId: this.$route.meta.menuId,
-            serialNumber: '6004TableSpec',
-            tableId: "6004Table",
+            serialNumber: '100005TableSpec',
+            tableId: "100005Table",
             tableName: "查询物料编码表",
             columnProp: "spec",
             headerAlign: "center",
@@ -338,8 +338,8 @@
           {
             userId: this.$store.state.user.name,
             functionId: this.$route.meta.menuId,
-            serialNumber: '6004TableConfigurationTemplateID',
-            tableId: "6004Table",
+            serialNumber: '100005TableConfigurationTemplateID',
+            tableId: "100005Table",
             tableName: "查询物料编码表",
             columnProp: "configurationTemplateID",
             headerAlign: "center",
@@ -356,8 +356,8 @@
           {
             userId: this.$store.state.user.name,
             functionId: this.$route.meta.menuId,
-            serialNumber: '6004TableRemark',
-            tableId: "6004Table",
+            serialNumber: '100005TableRemark',
+            tableId: "100005Table",
             tableName: "查询物料编码表",
             columnProp: "remark",
             headerAlign: "center",
@@ -374,8 +374,8 @@
           {
             userId: this.$store.state.user.name,
             functionId: this.$route.meta.menuId,
-            serialNumber: '6004TableUmid',
-            tableId: "6004Table",
+            serialNumber: '100005TableUmid',
+            tableId: "100005Table",
             tableName: "查询物料编码表",
             columnProp: "umid",
             headerAlign: "center",
@@ -392,8 +392,8 @@
           {
             userId: this.$store.state.user.name,
             functionId: this.$route.meta.menuId,
-            serialNumber: '6004TableActive',
-            tableId: "6004Table",
+            serialNumber: '100005TableActive',
+            tableId: "100005Table",
             tableName: "查询物料编码表",
             columnProp: "active",
             headerAlign: "center",
@@ -410,8 +410,8 @@
           {
             userId: this.$store.state.user.name,
             functionId: this.$route.meta.menuId,
-            serialNumber: '6004TableCreateDate',
-            tableId: "6004Table",
+            serialNumber: '100005TableCreateDate',
+            tableId: "100005Table",
             tableName: "查询物料编码表",
             columnProp: "createDate",
             headerAlign: "center",
@@ -428,8 +428,8 @@
           {
             userId: this.$store.state.user.name,
             functionId: this.$route.meta.menuId,
-            serialNumber: '6004TableSite',
-            tableId: "6004Table",
+            serialNumber: '100005TableSite',
+            tableId: "100005Table",
             tableName: "查询物料编码表",
             columnProp: "site",
             headerAlign: "center",
@@ -459,7 +459,7 @@
         this.dataListLoading = true
         let queryLang = {
           functionId: this.$route.meta.menuId,
-          table_id: '6004Table',
+          table_id: '100005Table',
           languageCode: this.$i18n.locale
         }
         searchPageLanguageData(queryLang).then((data) => {
@@ -493,7 +493,7 @@
         let queryTable = {
           userId: this.$store.state.user.name,
           functionId: this.$route.meta.menuId,
-          tableId: "6004Table",
+          tableId: "100005Table",
           languageCode: this.$i18n.locale
         }
         this.$nextTick(() => {
diff --git a/src/views/modules/sys/language/common-language-base.vue b/src/views/modules/sys/language/common-language-base.vue
index fa3860c..94f2ae0 100644
--- a/src/views/modules/sys/language/common-language-base.vue
+++ b/src/views/modules/sys/language/common-language-base.vue
@@ -1,3 +1,4 @@
+
 <template>
   <el-dialog
     width="350px"