diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 223d23d..f4ab879 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -355,7 +355,7 @@
           prop=""
           header-align="center"
           align="center"
-          min-width="40"
+          min-width="60"
           label="操作">
           <template slot-scope="scope">
             <el-button class="el-icon-picture" type="primary" @click="uploadImageModal(scope.row)"></el-button>
@@ -395,7 +395,7 @@
           label="抽样数量">
           <template slot-scope="scope">
             <el-input v-if="detailData.submitFlag == 'Y'" v-model="scope.row.samplingQty" disabled type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
-            <el-input v-if="detailData.submitFlag != 'Y'" v-model="scope.row.samplingQty" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+            <el-input :ref="`samplingQty${scope.$index}`" v-if="detailData.submitFlag != 'Y'" v-model="scope.row.samplingQty" type="number" @keyup.enter.native="focusNextInput(scope.$index, 'samplingQty')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -406,7 +406,7 @@
           label="不合格数量">
           <template slot-scope="scope">
             <el-input v-if="detailData.submitFlag === 'Y'" v-model="scope.row.unqualifiedQuantity" disabled type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
-            <el-input v-if="detailData.submitFlag != 'Y'" v-model="scope.row.unqualifiedQuantity" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+            <el-input :ref="`unqualifiedQuantity${scope.$index}`" v-if="detailData.submitFlag != 'Y'" v-model="scope.row.unqualifiedQuantity" type="number" @keyup.enter.native="focusNextInput(scope.$index, 'unqualifiedQuantity')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -1225,6 +1225,11 @@
         },
         detailColumnList: [
           {
+            userId: this.$store.state.user.name,
+            functionId: 301007,
+            serialNumber: '301007Table2ItemDesc',
+            tableId: "301007Table2",
+            tableName: "检验单明细表",
             columnProp: 'itemDesc',
             headerAlign: "center",
             align: "center",
@@ -1235,8 +1240,14 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301007,
+            serialNumber: '301007Table2SamplingLevelDesc',
+            tableId: "301007Table2",
+            tableName: "检验单明细表",
             columnProp: 'samplingLevelDesc',
             headerAlign: "center",
             align: "center",
@@ -1247,8 +1258,14 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301007,
+            serialNumber: '301007Table2SamplingProgrammeDesc',
+            tableId: "301007Table2",
+            tableName: "检验单明细表",
             columnProp: 'samplingProgrammeDesc',
             headerAlign: "center",
             align: "center",
@@ -1259,8 +1276,14 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301007,
+            serialNumber: '301007Table2ObjectDesc',
+            tableId: "301007Table2",
+            tableName: "检验单明细表",
             columnProp: 'objectDesc',
             headerAlign: "center",
             align: "center",
@@ -1271,8 +1294,14 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301007,
+            serialNumber: '301007Table2Aql',
+            tableId: "301007Table2",
+            tableName: "检验单明细表",
             columnProp: 'aql',
             headerAlign: "center",
             align: "center",
@@ -1283,8 +1312,14 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301007,
+            serialNumber: '301007Table2Ac',
+            tableId: "301007Table2",
+            tableName: "检验单明细表",
             columnProp: 'ac',
             headerAlign: "center",
             align: "center",
@@ -1295,8 +1330,14 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301007,
+            serialNumber: '301007Table2Re',
+            tableId: "301007Table2",
+            tableName: "检验单明细表",
             columnProp: 're',
             headerAlign: "center",
             align: "center",
@@ -1307,8 +1348,14 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301007,
+            serialNumber: '301007Table2DefaultValue',
+            tableId: "301007Table2",
+            tableName: "检验单明细表",
             columnProp: 'defaultValue',
             headerAlign: "center",
             align: "center",
@@ -1319,8 +1366,14 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 100,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301007,
+            serialNumber: '301007Table2MaxValue',
+            tableId: "301007Table2",
+            tableName: "检验单明细表",
             columnProp: 'maxValue',
             headerAlign: "center",
             align: "center",
@@ -1331,8 +1384,14 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 100,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301007,
+            serialNumber: '301007Table2MinValue',
+            tableId: "301007Table2",
+            tableName: "检验单明细表",
             columnProp: 'minValue',
             headerAlign: "center",
             align: "center",
@@ -1343,8 +1402,14 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 100,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301007,
+            serialNumber: '301007Table2ValueType',
+            tableId: "301007Table2",
+            tableName: "检验单明细表",
             columnProp: 'valueType',
             headerAlign: "center",
             align: "center",
@@ -1355,6 +1420,7 @@
             sortLv: 0,
             status: true,
             fixed: '',
+            columnWidth: 80,
           },
         ],
         fileColumnList: [
@@ -1604,6 +1670,7 @@
       this.queryController()
       // 动态列
       this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
+      this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
     },
     methods: {
 
@@ -2490,6 +2557,17 @@
           this.$refs[a3].focus()
         })
       },
+      focusNextInput(index, type) {
+        let aaa = ''
+        if (this.detailData.length - 1 === index) {
+          aaa = `${type}0`
+        } else {
+          aaa = `${type}${index + 1}`
+        }
+        this.$nextTick(() => {
+          this.$refs[aaa].focus()
+        })
+      },
 
       //删除
       handleDeleteBtn(td) {
@@ -2647,9 +2725,9 @@
               case 1:
                 this.columnList1 = data.rows
                 break;
-              // case 2:
-              //   this.columnList1 = data.rows
-              //   break;
+              case 2:
+                this.detailColumnList = data.rows
+                break;
               // case 3:
               //   this.columnList2 = data.rows
               //   break;
@@ -2679,9 +2757,9 @@
               case 1:
                 this.columnList1 = data.rows
                 break;
-              // case 2:
-              //   this.columnList1 = data.rows
-              //   break;
+              case 2:
+                this.detailColumnList = data.rows
+                break;
               // case 3:
               //   this.columnList2 = data.rows
               //   break;
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 70a4dc9..38cac51 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -393,7 +393,7 @@
           label="抽样数量">
           <template slot-scope="scope">
             <el-input v-if="detailData.submitFlag == 'Y'" v-model="scope.row.samplingQty" disabled type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
-            <el-input v-if="detailData.submitFlag != 'Y'" v-model="scope.row.samplingQty" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+            <el-input :ref="`samplingQty${scope.$index}`" v-if="detailData.submitFlag != 'Y'" v-model="scope.row.samplingQty" type="number" @keyup.enter.native="focusNextInput(scope.$index, 'samplingQty')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -404,7 +404,7 @@
           label="不合格数量">
           <template slot-scope="scope">
             <el-input v-if="detailData.submitFlag === 'Y'" v-model="scope.row.unqualifiedQuantity" disabled type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
-            <el-input v-if="detailData.submitFlag != 'Y'" v-model="scope.row.unqualifiedQuantity" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+            <el-input :ref="`unqualifiedQuantity${scope.$index}`" v-if="detailData.submitFlag != 'Y'" v-model="scope.row.unqualifiedQuantity" type="number" @keyup.enter.native="focusNextInput(scope.$index, 'unqualifiedQuantity')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -1223,6 +1223,11 @@
         },
         detailColumnList: [
           {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table2ItemDesc',
+            tableId: "301015Table2",
+            tableName: "检验单明细表",
             columnProp: 'itemDesc',
             headerAlign: "center",
             align: "center",
@@ -1236,6 +1241,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table2SamplingLevelDesc',
+            tableId: "301015Table2",
+            tableName: "检验单明细表",
             columnProp: 'samplingLevelDesc',
             headerAlign: "center",
             align: "center",
@@ -1249,6 +1259,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table2SamplingProgrammeDesc',
+            tableId: "301015Table2",
+            tableName: "检验单明细表",
             columnProp: 'samplingProgrammeDesc',
             headerAlign: "center",
             align: "center",
@@ -1262,6 +1277,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table2ObjectDesc',
+            tableId: "301015Table2",
+            tableName: "检验单明细表",
             columnProp: 'objectDesc',
             headerAlign: "center",
             align: "center",
@@ -1275,6 +1295,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table2Aql',
+            tableId: "301015Table2",
+            tableName: "检验单明细表",
             columnProp: 'aql',
             headerAlign: "center",
             align: "center",
@@ -1288,6 +1313,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table2Ac',
+            tableId: "301015Table2",
+            tableName: "检验单明细表",
             columnProp: 'ac',
             headerAlign: "center",
             align: "center",
@@ -1301,6 +1331,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table2Re',
+            tableId: "301015Table2",
+            tableName: "检验单明细表",
             columnProp: 're',
             headerAlign: "center",
             align: "center",
@@ -1314,6 +1349,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table2DefaultValue',
+            tableId: "301015Table2",
+            tableName: "检验单明细表",
             columnProp: 'defaultValue',
             headerAlign: "center",
             align: "center",
@@ -1327,6 +1367,11 @@
             columnWidth: 100,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table2MaxValue',
+            tableId: "301015Table2",
+            tableName: "检验单明细表",
             columnProp: 'maxValue',
             headerAlign: "center",
             align: "center",
@@ -1340,6 +1385,11 @@
             columnWidth: 100,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table2MinValue',
+            tableId: "301015Table2",
+            tableName: "检验单明细表",
             columnProp: 'minValue',
             headerAlign: "center",
             align: "center",
@@ -1353,6 +1403,11 @@
             columnWidth: 100,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table2ValueType',
+            tableId: "301015Table2",
+            tableName: "检验单明细表",
             columnProp: 'valueType',
             headerAlign: "center",
             align: "center",
@@ -1613,6 +1668,7 @@
       this.queryController()
       // 动态列
       this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
+      this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
     },
     methods: {
 
@@ -2499,6 +2555,17 @@
           this.$refs[a3].focus()
         })
       },
+      focusNextInput(index, type) {
+        let aaa = ''
+        if (this.detailData.length - 1 === index) {
+          aaa = `${type}0`
+        } else {
+          aaa = `${type}${index + 1}`
+        }
+        this.$nextTick(() => {
+          this.$refs[aaa].focus()
+        })
+      },
 
       //删除
       handleDeleteBtn(td) {
@@ -2660,9 +2727,9 @@
               case 1:
                 this.columnList1 = data.rows
                 break;
-              // case 2:
-              //   this.columnList1 = data.rows
-              //   break;
+              case 2:
+                this.detailColumnList = data.rows
+                break;
               // case 3:
               //   this.columnList2 = data.rows
               //   break;
@@ -2692,9 +2759,9 @@
               case 1:
                 this.columnList1 = data.rows
                 break;
-              // case 2:
-              //   this.columnList1 = data.rows
-              //   break;
+              case 2:
+                this.detailColumnList = data.rows
+                break;
               // case 3:
               //   this.columnList2 = data.rows
               //   break;
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 1566186..f8c16da 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -414,7 +414,7 @@
           label="抽样数量">
           <template slot-scope="scope">
             <el-input v-if="detailData.submitFlag == 'Y'" v-model="scope.row.samplingQty" disabled type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
-            <el-input v-if="detailData.submitFlag != 'Y'" v-model="scope.row.samplingQty" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+            <el-input :ref="`samplingQty${scope.$index}`" v-if="detailData.submitFlag != 'Y'" v-model="scope.row.samplingQty" type="number" @keyup.enter.native="focusNextInput(scope.$index, 'samplingQty')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -425,7 +425,7 @@
           label="不合格数量">
           <template slot-scope="scope">
             <el-input v-if="detailData.submitFlag == 'Y'" v-model="scope.row.unqualifiedQuantity" disabled type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
-            <el-input v-if="detailData.submitFlag != 'Y'" v-model="scope.row.unqualifiedQuantity" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+            <el-input :ref="`unqualifiedQuantity${scope.$index}`" v-if="detailData.submitFlag != 'Y'" v-model="scope.row.unqualifiedQuantity" type="number" @keyup.enter.native="focusNextInput(scope.$index, 'unqualifiedQuantity')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
           </template>
         </el-table-column>
         <el-table-column
@@ -1267,6 +1267,11 @@
         },
         detailColumnList: [
           {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table2ItemDesc',
+            tableId: "301014Table2",
+            tableName: "检验单明细表",
             columnProp: 'itemDesc',
             headerAlign: "center",
             align: "center",
@@ -1280,6 +1285,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table2SamplingLevelDesc',
+            tableId: "301014Table2",
+            tableName: "检验单明细表",
             columnProp: 'samplingLevelDesc',
             headerAlign: "center",
             align: "center",
@@ -1293,6 +1303,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table2SamplingProgrammeDesc',
+            tableId: "301014Table2",
+            tableName: "检验单明细表",
             columnProp: 'samplingProgrammeDesc',
             headerAlign: "center",
             align: "center",
@@ -1306,6 +1321,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table2ObjectDesc',
+            tableId: "301014Table2",
+            tableName: "检验单明细表",
             columnProp: 'objectDesc',
             headerAlign: "center",
             align: "center",
@@ -1319,6 +1339,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table2Aql',
+            tableId: "301014Table2",
+            tableName: "检验单明细表",
             columnProp: 'aql',
             headerAlign: "center",
             align: "center",
@@ -1332,6 +1357,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table2Ac',
+            tableId: "301014Table2",
+            tableName: "检验单明细表",
             columnProp: 'ac',
             headerAlign: "center",
             align: "center",
@@ -1345,6 +1375,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table2Re',
+            tableId: "301014Table2",
+            tableName: "检验单明细表",
             columnProp: 're',
             headerAlign: "center",
             align: "center",
@@ -1358,6 +1393,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table2DefaultValue',
+            tableId: "301014Table2",
+            tableName: "检验单明细表",
             columnProp: 'defaultValue',
             headerAlign: "center",
             align: "center",
@@ -1371,6 +1411,11 @@
             columnWidth: 100,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table2MaxValue',
+            tableId: "301014Table2",
+            tableName: "检验单明细表",
             columnProp: 'maxValue',
             headerAlign: "center",
             align: "center",
@@ -1384,6 +1429,11 @@
             columnWidth: 100,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table2MinValue',
+            tableId: "301014Table2",
+            tableName: "检验单明细表",
             columnProp: 'minValue',
             headerAlign: "center",
             align: "center",
@@ -1397,6 +1447,11 @@
             columnWidth: 100,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table2ValueType',
+            tableId: "301014Table2",
+            tableName: "检验单明细表",
             columnProp: 'valueType',
             headerAlign: "center",
             align: "center",
@@ -1663,9 +1718,12 @@
       this.umSearch()
       // 查看 质量任务生成规则控制 动控是否开启
       this.queryController()
+      // 动态列
       this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
+      this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
     },
     methods: {
+
       // 查询单位
       umSearch(){
         let tempData = {
@@ -2549,6 +2607,17 @@
           this.$refs[a3].focus()
         })
       },
+      focusNextInput(index, type) {
+        let aaa = ''
+        if (this.detailData.length - 1 === index) {
+          aaa = `${type}0`
+        } else {
+          aaa = `${type}${index + 1}`
+        }
+        this.$nextTick(() => {
+          this.$refs[aaa].focus()
+        })
+      },
 
       //删除
       handleDeleteBtn(td) {
@@ -2708,9 +2777,9 @@
               case 1:
                 this.columnList1 = data.rows
                 break;
-              // case 2:
-              //   this.columnList1 = data.rows
-              //   break;
+              case 2:
+                this.detailColumnList = data.rows
+                break;
               // case 3:
               //   this.columnList2 = data.rows
               //   break;
@@ -2718,12 +2787,10 @@
               //   this.columnList3 = data.rows
               //   break;
             }
-
           } else {
             this.getColumnList(tableId, columnId)
           }
         })
-
       },
 
       // 获取 tableDefault 列
@@ -2740,9 +2807,9 @@
               case 1:
                 this.columnList1 = data.rows
                 break;
-              // case 2:
-              //   this.columnList1 = data.rows
-              //   break;
+              case 2:
+                this.detailColumnList = data.rows
+                break;
               // case 3:
               //   this.columnList2 = data.rows
               //   break;
@@ -2754,7 +2821,6 @@
             // this.showDefault = true.
           }
         })
-
       },
       //动态列结束
 
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 83a4500..7d7aefe 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -87,7 +87,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        v-for="(item,index) in columnList" :key="index"
+        v-for="(item,index) in columnList1" :key="index"
         :sortable="item.columnSortable"
         :prop="item.columnProp"
         :header-align="item.headerAlign"
@@ -137,7 +137,7 @@
           <el-input v-model="detailData.partDesc" disabled style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item :label="'计量单位'">
-          <el-input v-model="detailData.umid" disabled style="width: 200px"></el-input>
+          <el-input v-model="detailData.umId" disabled style="width: 200px"></el-input>
         </el-form-item>
         <el-form-item :label="'送检数量'">
           <el-input v-model="detailData.rollQty" disabled style="width: 80px"></el-input>
@@ -262,7 +262,7 @@
             label="不合格数量">
             <template slot-scope="scope">
               <el-input v-if="detailData.submitFlag === 'Y'" v-model="scope.row.unqualifiedQuantity" disabled type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
-              <el-input v-if="detailData.submitFlag != 'Y'" v-model="scope.row.unqualifiedQuantity" type="number" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
+              <el-input :ref="`unqualifiedQuantity${scope.$index}`" v-if="detailData.submitFlag != 'Y'" v-model="scope.row.unqualifiedQuantity" type="number" @keyup.enter.native="focusNextInput(scope.$index, 'unqualifiedQuantity')" style="height: 11px;padding: 0px " allow-create>;width:98%"></el-input>
             </template>
           </el-table-column>
           <el-table-column
@@ -412,6 +412,10 @@
     iqcRecordDelete, // 删除检验记录
     disposalMeasuresSearch // 获取处置措施列表
   } from "@/api/qc/qc.js"
+  import {
+    getTableDefaultListLanguage,
+    getTableUserListLanguage,
+  } from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
   import {getFileContentList, downLoadObjectFile} from '@/api/eam/eam_object_list.js'
   import {deleteObjectFile} from '@/api/eam/eam.js'
@@ -423,9 +427,6 @@
       Chooselist,
       qcFAIUploadFile,
       comQcItemImageUploadFile
-    },
-    watch: {
-
     },
     data () {
       return {
@@ -488,8 +489,13 @@
           isQualifiedChinese:''
         },
         // 展示列集
-        columnList: [
+        columnList1: [
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1InspectionNo',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'inspectionNo',
             headerAlign: "center",
             align: "center",
@@ -503,6 +509,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1InspectionResult',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'inspectionResult',
             headerAlign: "center",
             align: "center",
@@ -516,6 +527,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1TaskDate',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'taskDate',
             headerAlign: "center",
             align: "center",
@@ -529,6 +545,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1InspectionCycle',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'inspectionCycle',
             headerAlign: "center",
             align: "center",
@@ -542,6 +563,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1RollNo',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'rollNo',
             headerAlign: "center",
             align: "center",
@@ -555,6 +581,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1PartNo',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'partNo',
             headerAlign: "center",
             align: "center",
@@ -568,6 +599,11 @@
             columnWidth: 100,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1PartDesc',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'partDesc',
             headerAlign: "center",
             align: "center",
@@ -581,7 +617,12 @@
             columnWidth: 150,
           },
           {
-            columnProp: 'umid',
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1Umid',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'umId',
             headerAlign: "center",
             align: "center",
             columnLabel: '计量单位',
@@ -594,6 +635,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1RollQty',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'rollQty',
             headerAlign: "center",
             align: "right",
@@ -607,6 +653,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1SamplingQty',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'samplingQty',
             headerAlign: "center",
             align: "right",
@@ -620,6 +671,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1PoOrderNo',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'poOrderNo',
             headerAlign: "center",
             align: "center",
@@ -633,6 +689,11 @@
             columnWidth: 130,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1PoItemNo',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'poItemNo',
             headerAlign: "center",
             align: "right",
@@ -646,6 +707,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1SupplierDesc',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'supplierDesc',
             headerAlign: "center",
             align: "center",
@@ -659,6 +725,11 @@
             columnWidth: 150,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1InspectionRemark',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'inspectionRemark',
             headerAlign: "center",
             align: "center",
@@ -672,6 +743,11 @@
             columnWidth: 150,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1DisposalMeasures',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'disposalMeasures',
             headerAlign: "center",
             align: "center",
@@ -685,6 +761,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1DisposalRemark',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'disposalRemark',
             headerAlign: "center",
             align: "center",
@@ -698,6 +779,11 @@
             columnWidth: 150,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1InspectorDate',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'inspectorDate',
             headerAlign: "center",
             align: "center",
@@ -711,6 +797,11 @@
             columnWidth: 130,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1InspectorNo',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
             columnProp: 'inspectorNo',
             headerAlign: "center",
             align: "center",
@@ -726,6 +817,11 @@
         ],
         detailColumnList: [
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2ItemDesc',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
             columnProp: 'itemDesc',
             headerAlign: "center",
             align: "center",
@@ -739,6 +835,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2SamplingLevelDesc',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
             columnProp: 'samplingLevelDesc',
             headerAlign: "center",
             align: "center",
@@ -752,6 +853,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2SamplingProgrammeDesc',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
             columnProp: 'samplingProgrammeDesc',
             headerAlign: "center",
             align: "center",
@@ -765,6 +871,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2ObjectDesc',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
             columnProp: 'objectDesc',
             headerAlign: "center",
             align: "center",
@@ -778,6 +889,11 @@
             columnWidth: 120,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2Aql',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
             columnProp: 'aql',
             headerAlign: "center",
             align: "center",
@@ -791,6 +907,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2Ac',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
             columnProp: 'ac',
             headerAlign: "center",
             align: "center",
@@ -804,6 +925,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2Re',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
             columnProp: 're',
             headerAlign: "center",
             align: "center",
@@ -817,6 +943,11 @@
             columnWidth: 80,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2DefaultValue',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
             columnProp: 'defaultValue',
             headerAlign: "center",
             align: "center",
@@ -830,6 +961,11 @@
             columnWidth: 100,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2MaxValue',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
             columnProp: 'maxValue',
             headerAlign: "center",
             align: "center",
@@ -843,6 +979,11 @@
             columnWidth: 100,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2MinValue',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
             columnProp: 'minValue',
             headerAlign: "center",
             align: "center",
@@ -856,6 +997,11 @@
             columnWidth: 100,
           },
           {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table2ValueType',
+            tableId: "301006Table2",
+            tableName: "检验单明细表",
             columnProp: 'valueType',
             headerAlign: "center",
             align: "center",
@@ -935,7 +1081,7 @@
           inspectionRemark: '',
           submitFlag: '',
           supplierNo: '',
-          umid: ''
+          umId: ''
         },
         detailInformationFlag: false,
         detailList:[],
@@ -984,6 +1130,9 @@
       this.getDataList()
       this.favoriteIsOk()
       this.disposalMeasuresSearch()
+      // 动态列
+      this.getTableUserColumn(this.$route.meta.menuId+'table1',1)
+      this.getTableUserColumn(this.$route.meta.menuId+'table2',2)
     },
     methods: {
       // 获取处置措施列表
@@ -1257,7 +1406,7 @@
         this.detailData.inspectionResult = row.inspectionResult
         this.detailData.inspectorNo = row.inspectorNo
         this.detailData.inspectionRemark = row.inspectionRemark
-        this.detailData.umid = row.umid
+        this.detailData.umId = row.umId
         this.getInspectionFormData()
         this.inspectorSearch()
         this.detailInformationFlag = true
@@ -1453,6 +1602,20 @@
           this.$refs[a3].focus()
         })
       },
+
+      focusNextInput(index, type) {
+        let aaa = ''
+        if (this.detailData.length - 1 === index) {
+          aaa = `${type}0`
+        } else {
+          aaa = `${type}${index + 1}`
+        }
+        this.$nextTick(() => {
+          this.$refs[aaa].focus()
+        })
+      },
+
+
       //删除
       handleDeleteBtn(td) {
         checkIQCIsSubmit(td).then(({data}) => {
@@ -1575,8 +1738,8 @@
       finishDownload() {},
       fields() {
         let json = "{"
-        this.columnList.forEach((item, index) => {
-          if (index == this.columnList.length - 1) {
+        this.columnList1.forEach((item, index) => {
+          if (index == this.columnList1.length - 1) {
             json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\""
           } else {
             json += "\"" + item.columnLabel + "\"" + ":" + "\"" + item.columnProp + "\"" + ","
@@ -1586,7 +1749,71 @@
         let s = eval("(" + json + ")")
         return s
       },
-      // 导出 end
+
+      // 动态列开始 获取 用户保存的 格式列
+      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.columnList1 = []
+            switch (columnId) {
+              case 1:
+                this.columnList1 = data.rows
+                break;
+              case 2:
+                this.detailColumnList = 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
+        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.columnList1 = data.rows
+                break;
+              case 2:
+                this.detailColumnList = data.rows
+                break;
+              // case 3:
+              //   this.columnList2 = data.rows
+              //   break;
+              // case 4:
+              //   this.columnList3 = data.rows
+              //   break;
+            }
+          } else {
+            // this.showDefault = true.
+          }
+        })
+      },
+      //动态列结束
+
+
     }
   }
 </script>