diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue index e9f498c..aa561d5 100644 --- a/src/views/modules/qc/FQCResultEntry.vue +++ b/src/views/modules/qc/FQCResultEntry.vue @@ -441,15 +441,12 @@ - - - - - - + + + @@ -1581,31 +1578,13 @@ { userId: this.$store.state.user.name, functionId: 301015, - serialNumber: '301015Table1Sku', - tableId: "301015Table1", - tableName: "FQC检验记录表", - columnProp: 'sku', - headerAlign: "center", - align: "center", - columnLabel: 'SKU', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120, - }, - { - userId: this.$store.state.user.name, - functionId: 301015, - serialNumber: '301015Table1CinvSourceCode', + serialNumber: '301015Table1Spec', tableId: "301015Table1", tableName: "FQC检验记录表", - columnProp: 'cinvSourceCode', + columnProp: 'spec', headerAlign: "center", - align: "center", - columnLabel: 'PN', + align: "left", + columnLabel: '规格型号', columnHidden: false, columnImage: false, columnSortable: false, @@ -1825,7 +1804,8 @@ state: '', passQty: '', notPassQty: '', - batchQualifiedQty: '' + batchQualifiedQty: '', + spec: '' }, detailInformationFlag: false, detailList: [], @@ -2421,7 +2401,6 @@ inspectionTypeNo: '', inspectionTypeName: '' }, - templateList: [], templateModelFlag: false, templateDetailList: [ { @@ -3729,6 +3708,7 @@ this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePersonName = row.responsiblePersonName this.detailData.state = row.state + this.detailData.spec = row.spec if (row.state === '待检验') { this.detailData.passQty = row.samplingQty } else { diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue index 7379ddd..d19017b 100644 --- a/src/views/modules/qc/IPQCResultEntry.vue +++ b/src/views/modules/qc/IPQCResultEntry.vue @@ -477,15 +477,12 @@ - - - - - - + + + @@ -1811,31 +1808,13 @@ { userId: this.$store.state.user.name, functionId: 301014, - serialNumber: '301014Table1Sku', - tableId: "301014Table1", - tableName: "IPQC检验记录表", - columnProp: 'sku', - headerAlign: "center", - align: "center", - columnLabel: 'SKU', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120, - }, - { - userId: this.$store.state.user.name, - functionId: 301014, - serialNumber: '301014Table1cinvSourceCode', + serialNumber: '301014Table1Spec', tableId: "301014Table1", tableName: "IPQC检验记录表", - columnProp: 'cinvSourceCode', + columnProp: 'spec', headerAlign: "center", - align: "center", - columnLabel: 'PN', + align: "left", + columnLabel: '规格型号', columnHidden: false, columnImage: false, columnSortable: false, @@ -2055,7 +2034,8 @@ state: '', passQty: '', notPassQty: '', - batchQualifiedQty: '' + batchQualifiedQty: '', + spec: '' }, detailInformationFlag: false, detailList: [], @@ -2876,7 +2856,6 @@ templateId: '', templateDesc: '', }, - templateList: [], templateSelections: [], importLoading: false, itemObjectColumnList: [ @@ -4025,6 +4004,7 @@ this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePersonName = row.responsiblePersonName this.detailData.state = row.state + this.detailData.spec = row.spec if (row.state === '待检验') { this.detailData.passQty = row.samplingQty } else { diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue index 343e405..7064a17 100644 --- a/src/views/modules/qc/IQCResultEntry.vue +++ b/src/views/modules/qc/IQCResultEntry.vue @@ -357,17 +357,14 @@ - - - - - - + + + - + 协同人员 @@ -1328,31 +1325,13 @@ { userId: this.$store.state.user.name, functionId: 301006, - serialNumber: '301006Table1SKU', - tableId: "301006Table1", - tableName: "IQC检验记录表", - columnProp: 'sku', - headerAlign: "center", - align: "center", - columnLabel: 'SKU', - columnHidden: false, - columnImage: false, - columnSortable: false, - sortLv: 0, - status: true, - fixed: '', - columnWidth: 120, - }, - { - userId: this.$store.state.user.name, - functionId: 301006, - serialNumber: '301006Table1CinvSourceCode', + serialNumber: '301006Table1Spec', tableId: "301006Table1", tableName: "IQC检验记录表", - columnProp: 'cinvSourceCode', + columnProp: 'spec', headerAlign: "center", - align: "center", - columnLabel: 'PN', + align: "left", + columnLabel: '规格型号', columnHidden: false, columnImage: false, columnSortable: false, @@ -1385,7 +1364,7 @@ serialNumber: '301006Table1Umid', tableId: "301006Table1", tableName: "IQC检验记录表", - columnProp: 'umId', + columnProp: 'umName', headerAlign: "center", align: "center", columnLabel: '计量单位', @@ -2011,6 +1990,7 @@ submitFlag: '', supplierNo: '', umId: '', + umName: '', rollCount: '', poOrderNo: '', poItemNo: '', @@ -2022,7 +2002,8 @@ state: '', passQty: '', notPassQty: '', - batchQualifiedQty: 0 + batchQualifiedQty: 0, + spec: '' }, detailInformationFlag: false, detailList: [], @@ -2855,6 +2836,7 @@ this.detailData.inspectorNo = row.inspectorNo this.detailData.inspectionRemark = row.inspectionRemark this.detailData.umId = row.umId + this.detailData.umName = row.umName this.detailData.rollCount = row.rollCount this.detailData.poOrderNo = row.poOrderNo this.detailData.poItemNo = row.poItemNo @@ -2864,6 +2846,7 @@ this.detailData.responsiblePersonName = row.responsiblePersonName this.detailData.invdefinetype = row.invdefinetype this.detailData.state = row.state + this.detailData.spec = row.spec if (row.state === '待检验') { this.detailData.passQty = row.samplingQty } else { diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue index 1068d50..ee4f23b 100644 --- a/src/views/modules/qc/OQCResultEntry.vue +++ b/src/views/modules/qc/OQCResultEntry.vue @@ -346,8 +346,11 @@ + + + - + @@ -1181,13 +1184,31 @@ fixed: '', columnWidth: 200, }, + { + userId: this.$store.state.user.name, + functionId: 301017, + serialNumber: '301017Table1Spec', + tableId: "301017Table1", + tableName: "OQC检验记录表", + columnProp: 'spec', + 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: 301017, serialNumber: '301017Table1Umid', tableId: "301017Table1", tableName: "OQC检验记录表", - columnProp: 'umId', + columnProp: 'umName', headerAlign: "center", align: "left", columnLabel: '计量单位', @@ -1773,13 +1794,15 @@ inspectionRemark: '', submitFlag: '', umId: '', + umName: '', rollCount: '', operator: '', operatorName: '', responsiblePerson: '', responsiblePersonName: '', passQty: '', - notPassQty: '' + notPassQty: '', + spec: '' }, detailInformationFlag: false, detailList: [], @@ -2716,11 +2739,13 @@ this.detailData.inspectorNo = row.inspectorNo this.detailData.inspectionRemark = row.inspectionRemark this.detailData.umId = row.umId + this.detailData.umName = row.umName this.detailData.rollCount = row.rollCount this.detailData.operator = row.operator this.detailData.operatorName = row.operatorName this.detailData.responsiblePerson = row.responsiblePerson this.detailData.responsiblePersonName = row.responsiblePersonName + this.detailData.spec = row.spec if (row.state === '待检验') { this.detailData.passQty = row.samplingQty } else {