diff --git a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
index 633542c..f8762da 100644
--- a/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
+++ b/src/views/modules/purchasingManagement/beginMaterialSlittedSet.vue
@@ -79,7 +79,7 @@
   </el-form>
   <el-tabs v-model="activeName" style="font-size: 12px"  class="customer-tab" type="border-card">
     <el-tab-pane :label="labels.toRoll" name="first">
-      <div style="width: 1000px;margin-top: 0px;">
+      <div style="width: 100%;margin-top: 0px;">
         <div style="width: 100%;float: left">
           <el-table
             :height="height"
@@ -95,7 +95,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">
                 <span v-if="!item.columnHidden"> {{scope.row[item.columnProp]}}</span>
@@ -124,7 +124,7 @@
       </div>
     </el-tab-pane>
     <el-tab-pane :label="labels.hasRoll" name="second">
-      <div style="width: 1000px;margin-top: 0px">
+      <div style="margin-top: 0px">
         <el-table
           :height="height"
           :data="dataList3"
@@ -179,6 +179,13 @@
 </template>
 
 <script>
+  import {
+    saveTableDefaultList,
+    getTableDefaultListLanguage,
+    getTableUserListLanguage,
+    removerDefault,
+    removerUser
+  } from "@/api/table.js"
   import {
     getPartNoDetail,
     checkCustomerID,
@@ -211,6 +218,20 @@
     },
     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
+        },
         height: 200,
         modelFlag: false,
         modelFlag2: false,
@@ -252,249 +273,13 @@
         dataList3: [],
         dataList1: [],
         dataListLoading: false,
-        columnList: [
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034TableOrderNo',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单表",
-            columnProp: "orderNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "采购订单号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034TableOrderDate',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单表",
-            columnProp: "orderDate",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "订单日期",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034TablePlanReceiptDate',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单表",
-            columnProp: "planReceiptDate",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "要求交货日期",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034TableSupplierID',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单表",
-            columnProp: "supplierID",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "供应商编码",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034TableStatus',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单表",
-            columnProp: "status",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "订单状态",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 70
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034TableSupplierName',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单表",
-            columnProp: "supplierName",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "供应商名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 300
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034TableOrderItemNo',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单表",
-            columnProp: "orderItemNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "订单序号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 70
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034TablePartNo',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单表",
-            columnProp: "partNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "物料编码",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 160
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034TablePartDescription',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单表",
-            columnProp: "partDescription",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "物料名称",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 300
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034TableQuantity',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单表",
-            columnProp: "quantity",
-            headerAlign: "center",
-            align: "right",
-            columnLabel: "订单数量",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034TableCancelledFlag',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单表",
-            columnProp: "cancelledFlag",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "是否取消",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 70
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034TableSAPOrderNo',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单表",
-            columnProp: "sAPOrderNo",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "SAP订单标识号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 120
-          },
-          {
-            userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034TableSite',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单表",
-            columnProp: "site",
-            headerAlign: "center",
-            align: "left",
-            columnLabel: "工厂编号",
-            columnHidden: false,
-            columnImage: false,
-            columnSortable: false,
-            sortLv: 0,
-            status: true,
-            fixed: '',
-            columnWidth: 70
-          }
-        ],
         columnList1: [
           {
             userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034Table1Number',
-            tableId: "6034Table1",
-            tableName: "查询SAP采购订单待分卷左表",
+            functionId: 102001001,
+            serialNumber: '102001001Table1Number',
+            tableId: "102001001Table1",
+            tableName: "期初材料分卷待分卷表",
             columnProp: "number",
             headerAlign: "center",
             align: "right",
@@ -509,10 +294,10 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034Table1RollQty',
-            tableId: "6034Table1",
-            tableName: "查询SAP采购订单待分卷左表",
+            functionId: 102001001,
+            serialNumber: '102001001Table1RollQty',
+            tableId: "102001001Table1",
+            tableName: "期初材料分卷待分卷表",
             columnProp: "rollQty",
             headerAlign: "center",
             align: "right",
@@ -527,10 +312,10 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034Table1RollNumber',
-            tableId: "6034Table1",
-            tableName: "查询SAP采购订单待分卷左表",
+            functionId: 102001001,
+            serialNumber: '102001001Table1RollNumber',
+            tableId: "102001001Table1",
+            tableName: "期初材料分卷待分卷表",
             columnProp: "rollNumber",
             headerAlign: "center",
             align: "left",
@@ -545,10 +330,10 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034Table1ALLRollQty',
-            tableId: "6034Table1",
-            tableName: "查询SAP采购订单待分卷左表",
+            functionId: 102001001,
+            serialNumber: '102001001Table1ALLRollQty',
+            tableId: "102001001Table1",
+            tableName: "期初材料分卷待分卷表",
             columnProp: "allRollQty",
             headerAlign: "center",
             align: "left",
@@ -565,10 +350,10 @@
         columnList3: [
           {
             userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034Table3RollNo',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单已分卷表",
+            functionId: 102001001,
+            serialNumber: '102001001Table3RollNo',
+            tableId: "102001001Table",
+            tableName: "期初材料分卷已分卷表",
             columnProp: "rollNo",
             headerAlign: "center",
             align: "left",
@@ -583,10 +368,10 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034Table3RollQty',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单已分卷表",
+            functionId: 102001001,
+            serialNumber: '102001001Table3RollQty',
+            tableId: "102001001Table",
+            tableName: "期初材料分卷已分卷表",
             columnProp: "rollQty",
             headerAlign: "center",
             align: "right",
@@ -601,10 +386,10 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034Table3SuppDeliveryNote',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单已分卷表",
+            functionId: 102001001,
+            serialNumber: '102001001Table3SuppDeliveryNote',
+            tableId: "102001001Table",
+            tableName: "期初材料分卷已分卷表",
             columnProp: "suppDeliveryNote",
             headerAlign: "center",
             align: "left",
@@ -619,10 +404,10 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034Table3RollDate',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单已分卷表",
+            functionId: 102001001,
+            serialNumber: '102001001Table3RollDate',
+            tableId: "102001001Table",
+            tableName: "期初材料分卷已分卷表",
             columnProp: "rollDate",
             headerAlign: "center",
             align: "left",
@@ -637,10 +422,10 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034Table3CreatedDate',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单已分卷表",
+            functionId: 102001001,
+            serialNumber: '102001001Table3CreatedDate',
+            tableId: "102001001Table",
+            tableName: "期初材料分卷已分卷表",
             columnProp: "createdDate",
             headerAlign: "center",
             align: "left",
@@ -655,10 +440,10 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034Table3CreatedBy',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单已分卷表",
+            functionId: 102001001,
+            serialNumber: '102001001Table3CreatedBy',
+            tableId: "102001001Table",
+            tableName: "期初材料分卷已分卷表",
             columnProp: "createdBy",
             headerAlign: "center",
             align: "left",
@@ -673,10 +458,10 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034Table3SuppRollNoFlag',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单已分卷表",
+            functionId: 102001001,
+            serialNumber: '102001001Table3SuppRollNoFlag',
+            tableId: "102001001Table",
+            tableName: "期初材料分卷已分卷表",
             columnProp: "suppRollNoFlag",
             headerAlign: "center",
             align: "left",
@@ -691,10 +476,10 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6034,
-            serialNumber: '6034Table3SuppRollNo',
-            tableId: "6034Table",
-            tableName: "查询SAP采购订单已分卷表",
+            functionId: 102001001,
+            serialNumber: '102001001Table3SuppRollNo',
+            tableId: "102001001Table",
+            tableName: "期初材料分卷已分卷表",
             columnProp: "suppRollNo",
             headerAlign: "center",
             align: "left",
@@ -1196,6 +981,7 @@
           }
         )
       },
+
       getReferenceData(){
         let inData = {
           site: this.dataForm.site,
@@ -1240,16 +1026,68 @@
           if (data.code == 0) {
             this.labels = data.data
           } else {
-            // saveButtonList(this.buttonList).then(({data}) => {
-            // })
+
           }
         });
       },
+
+      // 获取 用户保存的 格式列
+      async getTableUserColumn(tableId, columnId) {
+        this.queryTableUser.tableId = tableId
+        await getTableUserListLanguage(this.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:
+                this.columnList3 = data.rows
+                break;
+            }
+
+          } else {
+            this.getColumnList(tableId, columnId)
+          }
+        })
+
+      },
+      // 获取 tableDefault 列
+      async getColumnList(tableId, columnId) {
+        this.queryTable.tableId = tableId
+        await getTableDefaultListLanguage(this.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:
+                this.columnList3 = data.rows
+                break;
+            }
+          } else {
+            // this.showDefault = true
+          }
+        })
+      }
     },
     created() {
       this.getMultiLanguageList()//刷新按钮
       //获取按钮的权限
       this.getButtonAuthData();
+      this.getTableUserColumn()
     }
   }
 </script>
diff --git a/src/views/modules/purchasingManagement/rollOtherOutKu.vue b/src/views/modules/purchasingManagement/rollOtherOutKu.vue
index 7f5426c..1dd1192 100644
--- a/src/views/modules/purchasingManagement/rollOtherOutKu.vue
+++ b/src/views/modules/purchasingManagement/rollOtherOutKu.vue
@@ -420,7 +420,7 @@
         })
       },
       // 获取 tableDefault 列
-      getColumnList() {
+      getColumnList(tableId) {
         getTableDefaultListLanguage(this.queryTable).then(({data}) => {
           if (!data.rows.length == 0) {
             // this.showDefault = false
diff --git a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
index b29f1cc..ddec8de 100644
--- a/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
+++ b/src/views/modules/purchasingManagement/searchSAPPurchaseOrder.vue
@@ -324,6 +324,13 @@
     searchFunctionButtonList,
 
   } from "@/api/sysLanguage.js"
+  import {
+    saveTableDefaultList,
+    getTableDefaultListLanguage,
+    getTableUserListLanguage,
+    removerDefault,
+    removerUser
+  } from "@/api/table.js"
   var functionId='102001002';
   export default {
     //查询-SAP采购订单
@@ -342,10 +349,24 @@
     },
     data() {
       return {
-        tagNo:'',
+        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: [],
-        exportName: "SAP采购订单"+this.dayjs().format('YYYYMMDDHHmmss'),
+        exportName: "SAP采购订单" + this.dayjs().format('YYYYMMDDHHmmss'),
         exportHeader: ["SAP采购订单"],
         exportFooter: [],
         // 导出 end
@@ -364,9 +385,9 @@
           user: this.$store.state.user.name
         },
         saveData: {
-          site:'',
-          rollNo:'',
-          suppRollNo:'',
+          site: '',
+          rollNo: '',
+          suppRollNo: '',
         },
         dataForm: {
           site: '',
@@ -386,10 +407,10 @@
           fGPartNo: '',
           referencePartDesc: '',
           checked: true,
-          referenceSupplierID:'',
-          referenceSupplierName:'',
+          referenceSupplierID: '',
+          referenceSupplierName: '',
           XX: '',
-          suppRollNo:'',
+          suppRollNo: '',
         },
         sum1: '',
         sum2: '',
@@ -403,9 +424,9 @@
         columnList: [
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032TableOrderNo',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002TableOrderNo',
+            tableId: "102001002Table",
             tableName: "查询SAP采购订单表",
             columnProp: "orderNo",
             headerAlign: "center",
@@ -421,9 +442,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032TableOrderDate',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002TableOrderDate',
+            tableId: "102001002Table",
             tableName: "查询SAP采购订单表",
             columnProp: "orderDate",
             headerAlign: "center",
@@ -439,9 +460,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032TablePlanReceiptDate',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002TablePlanReceiptDate',
+            tableId: "102001002Table",
             tableName: "查询SAP采购订单表",
             columnProp: "planReceiptDate",
             headerAlign: "center",
@@ -457,9 +478,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032TableSupplierID',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002TableSupplierID',
+            tableId: "102001002Table",
             tableName: "查询SAP采购订单表",
             columnProp: "supplierID",
             headerAlign: "center",
@@ -475,9 +496,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032TableStatus',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002TableStatus',
+            tableId: "102001002Table",
             tableName: "查询SAP采购订单表",
             columnProp: "status",
             headerAlign: "center",
@@ -493,9 +514,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032TableSupplierName',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002TableSupplierName',
+            tableId: "102001002Table",
             tableName: "查询SAP采购订单表",
             columnProp: "supplierName",
             headerAlign: "center",
@@ -511,9 +532,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032TableOrderItemNo',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002TableOrderItemNo',
+            tableId: "102001002Table",
             tableName: "查询SAP采购订单表",
             columnProp: "orderItemNo",
             headerAlign: "center",
@@ -529,9 +550,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032TablePartNo',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002TablePartNo',
+            tableId: "102001002Table",
             tableName: "查询SAP采购订单表",
             columnProp: "partNo",
             headerAlign: "center",
@@ -547,9 +568,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032TablePartDescription',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002TablePartDescription',
+            tableId: "102001002Table",
             tableName: "查询SAP采购订单表",
             columnProp: "partDescription",
             headerAlign: "center",
@@ -565,9 +586,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032TableQuantity',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002TableQuantity',
+            tableId: "102001002Table",
             tableName: "查询SAP采购订单表",
             columnProp: "quantity",
             headerAlign: "center",
@@ -583,9 +604,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032TableCancelledFlag',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002TableCancelledFlag',
+            tableId: "102001002Table",
             tableName: "查询SAP采购订单表",
             columnProp: "cancelledFlag",
             headerAlign: "center",
@@ -601,9 +622,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032TableSAPOrderNo',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002TableSAPOrderNo',
+            tableId: "102001002Table",
             tableName: "查询SAP采购订单表",
             columnProp: "sAPOrderNo",
             headerAlign: "center",
@@ -619,9 +640,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032TableSite',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002TableSite',
+            tableId: "102001002Table",
             tableName: "查询SAP采购订单表",
             columnProp: "site",
             headerAlign: "center",
@@ -639,9 +660,9 @@
         columnList1: [
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table1Number',
-            tableId: "6032Table1",
+            functionId: 102001002,
+            serialNumber: '102001002Table1Number',
+            tableId: "102001002Table1",
             tableName: "查询SAP采购订单待分卷左表",
             columnProp: "number",
             headerAlign: "center",
@@ -657,9 +678,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table1RollQty',
-            tableId: "6032Table1",
+            functionId: 102001002,
+            serialNumber: '102001002Table1RollQty',
+            tableId: "102001002Table1",
             tableName: "查询SAP采购订单待分卷左表",
             columnProp: "rollQty",
             headerAlign: "center",
@@ -675,9 +696,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table1RollNumber',
-            tableId: "6032Table1",
+            functionId: 102001002,
+            serialNumber: '102001002Table1RollNumber',
+            tableId: "102001002Table1",
             tableName: "查询SAP采购订单待分卷左表",
             columnProp: "rollNumber",
             headerAlign: "center",
@@ -693,9 +714,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table1ALLRollQty',
-            tableId: "6032Table1",
+            functionId: 102001002,
+            serialNumber: '102001002Table1ALLRollQty',
+            tableId: "102001002Table1",
             tableName: "查询SAP采购订单待分卷左表",
             columnProp: "allRollQty",
             headerAlign: "center",
@@ -713,9 +734,9 @@
         columnList2: [
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table2PartNo',
-            tableId: "6032Table2",
+            functionId: 102001002,
+            serialNumber: '102001002Table2PartNo',
+            tableId: "102001002Table2",
             tableName: "查询SAP采购订单待分卷右表",
             columnProp: "partNo",
             headerAlign: "center",
@@ -731,9 +752,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table2PartDescription',
-            tableId: "6032Table2",
+            functionId: 102001002,
+            serialNumber: '102001002Table2PartDescription',
+            tableId: "102001002Table2",
             tableName: "查询SAP采购订单待分卷右表",
             columnProp: "partDescription",
             headerAlign: "center",
@@ -749,9 +770,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table2OrderItemNo',
-            tableId: "6032Table2",
+            functionId: 102001002,
+            serialNumber: '102001002Table2OrderItemNo',
+            tableId: "102001002Table2",
             tableName: "查询SAP采购订单待分卷右表",
             columnProp: "orderItemNo",
             headerAlign: "center",
@@ -767,9 +788,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table2Quantity',
-            tableId: "6032Table2",
+            functionId: 102001002,
+            serialNumber: '102001002Table2Quantity',
+            tableId: "102001002Table2",
             tableName: "查询SAP采购订单待分卷右表",
             columnProp: "quantity",
             headerAlign: "center",
@@ -787,9 +808,9 @@
         columnList3: [
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table3RollNo',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002Table3RollNo',
+            tableId: "102001002Table3",
             tableName: "查询SAP采购订单已分卷表",
             columnProp: "rollNo",
             headerAlign: "center",
@@ -805,9 +826,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table3RollQty',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002Table3RollQty',
+            tableId: "102001002Table3",
             tableName: "查询SAP采购订单已分卷表",
             columnProp: "rollQty",
             headerAlign: "center",
@@ -823,9 +844,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table3SuppDeliveryNote',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002Table3SuppDeliveryNote',
+            tableId: "102001002Table3",
             tableName: "查询SAP采购订单已分卷表",
             columnProp: "suppDeliveryNote",
             headerAlign: "center",
@@ -841,9 +862,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table3RollDate',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002Table3RollDate',
+            tableId: "102001002Table3",
             tableName: "查询SAP采购订单已分卷表",
             columnProp: "rollDate",
             headerAlign: "center",
@@ -859,9 +880,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table3CreatedDate',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002Table3CreatedDate',
+            tableId: "102001002Table3",
             tableName: "查询SAP采购订单已分卷表",
             columnProp: "createdDate",
             headerAlign: "center",
@@ -877,9 +898,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table3CreatedBy',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002Table3CreatedBy',
+            tableId: "102001002Table3",
             tableName: "查询SAP采购订单已分卷表",
             columnProp: "createdBy",
             headerAlign: "center",
@@ -895,9 +916,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table3SuppRollNoFlag',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002Table3SuppRollNoFlag',
+            tableId: "102001002Table3",
             tableName: "查询SAP采购订单已分卷表",
             columnProp: "suppRollNoFlag",
             headerAlign: "center",
@@ -913,9 +934,9 @@
           },
           {
             userId: this.$store.state.user.name,
-            functionId: 6032,
-            serialNumber: '6032Table3SuppRollNo',
-            tableId: "6032Table",
+            functionId: 102001002,
+            serialNumber: '102001002Table3SuppRollNo',
+            tableId: "102001002Table3",
             tableName: "查询SAP采购订单已分卷表",
             columnProp: "suppRollNo",
             headerAlign: "center",
@@ -936,74 +957,74 @@
         menuId: this.$route.meta.menuId,
         //this.labels
         labels: {
-          site:'工厂编码:',
-          coNo:'采购订单号:',
-          orderDate:'订单日期',
-          to:'至',
-          isRolls:'是否分卷',
-          yes:'是',
-          no:'否',
-          orderRef1:'关联单号1：',
-          orderRef3:'关联单号3：',
-          supplierID:'供应商编码:',
-          supplierName:'供应商名称:',
-          partNo:'物料编码:',
-          partDescription:'物料名称:',
-          spec:'规格型号:',
-          receive:'接收日期:',
-          suppRollNo:'供应商批次号:',
-          suppDeliveryNote:'送货单号:',
-          quantity:'订单数量',
-          rollQty:'每卷数量:',
-          rollNumber:'卷数:',
-          customerID:'客户编号:',
-          fGPartNo:'产品编码:',
-          C_No:'材料编码',
-          referencePartDesc:'参照名称:',
-          referenceSupplierID:'供应商编码:',
-          referenceSupplierName:'供应商名称:',
-          case:'操作',
-          toRoll:'待分卷',
-          hasRoll:'已分卷',
-          deleteRoll:'删除卷',
-          sumQty:'合计：卷数',
-          allQty:'总数量',
-          supplierBatchIn:'供应商批号录入',
-          rollNo:'卷号',
-          orderNoAsk:'请输入采购订单号！',
-          supplierIDAsk:'请输入供应商编码！',
-          partNoAsk:'请输入材料编码！',
-          suppDeliveryNoteAsk:'请输入送货单号！',
-          rollQtyAsk:'请输入正确的每卷数量！',
-          rollNumberAsk:'请输入正确的卷数！',
-          deleteComfirm:'确认删除记录吗?',
-          printBug:'打印机连接失败！',
-          noToRoll:'没有待分卷信息！',
-          success:'操作成功',
-          customerIDBug:'该客户编码不存在或不可用',
-          partNoBug:'该物料编码不存在或不可用',
-          supplierIDBug:'该供应商不存在或不可用',
-          siteAsk:'请输入工厂编码！',
-          rollNoAsk:'请输入卷号!',
-          suppRollNoAsk:'请输入供应商批号！',
-          rollNoBug:'该卷号不存在，请重新输入！',
-          suppRollNoConfirm:'该卷已经录入供应商批号，确认要重新录入吗？',
-          sumRollQtySmallConfirm:'累计分切数量小于订单数量，是否继续？',
-          sumRollQtyBigConfirm:'累计分切数量小于订单数量，是否继续？',
-          changeRollConfirm:'切换订单将会清空待分卷信息，是否继续?',
+          site: '工厂编码:',
+          coNo: '采购订单号:',
+          orderDate: '订单日期',
+          to: '至',
+          isRolls: '是否分卷',
+          yes: '是',
+          no: '否',
+          orderRef1: '关联单号1：',
+          orderRef3: '关联单号3：',
+          supplierID: '供应商编码:',
+          supplierName: '供应商名称:',
+          partNo: '物料编码:',
+          partDescription: '物料名称:',
+          spec: '规格型号:',
+          receive: '接收日期:',
+          suppRollNo: '供应商批次号:',
+          suppDeliveryNote: '送货单号:',
+          quantity: '订单数量',
+          rollQty: '每卷数量:',
+          rollNumber: '卷数:',
+          customerID: '客户编号:',
+          fGPartNo: '产品编码:',
+          C_No: '材料编码',
+          referencePartDesc: '参照名称:',
+          referenceSupplierID: '供应商编码:',
+          referenceSupplierName: '供应商名称:',
+          case: '操作',
+          toRoll: '待分卷',
+          hasRoll: '已分卷',
+          deleteRoll: '删除卷',
+          sumQty: '合计：卷数',
+          allQty: '总数量',
+          supplierBatchIn: '供应商批号录入',
+          rollNo: '卷号',
+          orderNoAsk: '请输入采购订单号！',
+          supplierIDAsk: '请输入供应商编码！',
+          partNoAsk: '请输入材料编码！',
+          suppDeliveryNoteAsk: '请输入送货单号！',
+          rollQtyAsk: '请输入正确的每卷数量！',
+          rollNumberAsk: '请输入正确的卷数！',
+          deleteComfirm: '确认删除记录吗?',
+          printBug: '打印机连接失败！',
+          noToRoll: '没有待分卷信息！',
+          success: '操作成功',
+          customerIDBug: '该客户编码不存在或不可用',
+          partNoBug: '该物料编码不存在或不可用',
+          supplierIDBug: '该供应商不存在或不可用',
+          siteAsk: '请输入工厂编码！',
+          rollNoAsk: '请输入卷号!',
+          suppRollNoAsk: '请输入供应商批号！',
+          rollNoBug: '该卷号不存在，请重新输入！',
+          suppRollNoConfirm: '该卷已经录入供应商批号，确认要重新录入吗？',
+          sumRollQtySmallConfirm: '累计分切数量小于订单数量，是否继续？',
+          sumRollQtyBigConfirm: '累计分切数量小于订单数量，是否继续？',
+          changeRollConfirm: '切换订单将会清空待分卷信息，是否继续?',
         },
         //this.buttons
-        buttons:{
-          addRoll:'创建分卷',
-          supplierBatchIn:'供应商批号录入',
-          insert:'插入',
-          autoPrint:'自动打印标签',
-          close:'关闭',
-          yes:'确定',
-          cancel:'取消',
-          search:'查询',
-          download:'导出',
-          save:'保存',
+        buttons: {
+          addRoll: '创建分卷',
+          supplierBatchIn: '供应商批号录入',
+          insert: '插入',
+          autoPrint: '自动打印标签',
+          close: '关闭',
+          yes: '确定',
+          cancel: '取消',
+          search: '查询',
+          download: '导出',
+          save: '保存',
         },
         queryButton: {
           functionId: functionId,
@@ -1026,28 +1047,28 @@
     },
 
     methods: {
-      getBaseData(val){
-        if (this.tagNo === 92){
+      getBaseData(val) {
+        if (this.tagNo === 92) {
           this.dataForm.customerID = val.ConfigurationTemplateID
           this.getReferenceData();
         }
-        if (this.tagNo === 5){
+        if (this.tagNo === 5) {
           this.dataForm.fGPartNo = val.PartNo;
           this.getReferenceData();
         }
       },
       // 获取基础数据列表
-      getBaseList(val){
+      getBaseList(val) {
         this.tagNo = val
         this.$nextTick(() => {
           let strVal = "";
-          if (val === 5){
+          if (val === 5) {
             strVal = this.dataForm.fGPartNo
           }
-          if (val === 92){
+          if (val === 92) {
             strVal = this.dataForm.customerID
           }
-          this.$refs.baseList.init(val,strVal)
+          this.$refs.baseList.init(val, strVal)
         })
       },
       showModel(row) {
@@ -1057,7 +1078,7 @@
         this.sum3 = 0;
         this.sum4 = 0;
         // this.dataForm = JSON.parse(JSON.stringify(row))
-        this.dataForm={
+        this.dataForm = {
           site: row.site,
           orderNo: row.orderNo,
           orderItemNo: row.orderItemNo,
@@ -1073,7 +1094,7 @@
           rollNumber: row.rollNumber,
           customerID: '无',
           fGPartNo: '无',
-          referencePartDesc:'',
+          referencePartDesc: '',
           checked: true,
           XX: '',
         };
@@ -1121,19 +1142,19 @@
       insertData() {
         if (this.dataForm.suppDeliveryNote == '' || this.dataForm.suppDeliveryNote == null) {
           this.$alert(this.labels.suppDeliveryNoteAsk, '错误', {
-            confirmButtonText:this.buttons.yes
+            confirmButtonText: this.buttons.yes
           })
           return false;
         }
         if (this.dataForm.rollQty == '' || this.dataForm.rollQty == null || this.dataForm.rollQty <= 0) {
           this.$alert(this.labels.rollQtyAsk, '错误', {
-            confirmButtonText:this.buttons.yes
+            confirmButtonText: this.buttons.yes
           })
           return false;
         }
         if (this.dataForm.rollNumber == '' || this.dataForm.rollQty == null || this.dataForm.rollNumber <= 0) {
           this.$alert(this.labels.rollNumberAsk, '错误', {
-            confirmButtonText:this.buttons.yes
+            confirmButtonText: this.buttons.yes
           })
           return false;
         }
@@ -1161,22 +1182,22 @@
           parttypeFlag: 'R',
           customerID: this.dataForm.customerID,
           fGPartNo: this.dataForm.fGPartNo,
-          refSupplierID:this.dataForm.referenceSupplierID,
-          referencePartDesc:this.dataForm.referencePartDesc
+          refSupplierID: this.dataForm.referenceSupplierID,
+          referencePartDesc: this.dataForm.referencePartDesc
         }
         this.dataList1.push(newDate)
-        this.sum1 = Number(this.sum1)+  Number(newDate.rollNumber);
-        this.sum2 = Number(this.sum2)+ Number(newDate.allRollQty);
+        this.sum1 = Number(this.sum1) + Number(newDate.rollNumber);
+        this.sum2 = Number(this.sum2) + Number(newDate.allRollQty);
       },
-      remove(row){
+      remove(row) {
         this.$confirm(this.labels.deleteComfirm, '提示', {
-          confirmButtonText:this.buttons.yes,
-          cancelButtonText:this.buttons.cancel,
+          confirmButtonText: this.buttons.yes,
+          cancelButtonText: this.buttons.cancel,
           type: 'warning'
         }).then(() => {
           this.sum1 = Number(this.sum1) - Number(row.rollNumber);
           this.sum2 = Number(this.sum2) - Number(row.allRollQty);
-          this.dataList1 = this.dataList1.filter(item => item.number!=row.number)
+          this.dataList1 = this.dataList1.filter(item => item.number != row.number)
         })
 
       },
@@ -1186,23 +1207,23 @@
           partNo: this.dataForm.fGPartNo
         }
         getPartNoDetail(inData).then(({data}) => {
-          if (data.total > 0||this.dataForm.fGPartNo=='无') {
+          if (data.total > 0 || this.dataForm.fGPartNo == '无') {
             let inData2 = {
               site: this.dataForm.site,
               configurationTemplateID: this.dataForm.customerID,
             }
             checkCustomerID(inData2).then(({data}) => {
-              if (data.total > 0||this.dataForm.customerID=='无') {
+              if (data.total > 0 || this.dataForm.customerID == '无') {
                 if (this.dataList1.length == 0) {
                   this.$alert(this.labels.noToRoll, '错误', {
-                    confirmButtonText:this.buttons.yes
+                    confirmButtonText: this.buttons.yes
                   })
                   return false;
                 }
                 if (this.sum2 + this.sum4 < this.dataForm.quantity) {
                   this.$confirm(this.labels.sumRollQtySmallConfirm, '提示', {
-                    confirmButtonText:this.buttons.yes,
-                    cancelButtonText:this.buttons.cancel,
+                    confirmButtonText: this.buttons.yes,
+                    cancelButtonText: this.buttons.cancel,
                     type: 'warning'
                   }).then(() => {
                     this.doSaveCRoll()
@@ -1211,28 +1232,28 @@
 
                 if (this.sum2 + this.sum4 > this.dataForm.quantity) {
                   this.$confirm(this.labels.sumRollQtyBigConfirm, '提示', {
-                    confirmButtonText:this.buttons.yes,
-                    cancelButtonText:this.buttons.cancel,
+                    confirmButtonText: this.buttons.yes,
+                    cancelButtonText: this.buttons.cancel,
                     type: 'warning'
                   }).then(() => {
                     this.doSaveCRoll()
                   })
                 }
-                if (this.sum2 + this.sum4 === this.dataForm.quantity){
+                if (this.sum2 + this.sum4 === this.dataForm.quantity) {
                   this.doSaveCRoll()
                 }
 
 
               } else {
                 this.$alert(this.labels.customerIDBug, '错误', {
-                  confirmButtonText:this.buttons.yes
+                  confirmButtonText: this.buttons.yes
                 })
                 return false;
               }
             })
           } else {
             this.$alert(this.labels.partNoBug, '错误', {
-              confirmButtonText:this.buttons.yes
+              confirmButtonText: this.buttons.yes
             })
             return false;
           }
@@ -1240,7 +1261,7 @@
       },
       doSaveCRoll() {
         let dto = this.dataList1.map(item => {
-          item.suppRollNo =  this.dataForm.suppRollNo
+          item.suppRollNo = this.dataForm.suppRollNo
           item.suppRollNoFlag = 'Y'
           return item;
         })
@@ -1257,18 +1278,18 @@
             searchCRollInfoDetail(inData).then(({data}) => {
               this.dataList3 = data.rows
               for (let i = 0; i < data.total; i++) {
-                this.sum4 = Number(this.sum4)+ Number(this.dataList3[i].rollQty);
+                this.sum4 = Number(this.sum4) + Number(this.dataList3[i].rollQty);
               }
               this.sum3 = data.total;
             })
-            this.$message.success( this.labels.success);
+            this.$message.success(this.labels.success);
             //打印材料卷标签
             let printList = data.obj;
             //打印标签
             printMaterialLabel(printList);
           } else {
             this.$alert(data.msg, '错误', {
-              confirmButtonText:this.buttons.yes
+              confirmButtonText: this.buttons.yes
             })
           }
         })
@@ -1279,12 +1300,12 @@
           partNo: this.dataForm.fGPartNo
         }
         getPartNoDetail(inData).then(({data}) => {
-          if (data.total > 0||this.dataForm.fGPartNo=='无') {
+          if (data.total > 0 || this.dataForm.fGPartNo == '无') {
           } else {
             this.dataForm.fGPartNo = '';
             this.dataForm = JSON.parse(JSON.stringify(this.dataForm));
             this.$alert(this.labels.partNoBug, '错误', {
-              confirmButtonText:this.buttons.yes
+              confirmButtonText: this.buttons.yes
             })
           }
         })
@@ -1295,12 +1316,12 @@
           configurationTemplateID: this.dataForm.customerID,
         }
         checkCustomerID(inData).then(({data}) => {
-          if (data.total > 0||this.dataForm.customerID=='无') {
+          if (data.total > 0 || this.dataForm.customerID == '无') {
           } else {
             this.dataForm.customerID = '';
             this.dataForm = JSON.parse(JSON.stringify(this.dataForm));
             this.$alert(this.labels.customerIDBug, '错误', {
-              confirmButtonText:this.buttons.yes
+              confirmButtonText: this.buttons.yes
             })
           }
         })
@@ -1318,8 +1339,8 @@
       changeData(row) {
         if (this.dataList1.length > 0) {
           this.$confirm(this.labels.changeRollConfirm, '提示', {
-            confirmButtonText:this.buttons.yes,
-            cancelButtonText:this.buttons.cancel,
+            confirmButtonText: this.buttons.yes,
+            cancelButtonText: this.buttons.cancel,
             type: 'warning'
           }).then(() => {
             this.sum1 = 0;
@@ -1357,7 +1378,7 @@
             searchCRollInfoDetail(inData).then(({data}) => {
               this.dataList3 = data.rows
               for (let i = 0; i < data.total; i++) {
-                this.sum4 = Number(this.sum4) +Number(this.dataList3[i].rollQty);
+                this.sum4 = Number(this.sum4) + Number(this.dataList3[i].rollQty);
               }
               this.sum3 = data.total;
             })
@@ -1407,45 +1428,63 @@
       //供应商批号录入
       getSaveModel() {
         this.saveData = {
-          site:this.$store.state.user.site,
-          rollNo:'',
-          suppRollNo:''
+          site: this.$store.state.user.site,
+          rollNo: '',
+          suppRollNo: ''
         };
         this.modelFlag2 = true;
       },
       goSaveSuppRollNo() {
         if (this.saveData.site == '' || this.saveData.site == null) {
           this.$alert(this.labels.siteAsk, '错误', {
-            confirmButtonText:this.buttons.yes
+            confirmButtonText: this.buttons.yes
           })
           return false;
         }
         if (this.saveData.rollNo == '' || this.saveData.rollNo == null) {
           this.$alert(this.labels.rollNoAsk, '错误', {
-            confirmButtonText:this.buttons.yes
+            confirmButtonText: this.buttons.yes
           })
           return false;
         }
         if (this.saveData.suppRollNo == '' || this.saveData.suppRollNo == null) {
           this.$alert(this.labels.suppRollNoAsk, '错误', {
-            confirmButtonText:this.buttons.yes
+            confirmButtonText: this.buttons.yes
           })
           return false;
         }
         saveSuppRollNo(this.saveData).then(({data}) => {
-          if (data.rows == null) {
-            this.$alert(this.labels.rollNoBug, '错误', {
-              confirmButtonText:this.buttons.yes
-            })
-            return false;
-          } else {
-            if (data.rows.suppRollNoFlag == 'Y') {
-              this.$confirm(this.labels.suppRollNoConfirm, '提示', {
-                confirmButtonText:this.buttons.yes,
-                cancelButtonText:this.buttons.cancel,
-                type: 'warning'
+            if (data.rows == null) {
+              this.$alert(this.labels.rollNoBug, '错误', {
+                confirmButtonText: this.buttons.yes
+              })
+              return false;
+            } else {
+              if (data.rows.suppRollNoFlag == 'Y') {
+                this.$confirm(this.labels.suppRollNoConfirm, '提示', {
+                  confirmButtonText: this.buttons.yes,
+                  cancelButtonText: this.buttons.cancel,
+                  type: 'warning'
 
-              }).then(() => {
+                }).then(() => {
+                  doSaveSuppRollNo(this.saveData).then(({data}) => {
+                    if (data && data.code == 200) {
+                      this.modelFlag2 = false
+                      this.$message({
+                        message: this.labels.success,
+                        type: 'success',
+                        duration: 1500,
+                        onClose: () => {
+                        }
+                      })
+                    } else {
+                      this.$alert(data.msg, '错误', {
+                        confirmButtonText: this.buttons.yes
+                      })
+                    }
+                  })
+                })
+              } else {
                 doSaveSuppRollNo(this.saveData).then(({data}) => {
                   if (data && data.code == 200) {
                     this.modelFlag2 = false
@@ -1458,32 +1497,14 @@
                     })
                   } else {
                     this.$alert(data.msg, '错误', {
-                      confirmButtonText:this.buttons.yes
+                      confirmButtonText: this.buttons.yes
                     })
                   }
                 })
-              })
-            }else{
-              doSaveSuppRollNo(this.saveData).then(({data}) => {
-                if (data && data.code == 200) {
-                  this.modelFlag2 = false
-                  this.$message({
-                    message: this.labels.success,
-                    type: 'success',
-                    duration: 1500,
-                    onClose: () => {
-                    }
-                  })
-                } else {
-                  this.$alert(data.msg, '错误', {
-                    confirmButtonText:this.buttons.yes
-                  })
-                }
-              })
+              }
             }
           }
-        }
-      )
+        )
       },
 //导出excel
       createExportData() {
@@ -1495,6 +1516,16 @@
         //  this.exportData = this.dataList
 
       },
+      //获取按钮的权限数据
+      getButtonAuthData() {
+        let updateFlag = this.isAuth(this.menuId + ":revise");
+        let fullControFlag = this.isAuth(this.menuId + ":fullContro");
+        let deleteFlag = this.isAuth(this.menuId + ":remove");
+        //处理页面的权限数据
+        this.authEdit = !updateFlag || !fullControFlag;
+        this.authAdd = !fullControFlag;
+        this.authDelete = !deleteFlag;
+      },
       finishDownload() {
 
       },
@@ -1512,8 +1543,25 @@
 
         return s
       },
+      getMultiLanguageList() {
+        //首先查询当前按钮的多语言
+        searchFunctionButtonList(this.queryButton).then(({data}) => {
+          if (data.code == 0) {
+            this.buttons = data.data
+          } else {
+          }
+        });
+        //其次查询当前标签的多语言
+        searchFunctionButtonList(this.queryLabel).then(({data}) => {
+          if (data.code == 0) {
+            this.labels = data.data
+          } else {
+
+          }
+        });
+      },
       // 导出 end
-      getReferenceData(){
+      getReferenceData() {
         let inData = {
           site: this.dataForm.site,
           partNo: this.dataForm.partNo,
@@ -1532,44 +1580,71 @@
           }
         })
       },
-      //获取按钮的权限数据
-      getButtonAuthData(){
-        let updateFlag = this.isAuth(this.menuId+":revise");
-        let fullControFlag = this.isAuth(this.menuId+":fullContro");
-        let deleteFlag = this.isAuth(this.menuId+":remove");
-        //处理页面的权限数据
-        this.authEdit = !updateFlag ||!fullControFlag;
-        this.authAdd = !fullControFlag;
-        this.authDelete = !deleteFlag;
-      },
-      //多语言
-      getMultiLanguageList() {
-        //首先查询当前按钮的多语言
-        searchFunctionButtonList(this.queryButton).then(({data}) => {
-          if (data.code == 0) {
-            this.buttons = data.data
+      // 获取 用户保存的 格式列
+      async getTableUserColumn(tableId, columnId) {
+        this.queryTableUser.tableId = tableId
+        await getTableUserListLanguage(this.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:
+                this.columnList3 = data.rows
+                break;
+            }
+
           } else {
-            // saveButtonList(this.buttonList).then(({data}) => {
-            // })
+            this.getColumnList(tableId, columnId)
           }
-        });
-        //其次查询当前标签的多语言
-        searchFunctionButtonList(this.queryLabel).then(({data}) => {
-          if (data.code == 0) {
-            this.labels = data.data
+        })
+
+      },
+      // 获取 tableDefault 列
+      async getColumnList(tableId, columnId) {
+        this.queryTable.tableId = tableId
+        await  getTableDefaultListLanguage(this.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:
+                this.columnList3 = data.rows
+                break;
+            }
           } else {
-            // saveButtonList(this.buttonList).then(({data}) => {
-            // })
+            // this.showDefault = true
           }
-        });
+        })
+
       },
-  },
-  created() {
-    this.getMultiLanguageList()//刷新按钮
-    //获取按钮的权限
-    this.getButtonAuthData();
-  }
+
+    },
+    created() {
+      this.getMultiLanguageList()//刷新按钮
+      //获取按钮的权限
+      this.getButtonAuthData();
+      this.getTableUserColumn('102001002Table',1);
+      this.getTableUserColumn('102001002Table1',2);
+      this.getTableUserColumn('102001002Table2',3);
+      this.getTableUserColumn('102001002Table3',4);
+    }
   }
+
 </script>
 
 <style scoped >