2026-06-16

检验增加字段
2 days ago · 026e7988bf
4 changed files with 212 additions and 8 deletions
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@ -1913,6 +1913,24 @@
            fixed: '',
            columnWidth: 170,
          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301015,
+            serialNumber: '301015Table1SubmitDate',
+            tableId: "301015Table1",
+            tableName: "FQC检验记录表",
+            columnProp: 'submitDate',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '审核时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 170,
+          },
          {
            userId: this.$store.state.user.name,
            functionId: 301015,
@ -4509,6 +4527,39 @@
        }
      },

+      ensureSubmitDateColumn (columns) {
+        const columnList = Array.isArray(columns) ? [...columns] : []
+        const hasSubmitDateColumn = columnList.some(item => item.columnProp === 'submitDate' || item.columnProp === 'submit_date')
+        if (hasSubmitDateColumn) {
+          return columnList
+        }
+        const submitDateColumn = {
+          userId: this.$store.state.user.name,
+          functionId: 301015,
+          serialNumber: '301015Table1SubmitDate',
+          tableId: "301015Table1",
+          tableName: "FQC检验记录表",
+          columnProp: 'submitDate',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '审核时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 170,
+        }
+        const inspectorDateIndex = columnList.findIndex(item => item.columnProp === 'inspectorDate')
+        if (inspectorDateIndex >= 0) {
+          columnList.splice(inspectorDateIndex + 1, 0, submitDateColumn)
+        } else {
+          columnList.push(submitDateColumn)
+        }
+        return columnList
+      },
+
      // 动态列开始 获取 用户保存的 格式列
      async getTableUserColumn (tableId, columnId) {
        let queryTableUser = {
@ -4523,7 +4574,7 @@
            //this.columnList1 = []
            switch (columnId) {
              case 1:
-                this.columnList1 = data.rows
+                this.columnList1 = this.ensureSubmitDateColumn(data.rows)
                break;
              case 2:
                this.detailColumnList = data.rows
@ -4549,7 +4600,7 @@
          if (data.rows.length !== 0) {
            switch (columnId) {
              case 1:
-                this.columnList1 = data.rows
+                this.columnList1 = this.ensureSubmitDateColumn(data.rows)
                break;
              case 2:
                this.detailColumnList = data.rows
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@ -2158,6 +2158,24 @@
            fixed: '',
            columnWidth: 170,
          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301014,
+            serialNumber: '301014Table1SubmitDate',
+            tableId: "301014Table1",
+            tableName: "IPQC检验记录表",
+            columnProp: 'submitDate',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '审核时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 170,
+          },
          {
            userId: this.$store.state.user.name,
            functionId: 301014,
@ -4838,6 +4856,39 @@
        }
      },

+      ensureSubmitDateColumn (columns) {
+        const columnList = Array.isArray(columns) ? [...columns] : []
+        const hasSubmitDateColumn = columnList.some(item => item.columnProp === 'submitDate' || item.columnProp === 'submit_date')
+        if (hasSubmitDateColumn) {
+          return columnList
+        }
+        const submitDateColumn = {
+          userId: this.$store.state.user.name,
+          functionId: 301014,
+          serialNumber: '301014Table1SubmitDate',
+          tableId: "301014Table1",
+          tableName: "IPQC检验记录表",
+          columnProp: 'submitDate',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '审核时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 170,
+        }
+        const inspectorDateIndex = columnList.findIndex(item => item.columnProp === 'inspectorDate')
+        if (inspectorDateIndex >= 0) {
+          columnList.splice(inspectorDateIndex + 1, 0, submitDateColumn)
+        } else {
+          columnList.push(submitDateColumn)
+        }
+        return columnList
+      },
+
      // 动态列开始 获取 用户保存的 格式列
      async getTableUserColumn (tableId, columnId) {
        let queryTableUser = {
@ -4851,7 +4902,7 @@
          if (data.rows.length > 0) {
            switch (columnId) {
              case 1:
-                this.columnList1 = data.rows
+                this.columnList1 = this.ensureSubmitDateColumn(data.rows)
                break;
              case 2:
                this.detailColumnList = data.rows
@ -4877,7 +4928,7 @@
          if (data.rows.length !== 0) {
            switch (columnId) {
              case 1:
-                this.columnList1 = data.rows
+                this.columnList1 = this.ensureSubmitDateColumn(data.rows)
                break;
              case 2:
                this.detailColumnList = data.rows
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@ -1803,6 +1803,24 @@
            fixed: '',
            columnWidth: 170,
          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301006,
+            serialNumber: '301006Table1SubmitDate',
+            tableId: "301006Table1",
+            tableName: "IQC检验记录表",
+            columnProp: 'submitDate',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '审核时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 170,
+          },
          {
            userId: this.$store.state.user.name,
            functionId: 301006,
@ -3762,6 +3780,39 @@
        }
      },

+      ensureSubmitDateColumn (columns) {
+        const columnList = Array.isArray(columns) ? [...columns] : []
+        const hasSubmitDateColumn = columnList.some(item => item.columnProp === 'submitDate' || item.columnProp === 'submit_date')
+        if (hasSubmitDateColumn) {
+          return columnList
+        }
+        const submitDateColumn = {
+          userId: this.$store.state.user.name,
+          functionId: 301006,
+          serialNumber: '301006Table1SubmitDate',
+          tableId: "301006Table1",
+          tableName: "IQC检验记录表",
+          columnProp: 'submitDate',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '审核时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 170,
+        }
+        const inspectorDateIndex = columnList.findIndex(item => item.columnProp === 'inspectorDate')
+        if (inspectorDateIndex >= 0) {
+          columnList.splice(inspectorDateIndex + 1, 0, submitDateColumn)
+        } else {
+          columnList.push(submitDateColumn)
+        }
+        return columnList
+      },
+

      // 动态列开始 获取 用户保存的 格式列
      async getTableUserColumn (tableId, columnId) {
@ -3776,7 +3827,7 @@
          if (data.rows.length > 0) {
            switch (columnId) {
              case 1:
-                this.columnList1 = data.rows
+                this.columnList1 = this.ensureSubmitDateColumn(data.rows)
                break;
              case 2:
                this.detailColumnList = data.rows
@ -3799,7 +3850,7 @@
          if (data.rows.length !== 0) {
            switch (columnId) {
              case 1:
-                this.columnList1 = data.rows
+                this.columnList1 = this.ensureSubmitDateColumn(data.rows)
                break;
              case 2:
                this.detailColumnList = data.rows
--- a/src/views/modules/qc/OQCResultEntry.vue
+++ b/src/views/modules/qc/OQCResultEntry.vue
@ -1537,6 +1537,24 @@
            fixed: '',
            columnWidth: 170,
          },
+          {
+            userId: this.$store.state.user.name,
+            functionId: 301017,
+            serialNumber: '301017Table1SubmitDate',
+            tableId: "301017Table1",
+            tableName: "OQC检验记录表",
+            columnProp: 'submitDate',
+            headerAlign: "center",
+            align: "center",
+            columnLabel: '审核时间',
+            columnHidden: false,
+            columnImage: false,
+            columnSortable: false,
+            sortLv: 0,
+            status: true,
+            fixed: '',
+            columnWidth: 170,
+          },
          {
            userId: this.$store.state.user.name,
            functionId: 301017,
@ -3490,6 +3508,39 @@
        }
      },

+      ensureSubmitDateColumn (columns) {
+        const columnList = Array.isArray(columns) ? [...columns] : []
+        const hasSubmitDateColumn = columnList.some(item => item.columnProp === 'submitDate' || item.columnProp === 'submit_date')
+        if (hasSubmitDateColumn) {
+          return columnList
+        }
+        const submitDateColumn = {
+          userId: this.$store.state.user.name,
+          functionId: 301017,
+          serialNumber: '301017Table1SubmitDate',
+          tableId: "301017Table1",
+          tableName: "OQC检验记录表",
+          columnProp: 'submitDate',
+          headerAlign: "center",
+          align: "center",
+          columnLabel: '审核时间',
+          columnHidden: false,
+          columnImage: false,
+          columnSortable: false,
+          sortLv: 0,
+          status: true,
+          fixed: '',
+          columnWidth: 170,
+        }
+        const inspectorDateIndex = columnList.findIndex(item => item.columnProp === 'inspectorDate')
+        if (inspectorDateIndex >= 0) {
+          columnList.splice(inspectorDateIndex + 1, 0, submitDateColumn)
+        } else {
+          columnList.push(submitDateColumn)
+        }
+        return columnList
+      },
+
      // 动态列开始 获取 用户保存的 格式列
      async getTableUserColumn (tableId, columnId) {
        let queryTableUser = {
@ -3504,7 +3555,7 @@
            //this.columnList1 = []
            switch (columnId) {
              case 1:
-                this.columnList1 = data.rows
+                this.columnList1 = this.ensureSubmitDateColumn(data.rows)
                break;
              case 2:
                this.detailColumnList = data.rows
@ -3527,7 +3578,7 @@
          if (!data.rows.length == 0) {
            switch (columnId) {
              case 1:
-                this.columnList1 = data.rows
+                this.columnList1 = this.ensureSubmitDateColumn(data.rows)
                break;
              case 2:
                this.detailColumnList = data.rows