From 026e7988bfe68d03450ddae0495bab345bbe9007 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Tue, 16 Jun 2026 14:02:49 +0800 Subject: [PATCH] =?UTF-8?q?2026-06-16=20=E6=A3=80=E9=AA=8C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/qc/FQCResultEntry.vue | 55 +++++++++++++++++++++++- src/views/modules/qc/IPQCResultEntry.vue | 55 +++++++++++++++++++++++- src/views/modules/qc/IQCResultEntry.vue | 55 +++++++++++++++++++++++- src/views/modules/qc/OQCResultEntry.vue | 55 +++++++++++++++++++++++- 4 files changed, 212 insertions(+), 8 deletions(-) diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index 9a3f8dd..9b973dd 100644 --- 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 diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index bdf0194..33c36e3 100644 --- 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 diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 309c560..6b926c9 100644 --- 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 diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue index e490110..238b99c 100644 --- 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