diff --git a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
index f8762da..724380b 100644
--- a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
+++ b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
@@ -1033,23 +1033,24 @@
 
       // 获取 用户保存的 格式列
       async getTableUserColumn(tableId, columnId) {
-        this.queryTableUser.tableId = tableId
-        await getTableUserListLanguage(this.queryTableUser).then(({data}) => {
+        let queryTableUser = {
+          userId: this.$store.state.user.name,
+          functionId: this.$route.meta.menuId,
+          tableId: tableId,
+          status: true,
+          languageCode: this.$i18n.locale
+        }
+        await getTableUserListLanguage(queryTableUser).then(({data}) => {
           if (data.rows.length > 0) {
             //this.columnList = []
             switch (columnId) {
               case 1:
-                this.columnList = data.rows
-                break;
-              case 2:
                 this.columnList1 = data.rows
                 break;
-              case 3:
-                this.columnList2 = data.rows
-                break;
-              case 4:
+              case 2:
                 this.columnList3 = data.rows
                 break;
+
             }
 
           } else {
@@ -1061,19 +1062,18 @@
       // 获取 tableDefault 列
       async getColumnList(tableId, columnId) {
         this.queryTable.tableId = tableId
-        await getTableDefaultListLanguage(this.queryTable).then(({data}) => {
+        let   queryTable= {
+          functionId: this.$route.meta.menuId,
+          tableId: tableId,
+          languageCode: this.$i18n.locale
+        }
+        await getTableDefaultListLanguage(queryTable).then(({data}) => {
           if (!data.rows.length == 0) {
             switch (columnId) {
               case 1:
-                this.columnList = data.rows
-                break;
-              case 2:
                 this.columnList1 = data.rows
                 break;
-              case 3:
-                this.columnList2 = data.rows
-                break;
-              case 4:
+              case 2:
                 this.columnList3 = data.rows
                 break;
             }
@@ -1081,13 +1081,15 @@
             // this.showDefault = true
           }
         })
-      }
+
+      },
     },
     created() {
       this.getMultiLanguageList()//刷新按钮
       //获取按钮的权限
       this.getButtonAuthData();
-      this.getTableUserColumn()
+      this.getTableUserColumn('102001001Table1',1)
+      this.getTableUserColumn('102001001Table',2)
     }
   }
 </script>
diff --git a/src/views/modules/purchasingManagement/searchOrderRoll.vue b/src/views/modules/purchasingManagement/searchOrderRoll.vue
index d14b8d7..92ff8ef 100644
--- a/src/views/modules/purchasingManagement/searchOrderRoll.vue
+++ b/src/views/modules/purchasingManagement/searchOrderRoll.vue
@@ -95,7 +95,7 @@
         :show-overflow-tooltip="item.showOverflowTooltip"
         :align="item.align"
         :fixed="item.fixed==''?false:item.fixed"
-        :mid-width="item.columnWidth"
+        :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
           <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
@@ -127,6 +127,13 @@
 </template>
 
 <script>
+  import {
+    saveTableDefaultList,
+    getTableDefaultListLanguage,
+    getTableUserListLanguage,
+    removerDefault,
+    removerUser
+  } from "@/api/table.js"
   import {
     searchOrderRoll,
     searchCRollInfoDetail,
@@ -237,9 +244,9 @@
         columnList: [
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TableOrderNo',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TableOrderNo',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "orderNo",
             headerAlign: "center",
@@ -255,9 +262,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TableOrderDate',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TableOrderDate',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "orderDate",
             headerAlign: "center",
@@ -273,9 +280,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TablePlanReceiptDate',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TablePlanReceiptDate',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "planReceiptDate",
             headerAlign: "center",
@@ -291,9 +298,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TableSupplierID',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TableSupplierID',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "supplierID",
             headerAlign: "center",
@@ -309,9 +316,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TableStatus',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TableStatus',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "status",
             headerAlign: "center",
@@ -327,9 +334,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TableSupplierName',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TableSupplierName',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "supplierName",
             headerAlign: "center",
@@ -345,9 +352,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TableOrderItemNo',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TableOrderItemNo',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "orderItemNo",
             headerAlign: "center",
@@ -363,9 +370,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TablePartNo',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TablePartNo',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "partNo",
             headerAlign: "center",
@@ -381,9 +388,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TablePartDescription',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TablePartDescription',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "partDescription",
             headerAlign: "center",
@@ -399,9 +406,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TableQuantity',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TableQuantity',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "quantity",
             headerAlign: "center",
@@ -417,9 +424,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TableCancelledFlag',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TableCancelledFlag',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "cancelledFlag",
             headerAlign: "center",
@@ -435,9 +442,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TableSAPOrderNo',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TableSAPOrderNo',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "sAPOrderNo",
             headerAlign: "center",
@@ -453,9 +460,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TableSite',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TableSite',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "site",
             headerAlign: "center",
@@ -471,9 +478,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TableCreatedDate',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TableCreatedDate',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "createdDate",
             headerAlign: "center",
@@ -489,9 +496,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TableCreatedBy',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TableCreatedBy',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "createdBy",
             headerAlign: "center",
@@ -507,9 +514,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035TableType',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004TableType',
+            tableId: "102001004Table",
             tableName: "查询订单卷信息主表",
             columnProp: "type",
             headerAlign: "center",
@@ -527,9 +534,9 @@
         columnList2: [
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035Table2RollNo',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004Table2RollNo',
+            tableId: "102001004Table2",
             tableName: "查询订单卷信息明细表",
             columnProp: "rollNo",
             headerAlign: "center",
@@ -545,9 +552,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035Table2RollQty',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004Table2RollQty',
+            tableId: "102001004Table2",
             tableName: "查询订单卷信息明细表",
             columnProp: "rollQty",
             headerAlign: "center",
@@ -563,9 +570,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035Table2SuppDeliveryNote',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004Table2SuppDeliveryNote',
+            tableId: "102001004Table2",
             tableName: "查询订单卷信息明细表",
             columnProp: "suppDeliveryNote",
             headerAlign: "center",
@@ -581,9 +588,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035Table2RollDate',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004Table2RollDate',
+            tableId: "102001004Table2",
             tableName: "查询订单卷信息明细表",
             columnProp: "rollDate",
             headerAlign: "center",
@@ -599,9 +606,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035Table2ExpiredDate',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004Table2ExpiredDate',
+            tableId: "102001004Table2",
             tableName: "查询订单卷信息明细表",
             columnProp: "expiredDate",
             headerAlign: "center",
@@ -617,9 +624,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035Table2CreatedDate',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004Table2CreatedDate',
+            tableId: "102001004Table2",
             tableName: "查询订单卷信息明细表",
             columnProp: "createdDate",
             headerAlign: "center",
@@ -635,9 +642,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035Table2CreatedBy',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004Table2CreatedBy',
+            tableId: "102001004Table2",
             tableName: "查询订单卷信息明细表",
             columnProp: "createdBy",
             headerAlign: "center",
@@ -653,9 +660,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035Table2Status',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004Table2Status',
+            tableId: "102001004Table2",
             tableName: "查询订单卷信息明细表",
             columnProp: "status",
             headerAlign: "center",
@@ -671,9 +678,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035Table2SuppRollNoFlag',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004Table2SuppRollNoFlag',
+            tableId: "102001004Table2",
             tableName: "查询订单卷信息明细表",
             columnProp: "suppRollNoFlag",
             headerAlign: "center",
@@ -689,9 +696,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6035,
-            serialNumber: '6035Table2SuppRollNo',
-            tableId: "6035Table",
+            functionId: 102001004,
+            serialNumber: '102001004Table2SuppRollNo',
+            tableId: "102001004Table2",
             tableName: "查询订单卷信息明细表",
             columnProp: "suppRollNo",
             headerAlign: "center",
@@ -951,11 +958,66 @@
           }
         });
       },
+
+      // 获取 用户保存的 格式列
+      async getTableUserColumn(tableId, columnId) {
+        let queryTableUser = {
+          userId: this.$store.state.user.name,
+          functionId: this.$route.meta.menuId,
+          tableId: tableId,
+          status: true,
+          languageCode: this.$i18n.locale
+        }
+        await getTableUserListLanguage(queryTableUser).then(({data}) => {
+          if (data.rows.length > 0) {
+            //this.columnList = []
+            switch (columnId) {
+              case 1:
+                this.columnList = data.rows
+                break;
+              case 2:
+                this.columnList2 = data.rows
+                break;
+
+            }
+
+          } else {
+            this.getColumnList(tableId, columnId)
+          }
+        })
+
+      },
+      // 获取 tableDefault 列
+      async getColumnList(tableId, columnId) {
+        this.queryTable.tableId = tableId
+        let   queryTable= {
+          functionId: this.$route.meta.menuId,
+          tableId: tableId,
+          languageCode: this.$i18n.locale
+        }
+        await getTableDefaultListLanguage(queryTable).then(({data}) => {
+          if (!data.rows.length == 0) {
+            switch (columnId) {
+              case 1:
+                this.columnList = data.rows
+                break;
+              case 2:
+                this.columnList2 = data.rows
+                break;
+            }
+          } else {
+            // this.showDefault = true
+          }
+        })
+
+      },
     },
     created() {
       //获取按钮的权限
       this.getButtonAuthData();
       this.getMultiLanguageList()//刷新按钮
+      this.getTableUserColumn('102001004Table',1)
+      this.getTableUserColumn('102001004Table2',2)
     }
   }
 </script>
diff --git a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
index e451265..529f60f 100644
--- a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
+++ b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
@@ -358,20 +358,6 @@ export default {
   },
   data() {
     return {
-      visible: false,
-      queryTable: {
-        functionId: this.$route.meta.menuId,
-        tableId: "mainTable",
-        languageCode: this.$i18n.locale
-      },
-      // 用户table 查询参数
-      queryTableUser: {
-        userId: this.$store.state.user.name,
-        functionId: this.$route.meta.menuId,
-        tableId: "mainTable",
-        status: true,
-        languageCode: this.$i18n.locale
-      },
       tagNo: '',
       // 导出 start
       exportData: [],
@@ -1625,7 +1611,12 @@ export default {
     // 获取 tableDefault 列
     async getColumnList(tableId, columnId) {
       this.queryTable.tableId = tableId
-      await getTableDefaultListLanguage(this.queryTable).then(({data}) => {
+      let   queryTable= {
+          functionId: this.$route.meta.menuId,
+          tableId: tableId,
+          languageCode: this.$i18n.locale
+        }
+      await getTableDefaultListLanguage(queryTable).then(({data}) => {
         if (!data.rows.length == 0) {
           switch (columnId) {
             case 1:
diff --git a/src/views/modules/yieldReport/com_show_transformed_roll.vue b/src/views/modules/yieldReport/com_show_transformed_roll.vue
index 6fe6f96..9d9153f 100644
--- a/src/views/modules/yieldReport/com_show_transformed_roll.vue
+++ b/src/views/modules/yieldReport/com_show_transformed_roll.vue
@@ -2,7 +2,7 @@
   <div class="customer-css">
     <el-dialog :title="labels.titleCon" v-drag v-bind="$attrs" v-on="$listeners"
                width="720px" style="height: 485px;" class="customer-dialog">
-      <el-form :inline="true" label-position="top" style="height: 350px;"
+      <el-form :inline="true" label-position="top"  style="height: 360px;"
                label-width="80px">
         <!-- 菜单信息 -->
         <el-row>
@@ -26,12 +26,16 @@
               <el-input v-model="pageData.oriPartDesc" readonly="readonly" style="width: 180px"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="5" >
+            <el-button @click="userSetting" type="primary">{{ buttons.settingTable }}</el-button>
+          </el-col>
         </el-row>
         <!-- 主材料 -->
         <el-form>
           <fieldset class="customer-fieldset" style="width: 695px;">
             <legend>{{labels.wareHouseRollList}}</legend>
-            <el-table height="265"
+            <div style="width: 680px;">
+            <el-table height="255"
               :data="transformPartList"
               border
               v-loading="dataListLoading"
@@ -44,7 +48,7 @@
                 :show-overflow-tooltip="item.showOverflowTooltip"
                 :align="item.align"
                 :fixed="item.fixed==''?false:item.fixed"
-                :width="item.columnWidth"
+                :min-width="item.columnWidth"
                 :label="item.columnLabel">
                 <template slot-scope="scope">
                   <el-input type="number" class="table-input" align="right" v-if="item.columnHidden"
@@ -56,12 +60,15 @@
                 </template>
               </el-table-column>
             </el-table>
+            </div>
           </fieldset>
         </el-form>
       </el-form>
 
 
     </el-dialog>
+    <!-- 动态列    -->
+    <column v-if="visible" ref="column" @refreshData="getTableUserColumn" v-drag></column>
   </div>
 </template>
 
@@ -75,10 +82,32 @@ import {
   searchFunctionButtonList,
 
 } from "@/api/sysLanguage.js"
+import column from "@/views/modules/common/column";
+import {
+  getTableDefaultListLanguage,
+  getTableUserListLanguage,
+} from "@/api/table.js"
 var functionId='C20000002';
 export default {
+  components: {
+    column,
+  },
   data() {
     return {
+      visible: false,
+      queryTable: {
+        functionId: 'C20000002',
+        tableId: "C20000002TransRoll",
+        languageCode: this.$i18n.locale
+      },
+      // 用户table 查询参数
+      queryTableUser: {
+        userId: this.$store.state.user.name,
+        functionId: 'C20000002',
+        tableId: "C20000002TransRoll",
+        status: true,
+        languageCode: this.$i18n.locale
+      },
       labels: {
         titleCon:'已入库卷清单',
         partNo:'物料编码:',
@@ -123,9 +152,9 @@ export default {
       transformPartColumns: [
         {
           userId: this.$store.state.user.name,
-          functionId: 5305,
-          serialNumber: '5305TransRollSortNo',
-          tableId: "5305TransRoll",
+          functionId: 'C20000002',
+          serialNumber: 'C20000002TransRollSortNo',
+          tableId: "C20000002TransRoll",
           tableName: "转换卷号",
           columnProp: "sortNo",
           headerAlign: "center",
@@ -137,13 +166,13 @@ export default {
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: false
+          fixed: ''
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5305,
-          serialNumber: '5305TransRollRollNo',
-          tableId: "5305TransRoll",
+          functionId: 'C20000002',
+          serialNumber: 'C20000002TransRollRollNo',
+          tableId: "C20000002TransRoll",
           tableName: "转换卷号",
           columnProp: "rollNo",
           headerAlign: "center",
@@ -155,13 +184,13 @@ export default {
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: false
+          fixed: ''
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5305,
-          serialNumber: '5305TransRollRollDate',
-          tableId: "5305TransRoll",
+          functionId: 'C20000002',
+          serialNumber: 'C20000002TransRollRollDate',
+          tableId: "C20000002TransRoll",
           tableName: "转换卷号",
           columnProp: "rollDate",
           headerAlign: "center",
@@ -173,13 +202,13 @@ export default {
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: false
+          fixed: ''
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5305,
-          serialNumber: '5305TransRollRollQty',
-          tableId: "5305TransRoll",
+          functionId: 'C20000002',
+          serialNumber: 'C20000002TransRollRollQty',
+          tableId: "C20000002TransRoll",
           tableName: "转换卷号",
           columnProp: "rollQty",
           headerAlign: "center",
@@ -191,13 +220,13 @@ export default {
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: false
+          fixed: ''
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5305,
-          serialNumber: '5305TransRollOriRollNo',
-          tableId: "5305TransRoll",
+          functionId: 'C20000002',
+          serialNumber: 'C20000002TransRollOriRollNo',
+          tableId: "C20000002TransRoll",
           tableName: "转换卷号",
           columnProp: "oriRollNo",
           headerAlign: "center",
@@ -209,13 +238,13 @@ export default {
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: false
+          fixed: ''
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5305,
-          serialNumber: '5305TransRollCreatedDate',
-          tableId: "5305TransRoll",
+          functionId: 'C20000002',
+          serialNumber: 'C20000002TransRollCreatedDate',
+          tableId: "C20000002TransRoll",
           tableName: "转换卷号",
           columnProp: "createdDate",
           headerAlign: "center",
@@ -227,13 +256,13 @@ export default {
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: false
+          fixed: ''
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 5305,
-          serialNumber: '5305TransRollCreatedBy',
-          tableId: "5305TransRoll",
+          functionId: 'C20000002',
+          serialNumber: 'C20000002TransRollCreatedBy',
+          tableId: "C20000002TransRoll",
           tableName: "转换卷号",
           columnProp: "createdBy",
           headerAlign: "center",
@@ -245,7 +274,7 @@ export default {
           columnSortable: false,
           sortLv: 0,
           status: true,
-          fixed: false
+          fixed: ''
         },
       ],
       dataListLoading: false,
@@ -265,6 +294,8 @@ export default {
       this.refreshTransformOrderBomData();
       //刷新当前派工单的信息
       this.refreshPageTableData();
+      this.getTableUserColumn();
+      this.getMultiLanguageList()//刷新按钮
     },
 
     /*关闭modal*/
@@ -318,7 +349,41 @@ export default {
         }
       });
     },
-
+// 打开页面设置
+    userSetting() {
+      this.visible = true;
+      let queryTable = {
+        userId: this.$store.state.user.name,
+        functionId: 'C20000002',
+        tableId:'C20000002TransRoll',
+        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.transformPartColumns = data.rows
+        } else {
+          this.getColumnList()
+        }
+      })
+    },
+    // 获取 tableDefault 列
+    getColumnList() {
+      getTableDefaultListLanguage(this.queryTable).then(({data}) => {
+        if (!data.rows.length == 0) {
+          // this.showDefault = false
+          this.transformPartColumns = data.rows
+        } else {
+          // this.showDefault = true
+        }
+      })
+    },
   },
   created() {
     this.getMultiLanguageList()//刷新按钮
diff --git a/src/views/modules/yieldReport/com_transform_part.vue b/src/views/modules/yieldReport/com_transform_part.vue
index 172e276..ee5be79 100644
--- a/src/views/modules/yieldReport/com_transform_part.vue
+++ b/src/views/modules/yieldReport/com_transform_part.vue
@@ -35,21 +35,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-              <el-form-item class="customer-button">
-                <el-button type="primary" @click="transformRollPartBun" style="margin-left: 10px; margin-bottom: 5px;">
-                  {{buttons.change}}</el-button>
-              </el-form-item>
-            </el-col>
+            <el-form-item class="customer-button">
+              <el-button type="primary" @click="transformRollPartBun" style="margin-left: 10px; margin-bottom: 5px;">
+                {{buttons.change}}</el-button>
+              <el-button @click="userSetting" type="primary">{{ buttons.settingTable }}</el-button>
+            </el-form-item>
+          </el-col>
         </el-row>
         <!-- 主材料 -->
         <el-form>
           <fieldset class="customer-fieldset" style="width: 775px;">
             <legend>{{labels.scanList}}</legend>
+          <div style="width: 775px;">
             <el-table height="220"
-              :data="transformPartList"
-              border
-              v-loading="dataListLoading"
-              style="width: 100%; margin-top: -5px;">
+                      :data="transformPartList"
+                      border
+                      v-loading="dataListLoading"
+                      style="width: 100%; margin-top: -5px;">
               <el-table-column
                 v-for="(item,index) in transformPartColumns" :key="index"
                 :sortable="item.columnSortable"
@@ -58,7 +60,7 @@
                 :show-overflow-tooltip="item.showOverflowTooltip"
                 :align="item.align"
                 :fixed="item.fixed==''?false:item.fixed"
-                :width="item.columnWidth"
+                :min-width="item.columnWidth"
                 :label="item.columnLabel">
                 <template slot-scope="scope">
                   <el-input type="number" class="table-input" align="right" v-if="item.columnHidden"
@@ -70,340 +72,405 @@
                 </template>
               </el-table-column>
             </el-table>
+          </div>
           </fieldset>
         </el-form>
       </el-form>
 
 
     </el-dialog>
+    <!-- 动态列    -->
+    <column v-if="visible" ref="column" @refreshData="getTableUserColumn" v-drag></column>
+
   </div>
 </template>
 
 <script>
-import {
-  getTransformOrderBomData,
-  getTransformRollTable,
-  scanTransformPartRollNo,
-  transformRollPart,
-} from '@/api/yieldReport/com_transform_part.js';
+  import {
+    getTransformOrderBomData,
+    getTransformRollTable,
+    scanTransformPartRollNo,
+    transformRollPart,
+  } from '@/api/yieldReport/com_transform_part.js';
+  import column from "@/views/modules/common/column";
+  import {
+    getTableDefaultListLanguage,
+    getTableUserListLanguage,
+  } from "@/api/table.js"
+  /*打印标签专用的js*/
+  import {
+    printMaterialLabel,
+  } from "@/views/modules/yieldReport/print_roll_label.js";
+  import {
 
-/*打印标签专用的js*/
-import {
-  printMaterialLabel,
-} from "@/views/modules/yieldReport/print_roll_label.js";
-import {
+    searchFunctionButtonList,
 
-  searchFunctionButtonList,
+  } from "@/api/sysLanguage.js"
 
-} from "@/api/sysLanguage.js"
-var functionId='C20000001';
-export default {
-  data() {
-    return {
-      labels: {
-        titleCon:'物料转换',
-        partNo:'物料编码:',
-        partDesc:'物料描述:',
-        oriPartNo:'原物料编码:',
-        oriPartDesc:'原物料描述:',
-        rollNo:'扫描卷号:',
-        scanList:'扫描卷列表',
-        rollNoIsNull:'卷号不能为空!',
-        scanFirst:'请先扫描卷后再试!',
-      },
-      buttons:{
-        change:'转换',
+  var functionId='C20000001';
 
-      },
-      queryButton: {
-        functionId: functionId,
-        table_id: '*',
-        languageCode: this.$i18n.locale,
-        objectType: 'button'
-      },
-      queryLabel: {
-        functionId: functionId,
-        table_id: '*',
-        languageCode: this.$i18n.locale,
-        objectType: 'label'
-      },
-      titleCon: '物料转换',
-      pageData: {
-        site: this.$store.state.user.site,
-        username: this.$store.state.user.name,
-        orderNo: '',
-        itemNo: 0,
-        rollNo: '',
-        oriPartNo: '',
-        oriPartDesc: '',
-        partNo: '',
-        partDesc: '',
-        transType: 'sw-part',
-        status: 'N',
-        reportTime: '',
-      },
-      bomData: {},
-      transformPartList: [],
-      transformPartColumns: [
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5305,
-          serialNumber: '5305TransRollSortNo',
-          tableId: "5305TransRoll",
-          tableName: "转换卷号",
-          columnProp: "sortNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "序号",
-          columnWidth: 60,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
+  export default {
+    components: {
+      column,
+    },
+    data() {
+      return {
+        visible: false,
+        queryTable: {
+          functionId: 'C20000001',
+          tableId: "C20000001TransRoll",
+          languageCode: this.$i18n.locale
         },
-        {
+        // 用户table 查询参数
+        queryTableUser: {
           userId: this.$store.state.user.name,
-          functionId: 5305,
-          serialNumber: '5305TransRollRollNo',
-          tableId: "5305TransRoll",
-          tableName: "转换卷号",
-          columnProp: "rollNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "卷号",
-          columnWidth: 120,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
+          functionId: 'C20000001',
+          tableId: "C20000001TransRoll",
           status: true,
-          fixed: false
+          languageCode: this.$i18n.locale
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5305,
-          serialNumber: '5305TransRollRollQty',
-          tableId: "5305TransRoll",
-          tableName: "转换卷号",
-          columnProp: "rollQty",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "数量",
-          columnWidth: 60,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
+        labels: {
+          titleCon:'物料转换',
+          partNo:'物料编码:',
+          partDesc:'物料描述:',
+          oriPartNo:'原物料编码:',
+          oriPartDesc:'原物料描述:',
+          rollNo:'扫描卷号:',
+          scanList:'扫描卷列表',
+          rollNoIsNull:'卷号不能为空!',
+          scanFirst:'请先扫描卷后再试!',
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5305,
-          serialNumber: '5305TransRollPartNo',
-          tableId: "5305TransRoll",
-          tableName: "转换卷号",
-          columnProp: "partNo",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "物料编码",
-          columnWidth: 100,
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
+        buttons:{
+          change:'转换',
+          settingTable:'设置表格栏位',
         },
-        {
-          userId: this.$store.state.user.name,
-          functionId: 5305,
-          serialNumber: '5305TransRollPartDesc',
-          tableId: "5305TransRoll",
-          tableName: "转换卷号",
-          columnProp: "partDesc",
-          headerAlign: "center",
-          align: "center",
-          columnLabel: "物料描述",
-          columnWidth: '',
-          columnHidden: false,
-          columnImage: false,
-          columnSortable: false,
-          sortLv: 0,
-          status: true,
-          fixed: false
+        queryButton: {
+          functionId: functionId,
+          table_id: '*',
+          languageCode: this.$i18n.locale,
+          objectType: 'button'
         },
-      ],
-      dataListLoading: false,
-    }
-  },
-  methods: {
-    /*初始化页面参数*/
-    init(transformOrder) {
-      //设置参数
-      this.pageData.orderNo = transformOrder.orderNo;
-      this.pageData.itemNo = transformOrder.orderItemNo;
-      this.pageData.rollNo = '';
-      this.pageData.partNo = transformOrder.partNo;
-      this.pageData.partDesc = transformOrder.partDescription;
-      this.pageData.oriPartNo = '';
-      this.pageData.oriPartDesc = '';
-      //获取焦点
-      this.$nextTick(() => {
-        this.$refs.rollNo.focus();
-      })
-      //获取BOM的信息
-      this.refreshTransformOrderBomData();
-      //刷新当前派工单的信息
-      this.refreshPageTableData();
+        queryLabel: {
+          functionId: functionId,
+          table_id: '*',
+          languageCode: this.$i18n.locale,
+          objectType: 'label'
+        },
+        titleCon: '物料转换',
+        pageData: {
+          site: this.$store.state.user.site,
+          username: this.$store.state.user.name,
+          orderNo: '',
+          itemNo: 0,
+          rollNo: '',
+          oriPartNo: '',
+          oriPartDesc: '',
+          partNo: '',
+          partDesc: '',
+          transType: 'sw-part',
+          status: 'N',
+          reportTime: '',
+        },
+        bomData: {},
+        transformPartList: [],
+        transformPartColumns: [
+          {
+            userId: this.$store.state.user.name,
+            functionId: 'C20000001',
+            serialNumber: 'C20000001TransRollSortNo',
+            tableId: "C20000001TransRoll",
+            tableName: "转换卷号",
+            columnProp: "sortNo",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "序号",
+            columnWidth: 60,
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: ''
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 'C20000001',
+            serialNumber: 'C20000001TransRollRollNo',
+            tableId: "C20000001TransRoll",
+            tableName: "转换卷号",
+            columnProp: "rollNo",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "卷号",
+            columnWidth: 120,
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: ''
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 'C20000001',
+            serialNumber: 'C20000001TransRollRollQty',
+            tableId: "C20000001TransRoll",
+            tableName: "转换卷号",
+            columnProp: "rollQty",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "数量",
+            columnWidth: 60,
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: ''
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 'C20000001',
+            serialNumber: 'C20000001TransRollPartNo',
+            tableId: "C20000001TransRoll",
+            tableName: "转换卷号",
+            columnProp: "partNo",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "物料编码",
+            columnWidth: 100,
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: ''
+          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 'C20000001',
+            serialNumber: 'C20000001TransRollPartDesc',
+            tableId: "C20000001TransRoll",
+            tableName: "转换卷号",
+            columnProp: "partDesc",
+            headerAlign: "center",
+            align: "center",
+            columnLabel: "物料描述",
+            columnWidth: '',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: ''
+          },
+        ],
+        dataListLoading: false,
+      }
     },
+    methods: {
+      /*初始化页面参数*/
+      init(transformOrder) {
+        //设置参数
+        this.pageData.orderNo = transformOrder.orderNo;
+        this.pageData.itemNo = transformOrder.orderItemNo;
+        this.pageData.rollNo = '';
+        this.pageData.partNo = transformOrder.partNo;
+        this.pageData.partDesc = transformOrder.partDescription;
+        this.pageData.oriPartNo = '';
+        this.pageData.oriPartDesc = '';
+        //获取焦点
+        this.$nextTick(() => {
+          this.$refs.rollNo.focus();
+        })
+        //获取BOM的信息
+        this.refreshTransformOrderBomData();
+        //刷新当前派工单的信息
+        this.refreshPageTableData();
+        this.getTableUserColumn();
+        this.getMultiLanguageList()//刷新按钮
+      },
 
-    /*关闭modal*/
-    closeDialog(){
-      this.$emit('update:visible', false);
-    },
+      /*关闭modal*/
+      closeDialog(){
+        this.$emit('update:visible', false);
+      },
 
-    /*刷新当前的页面参数*/
-    refreshPageTableData(){
-      //刷新材料的数据
-      this.refreshTransformRollTable();
-    },
+      /*刷新当前的页面参数*/
+      refreshPageTableData(){
+        //刷新材料的数据
+        this.refreshTransformRollTable();
+      },
 
-    //刷新当前卷的时间数据
-    refreshTransformRollTable(){
-      //清空卷号
-      this.pageData.rollNo = '';
-      getTransformRollTable(this.pageData).then(({data}) => {
-        this.transformPartList = data.rows;
-      });
-    },
+      //刷新当前卷的时间数据
+      refreshTransformRollTable(){
+        //清空卷号
+        this.pageData.rollNo = '';
+        getTransformRollTable(this.pageData).then(({data}) => {
+          this.transformPartList = data.rows;
+        });
+      },
 
-    //刷新当前卷的时间数据
-    refreshTransformOrderBomData(){
-      //查询当前的页面表格
-      getTransformOrderBomData(this.pageData).then(({data}) => {
-        this.bomData = data.row;
-        //参数赋值
-        this.pageData.oriPartNo = data.row.partNo;
-        this.pageData.oriPartDesc = data.row.partDesc;
-      });
-    },
+      //刷新当前卷的时间数据
+      refreshTransformOrderBomData(){
+        //查询当前的页面表格
+        getTransformOrderBomData(this.pageData).then(({data}) => {
+          this.bomData = data.row;
+          //参数赋值
+          this.pageData.oriPartNo = data.row.partNo;
+          this.pageData.oriPartDesc = data.row.partDesc;
+        });
+      },
 
-    //扫描卷号
-    scanTransformOrderRollNo(){
-      //清空空格
-      this.pageData.rollNo = this.pageData.rollNo.trim();
-      //判断扫描是否存在
-      if(this.pageData.rollNo == null || this.pageData.rollNo == ''){
-        this.$message.error(this.labels.rollNoIsNull)
-        return false;
-      }
-      scanTransformPartRollNo(this.pageData).then(({data}) => {
-        //判断操作是否成功
-        if(data.code == 500){
-          this.$message.error(data.msg);
-          //二次扫描使用
-          this.pageData.rollNo = '';
-        }else{
-          //二次扫描使用
-          this.pageData.rollNo = '';
-          //刷新页面的数据
-          this.refreshTransformRollTable();
-          //获取焦点
-          this.$nextTick(() => {
-            this.$refs.rollNo.focus();
-          })
+      //扫描卷号
+      scanTransformOrderRollNo(){
+        //清空空格
+        this.pageData.rollNo = this.pageData.rollNo.trim();
+        //判断扫描是否存在
+        if(this.pageData.rollNo == null || this.pageData.rollNo == ''){
+          this.$message.error(this.labels.rollNoIsNull)
+          return false;
         }
-      });
-    },
+        scanTransformPartRollNo(this.pageData).then(({data}) => {
+          //判断操作是否成功
+          if(data.code == 500){
+            this.$message.error(data.msg);
+            //二次扫描使用
+            this.pageData.rollNo = '';
+          }else{
+            //二次扫描使用
+            this.pageData.rollNo = '';
+            //刷新页面的数据
+            this.refreshTransformRollTable();
+            //获取焦点
+            this.$nextTick(() => {
+              this.$refs.rollNo.focus();
+            })
+          }
+        });
+      },
 
-    /*执行转换卷操作*/
-    transformRollPartBun(){
-      //判断是否存在卷
-      if(this.transformPartList.length == 0){
-        this.$message.error(this.labels.scanFirst);
-        return false;
-      }
-      //验证通过执行转换卷
-      transformRollPart(this.pageData).then(({data}) => {
-        //判断操作是否成功
-        if(data.code == 500){
-          this.$message.error(data.msg);
-        }else{
-          this.$message.success(data.msg);
-          //二次扫描使用
-          this.pageData.rollNo = '';
-          //刷新页面的数据
-          this.refreshTransformRollTable();
-          //打印材料卷标签
-          let printList = data.printList;
-          printMaterialLabel(printList);
+      /*执行转换卷操作*/
+      transformRollPartBun(){
+        //判断是否存在卷
+        if(this.transformPartList.length == 0){
+          this.$message.error(this.labels.scanFirst);
+          return false;
         }
-      });
-    },
+        //验证通过执行转换卷
+        transformRollPart(this.pageData).then(({data}) => {
+          //判断操作是否成功
+          if(data.code == 500){
+            this.$message.error(data.msg);
+          }else{
+            this.$message.success(data.msg);
+            //二次扫描使用
+            this.pageData.rollNo = '';
+            //刷新页面的数据
+            this.refreshTransformRollTable();
+            //打印材料卷标签
+            let printList = data.printList;
+            printMaterialLabel(printList);
+          }
+        });
+      },
 //多语言
-    getMultiLanguageList() {
-      //首先查询当前按钮的多语言
-      searchFunctionButtonList(this.queryButton).then(({data}) => {
-        if (JSON.stringify(data.data) != '{}') {
-          this.buttons = data.data
-        } else {
-          // saveButtonList(this.buttonList).then(({data}) => {
-          // })
-        }
-      });
-      //其次查询当前标签的多语言
-      searchFunctionButtonList(this.queryLabel).then(({data}) => {
-        if (JSON.stringify(data.data) != '{}') {
-          this.labels = data.data
-        } else {
-          // saveButtonList(this.buttonList).then(({data}) => {
-          // })
+      getMultiLanguageList() {
+        //首先查询当前按钮的多语言
+        searchFunctionButtonList(this.queryButton).then(({data}) => {
+          if (JSON.stringify(data.data) != '{}') {
+            this.buttons = data.data
+          } else {
+            // saveButtonList(this.buttonList).then(({data}) => {
+            // })
+          }
+        });
+        //其次查询当前标签的多语言
+        searchFunctionButtonList(this.queryLabel).then(({data}) => {
+          if (JSON.stringify(data.data) != '{}') {
+            this.labels = data.data
+          } else {
+            // saveButtonList(this.buttonList).then(({data}) => {
+            // })
+          }
+        });
+      },
+      // 打开页面设置
+      userSetting() {
+        this.visible = true;
+        let queryTable = {
+          userId: this.$store.state.user.name,
+          functionId: 'C20000001',
+          tableId:'C20000001TransRoll',
+          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.transformPartColumns = data.rows
+          } else {
+            this.getColumnList()
+          }
+        })
+      },
+      // 获取 tableDefault 列
+      getColumnList() {
+        getTableDefaultListLanguage(this.queryTable).then(({data}) => {
+          if (!data.rows.length == 0) {
+            // this.showDefault = false
+            this.transformPartColumns = data.rows
+          } else {
+            // this.showDefault = true
+          }
+        })
+      },
     },
+    created() {
 
-  },
-  created() {
 
-    this.getMultiLanguageList()//刷新按钮
+      // this.getMultiLanguageList()//刷新按钮
+      // this.getTableUserColumn()
+    }
   }
-}
 
 </script>
 
 <style scoped lang="scss">
-/*调节页面button和input的上下间距*/
-.customer-css .customer-button{
-  margin-top: 25px;
-}
+  /*调节页面button和input的上下间距*/
+  .customer-css .customer-button{
+    margin-top: 25px;
+  }
 
-/*调节样式*/
-.customer-item{
-  margin-top: -10px;
-}
-/*fieldset下table的样式*/
-.customer-fieldset /deep/ .el-table__header th.is-leaf{
-  line-height: 16px;
-}
+  /*调节样式*/
+  .customer-item{
+    margin-top: -10px;
+  }
+  /*fieldset下table的样式*/
+  .customer-fieldset /deep/ .el-table__header th.is-leaf{
+    line-height: 16px;
+  }
 
-/deep/ .customer-tab .el-tabs__content{
-  padding: 0px !important;
-}
+  /deep/ .customer-tab .el-tabs__content{
+    padding: 0px !important;
+  }
 
-/*table中input 修改样式*/
-/deep/ div.table-input {
-  padding: 0px 0px;
-  height: 25px !important;
-}
-/*table中input*/
-div.table-input /deep/ input.el-input__inner{
-  padding: 0px 0px;
-  height: 23px !important;
-  text-align: right;
-}
+  /*table中input 修改样式*/
+  /deep/ div.table-input {
+    padding: 0px 0px;
+    height: 25px !important;
+  }
+  /*table中input*/
+  div.table-input /deep/ input.el-input__inner{
+    padding: 0px 0px;
+    height: 23px !important;
+    text-align: right;
+  }
 
 
 </style>
diff --git a/src/views/modules/yieldReport/order_transform_part.vue b/src/views/modules/yieldReport/order_transform_part.vue
index e1ecafe..7730aad 100644
--- a/src/views/modules/yieldReport/order_transform_part.vue
+++ b/src/views/modules/yieldReport/order_transform_part.vue
@@ -106,10 +106,31 @@ import {
   searchFunctionButtonList,
 
 } from "@/api/sysLanguage.js"
+import {
+  saveTableDefaultList,
+  saveTableUser,
+  getTableDefaultListLanguage,
+  getTableUserListLanguage,
+  removerDefault,
+  removerUser
+} from "@/api/table.js"
 var functionId='102001007';
 export default {
   data() {
     return {
+      queryTable: {
+        functionId: this.$route.meta.menuId,
+        tableId: "102001007Table",
+        languageCode: this.$i18n.locale
+      },
+      // 用户table 查询参数
+      queryTableUser: {
+        userId: this.$store.state.user.name,
+        functionId: this.$route.meta.menuId,
+        tableId: "102001007Table",
+        status: true,
+        languageCode: this.$i18n.locale
+      },
       labels: {
         site:'工厂编码:',
         orderNo:'生产订单号:',
@@ -162,10 +183,10 @@ export default {
       transformOrderColumns: [
         {
           userId: this.$store.state.user.name,
-          functionId: 6033,
-          serialNumber: '6033TableOrderNo',
-          tableId: "6033Table",
-          tableName: "查询SAP分卷订单表",
+          functionId: 102001007,
+          serialNumber: '102001007TableOrderNo',
+          tableId: "102001007Table",
+          tableName: "特殊订单表",
           columnProp: "orderNo",
           headerAlign: "center",
           align: "left",
@@ -180,10 +201,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 6033,
-          serialNumber: '6033TableOrderDate',
-          tableId: "6033Table",
-          tableName: "查询SAP分卷订单表",
+          functionId: 102001007,
+          serialNumber: '102001007TableOrderDate',
+          tableId: "102001007Table",
+          tableName: "特殊订单表",
           columnProp: "orderDate",
           headerAlign: "center",
           align: "left",
@@ -198,10 +219,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 6033,
-          serialNumber: '6033TablePlanReceiptDate',
-          tableId: "6033Table",
-          tableName: "查询SAP分卷订单表",
+          functionId: 102001007,
+          serialNumber: '102001007TablePlanReceiptDate',
+          tableId: "102001007Table",
+          tableName: "特殊订单表",
           columnProp: "planReceiptDate",
           headerAlign: "center",
           align: "left",
@@ -216,10 +237,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 6033,
-          serialNumber: '6033TableStatus',
-          tableId: "6033Table",
-          tableName: "查询SAP分卷订单表",
+          functionId: 102001007,
+          serialNumber: '102001007TableStatus',
+          tableId: "102001007Table",
+          tableName: "特殊订单表",
           columnProp: "status",
           headerAlign: "center",
           align: "left",
@@ -234,10 +255,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 6033,
-          serialNumber: '6033TableOrderItemNo',
-          tableId: "6033Table",
-          tableName: "查询SAP分卷订单表",
+          functionId: 102001007,
+          serialNumber: '102001007TableOrderItemNo',
+          tableId: "102001007Table",
+          tableName: "特殊订单表",
           columnProp: "orderItemNo",
           headerAlign: "center",
           align: "left",
@@ -252,10 +273,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 6033,
-          serialNumber: '6033TablePartNo',
-          tableId: "6033Table",
-          tableName: "查询SAP分卷订单表",
+          functionId: 102001007,
+          serialNumber: '102001007TablePartNo',
+          tableId: "102001007Table",
+          tableName: "特殊订单表",
           columnProp: "partNo",
           headerAlign: "center",
           align: "left",
@@ -270,10 +291,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 6033,
-          serialNumber: '6033TablePartDescription',
-          tableId: "6033Table",
-          tableName: "查询SAP分卷订单表",
+          functionId: 102001007,
+          serialNumber: '102001007TablePartDescription',
+          tableId: "102001007Table",
+          tableName: "特殊订单表",
           columnProp: "partDescription",
           headerAlign: "center",
           align: "left",
@@ -288,10 +309,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 6033,
-          serialNumber: '6033TableQuantity',
-          tableId: "6033Table",
-          tableName: "查询SAP分卷订单表",
+          functionId: 102001007,
+          serialNumber: '102001007TableQuantity',
+          tableId: "102001007Table",
+          tableName: "特殊订单表",
           columnProp: "quantity",
           headerAlign: "center",
           align: "right",
@@ -306,10 +327,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 6033,
-          serialNumber: '6033TableCancelledFlag',
-          tableId: "6033Table",
-          tableName: "查询SAP分卷订单表",
+          functionId: 102001007,
+          serialNumber: '102001007TableCancelledFlag',
+          tableId: "102001007Table",
+          tableName: "特殊订单表",
           columnProp: "cancelledFlag",
           headerAlign: "center",
           align: "left",
@@ -324,10 +345,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 6033,
-          serialNumber: '6033TableSAPOrderNo',
-          tableId: "6033Table",
-          tableName: "查询SAP分卷订单表",
+          functionId: 102001007,
+          serialNumber: '102001007TableSAPOrderNo',
+          tableId: "102001007Table",
+          tableName: "特殊订单表",
           columnProp: "sAPOrderNo",
           headerAlign: "center",
           align: "left",
@@ -342,10 +363,10 @@ export default {
         },
         {
           userId: this.$store.state.user.name,
-          functionId: 6033,
-          serialNumber: '6033TableSite',
-          tableId: "6033Table",
-          tableName: "查询SAP分卷订单表",
+          functionId: 102001007,
+          serialNumber: '102001007TableSite',
+          tableId: "102001007Table",
+          tableName: "特殊订单表",
           columnProp: "site",
           headerAlign: "center",
           align: "left",
@@ -441,12 +462,34 @@ export default {
         }
       });
     },
-
+    // 获取 用户保存的 格式列
+    getTableUserColumn() {
+      getTableUserListLanguage(this.queryTableUser).then(({data}) => {
+        if (data.rows.length > 0) {
+          //this.columnList = []
+          this.transformOrderColumns = data.rows
+        } else {
+          this.getColumnList()
+        }
+      })
+    },
+    // 获取 tableDefault 列
+    getColumnList() {
+      getTableDefaultListLanguage(this.queryTable).then(({data}) => {
+        if (!data.rows.length == 0) {
+          // this.showDefault = false
+          this.transformOrderColumns = data.rows
+        } else {
+          // this.showDefault = true
+        }
+      })
+    },
 
   },
   created() {
 
     this.getMultiLanguageList()//刷新按钮
+    this.getTableUserColumn()
     //不查询
   }
 }