diff --git a/src/api/table.js b/src/api/table.js
index 86c5d60..d161965 100644
--- a/src/api/table.js
+++ b/src/api/table.js
@@ -23,7 +23,7 @@ export const saveTableUser = data => createAPI(`gridTableUser/saveGridTableUserL
 export const updateTableUser = data => createAPI(`gridTableUser/updateTableUser`,'Post',data)
 
 // 删除
-export const removerUser = data => createAPI(`gridTableDefault/removerUser`,'post',data)
+export const removerUser = data => createAPI(`gridTableUser/removerUser`,'post',data)
 
 
 
diff --git a/src/views/modules/base/partDistribution.vue b/src/views/modules/base/partDistribution.vue
index aa2d157..51f4c91 100644
--- a/src/views/modules/base/partDistribution.vue
+++ b/src/views/modules/base/partDistribution.vue
@@ -1,8 +1,11 @@
 <template>
   <div class="mod-config">
     <el-form :inline="true" label-position="top" label-width="100px" style="margin-top: 0px;">
-      <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'查询'}}</el-button>
-      <el-button @click="addModal()" type="primary" style="margin-left: 2px;margin-top: 0px">{{'新增'}}</el-button>
+      <el-button @click="getData()" type="primary" style="margin-left: 2px;margin-top: 0px">{{buttons.search}}</el-button>
+      <el-button @click="addModal()" type="primary" style="margin-left: 2px;margin-top: 0px">{{buttons.add}}</el-button>
+      <el-button @click="userSetting" type="primary">{{ buttons.settingTable }}</el-button>
+      <el-button v-if="isAuth('sys:setting')" @click="saveColumnList()" type="primary">{{ buttons.defaultTable }}
+      </el-button>
       <download-excel
         :fields="fields()"
         :data="exportData"
@@ -28,10 +31,10 @@
         header-align="center"
         align="center"
         width="150"
-        label="操作">
+        :label=buttons.work>
         <template slot-scope="scope">
-          <a type="text" size="small" @click="editModel(scope.row)">修改</a>
-          <a type="text" size="small" @click="deleteData(scope.row)">删除</a>
+          <a type="text" size="small" @click="editModel(scope.row)">{{buttons.update}}</a>
+          <a type="text" size="small" @click="deleteData(scope.row)">{{buttons.delete}}</a>
         </template>
       </el-table-column>
       <el-table-column
@@ -51,49 +54,243 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog title="数据维护" :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="500px" >
+    <el-dialog :title=buttons.dataUpdate :close-on-click-modal="false" v-drag :visible.sync="modelFlag" width="500px" >
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item :label="'工厂编码：'">
+        <el-form-item :label=buttons.site>
           <el-input v-model="modelData.site" :disabled="modelInputFlag" style="width: 130px"></el-input>
         </el-form-item>
-        <el-form-item :label="'分类编码：'">
+        <el-form-item :label=buttons.familyID>
           <el-input v-model="modelData.familyID" :disabled="modelInputFlag" style="width: 130px" onblur="this.value=this.value.toUpperCase()"></el-input>
         </el-form-item>
-        <el-form-item :label="'分类名称：'">
+        <el-form-item :label=buttons.familyName>
           <el-input v-model="modelData.familyName"  style="width: 130px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
-        <el-form-item :label="'在用：'">
+        <el-form-item :label=buttons.active>
           <el-select filterable v-model="modelData.active" style="width: 130px">
-            <el-option label="是" value="Y"></el-option>
-            <el-option label="否" value="N"></el-option>
+            <el-option :label=buttons.yes value="Y"></el-option>
+            <el-option :label=buttons.no value="N"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="'校验比例：'">
+        <el-form-item :label=buttons.checkPercentage>
           <el-input v-model="modelData.checkPercentage" type="number"  style="width: 130px"></el-input>
         </el-form-item>
       </el-form>
       <el-footer  style="height:40px;margin-top: 20px;text-align:center">
-        <el-button type="primary" @click="ModelSave()">保存</el-button>
-        <el-button type="primary" @click="modelFlag = false">关闭</el-button>
+        <el-button type="primary" @click="ModelSave()">{{buttons.save}}</el-button>
+        <el-button type="primary" @click="modelFlag = false">{{buttons.close}}</el-button>
       </el-footer>
     </el-dialog>
+
+    <!-- 动态列    -->
+    <column v-if="visible" ref="column" @refreshData="getTableUserColumn"></column>
   </div>
 </template>
 
 <script>
-
+  import column from "../common/column";
+  import {
+    searchSysLanguagePackList,
+    searchSysLanguageParam,
+    searchFunctionButtonList,
+    saveButtonList,
+    searchSysLanguage,
+    searchLanguageListByLanguageCode,
+    saveSysLanguageOne,
+    searchPageLanguageData,
+    removerLanguage
+  } from "@/api/sysLanguage.js"
   import {
     getPartFamily,
     savePartFamily,
     deletePartFamily
   } from "@/api/base/site.js"
-
+  import {
+    saveTableDefaultList,
+    saveTableUser,
+    getTableDefaultListLanguage,
+    getTableUserListLanguage,
+    removerDefault,
+    removerUser
+  } from "@/api/table.js"
   export default {
     name: "partDistribution",
+    components: {column},
     data() {
       return {
+        // 多语言 start
+        buttonList: [
+          {
+            functionId: "6002",
+            languageValue: '设置默认配置',
+            objectId: 'defaultTable',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '查询',
+            objectId: 'search',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '新增',
+            objectId: 'add',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '导出',
+            objectId: 'download',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '设置列表',
+            objectId: 'settingTable',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '操作',
+            objectId: 'work',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '数据维护',
+            objectId: 'dataUpdate',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '工厂编码',
+            objectId: 'site',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '分类编码',
+            objectId: 'familyID',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '分类名称',
+            objectId: 'familyName',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '在用',
+            objectId: 'active',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '编辑',
+            objectId: 'update',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '删除',
+            objectId: 'delete',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '是',
+            objectId: 'yes',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '否',
+            objectId: 'no',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '校验比例',
+            objectId: 'checkPercentage',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '保存',
+            objectId: 'save',
+            objectType: "button",
+            tableId: "6002Table"
+          },
+          {
+            functionId: "6002",
+            languageValue: '关闭',
+            objectId: 'close',
+            objectType: "button",
+            tableId: "6002Table"
+          }
+        ],
+        showDefault:false,
+        // 语言词典集合
+        sysLanguageParams: [],
+        dataListLoading: false,
+        // 用户table 配置集合
+        userColumnList: [],
+        queryTableUser: {
+          userId: this.$store.state.user.name,
+          functionId: 6002,
+          tableId: "6002Table",
+          status: true,
+          languageCode: this.$i18n.locale
+        },
+        buttons:{
+          defaultTable:'设置默认配置',
+          search:'查询',
+          add:'新增',
+          download:'导出',
+          settingTable: '设置列表',
+          work:'操作',
+          dataUpdate:'数据维护',
+          site:'工厂编码',
+          familyID:'分类编码',
+          familyName:'分类名称',
+          active:'在用',
+          update:'编辑',
+          delete:'删除',
+          yes:'是',
+          no:'否',
+          checkPercentage:'校验比例',
+          save:'保存',
+          close:'关闭',
+        },
+        // 默认table 查询参数
+        queryTable: {
+          functionId: 6002,
+          tableId: "6002Table",
+          languageCode: this.$i18n.locale
+        },
+        languageList: [],
+        queryLanguage: {},
+        visible:false,
+        // 多语言 end
         // 导出 start
         exportData: [],
         exportName: "物料分类"+this.dayjs().format('YYYYMMDDHHmmss'),
@@ -114,11 +311,6 @@
           user:'',
         },
         dataList:[],
-        dataListLoading: false,
-        buttons:{
-          search:'查询',
-          download:'导出',
-        },
         columnList: [
           {
             userId: this.$store.state.user.name,
@@ -218,7 +410,101 @@
         this.height = window.innerHeight - 180;
       })
     },
+    activated() {
+    },
     methods: {
+      //多语言start
+      // 获取页面多语言
+      getMsgLanguage() {
+        this.dataListLoading = true
+        let queryLang = {
+          functionId: 6002,
+          table_id: '6002Table',
+          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: 6002,
+          tableId: "6002Table",
+          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
       getData(){
         let inData={
           user:this.$store.state.user.name
@@ -356,7 +642,12 @@
       // 导出 end
     },
     created() {
+      this.getTableUserColumn()
+      this.getSysLanguageParamList()
+      this.getFunctionButtonList()
+      this.getMsgLanguage()
       this.getData();
+
     }
   }
 </script>