From 3fdee78219131b208da52c2e42dd9831910d6a00 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 24 Dec 2024 09:08:25 +0800
Subject: [PATCH] =?UTF-8?q?2024-12-24=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/qc/DoInspectionBySeqNo.vue | 91 ++++++++++++++++++--
src/views/modules/qc/IPQCResultEntry.vue | 42 +++++----
2 files changed, 109 insertions(+), 24 deletions(-)
diff --git a/src/views/modules/qc/DoInspectionBySeqNo.vue b/src/views/modules/qc/DoInspectionBySeqNo.vue
index d1b82bf..d2e37e7 100644
--- a/src/views/modules/qc/DoInspectionBySeqNo.vue
+++ b/src/views/modules/qc/DoInspectionBySeqNo.vue
@@ -39,16 +39,24 @@
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
@@ -152,7 +160,7 @@
-
+
@@ -292,6 +300,7 @@
workCenterNo: '',
operatorName: '',
departmentID: '',
+ inspectionTypeNo: '',
page: 1,
limit: 10
},
@@ -705,6 +714,78 @@
status: true,
columnWidth: 150,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 3010005001,
+ serialNumber: '3010005001Table1TypeFlag1',
+ tableId: "3010005001Table1",
+ tableName: "派工单号表",
+ fixed: '',
+ columnProp: 'typeFlag1',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: 'IPQC首检',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ columnWidth: 80,
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 3010005001,
+ serialNumber: '3010005001Table1TypeFlag2',
+ tableId: "3010005001Table1",
+ tableName: "派工单号表",
+ fixed: '',
+ columnProp: 'typeFlag2',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: 'IPQC自检',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ columnWidth: 80,
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 3010005001,
+ serialNumber: '3010005001Table1TypeFlag3',
+ tableId: "3010005001Table1",
+ tableName: "派工单号表",
+ fixed: '',
+ columnProp: 'typeFlag3',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: 'IPQC巡检',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ columnWidth: 80,
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 3010005001,
+ serialNumber: '3010005001Table1TypeFlag4',
+ tableId: "3010005001Table1",
+ tableName: "派工单号表",
+ fixed: '',
+ columnProp: 'typeFlag4',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: 'IPQC末件检',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ columnWidth: 80,
+ },
],
templateDetailList: [
{
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 61a8b40..4e8e3b5 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -273,7 +273,7 @@
-
+
@@ -338,31 +338,34 @@
-
+
+
+
+
-
+
-
+
-
+
-
-
+
+
-
+
@@ -381,15 +384,15 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
{
})
},
@@ -3727,6 +3730,7 @@
this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
+ this.detailData.shiftDesc = row.shiftDesc
if (row.state === '待检验') {
this.detailData.passQty = row.samplingQty
} else {