From b7d141230ec4bd9b728f754905b32432eef9b561 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 10 Feb 2025 17:38:44 +0800
Subject: [PATCH] =?UTF-8?q?2025-02-10=20=E5=90=88=E6=A0=BC=E3=80=81?=
=?UTF-8?q?=E4=B8=8D=E5=90=88=E6=A0=BC=E3=80=81=E6=89=B9=E6=AC=A1=E5=90=88?=
=?UTF-8?q?=E6=A0=BC=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/qc/FAIResultEntry.vue | 181 ++++++++++++--------
src/views/modules/qc/FQCResultEntry.vue | 179 ++++++++++++--------
src/views/modules/qc/IPQCResultEntry.vue | 181 ++++++++++++--------
src/views/modules/qc/IQCResultEntry.vue | 201 +++++++++++++++--------
4 files changed, 454 insertions(+), 288 deletions(-)
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index fa4e08a..bc11099 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -330,94 +330,91 @@
-
-
-
-
-
-
-
+
-
- 数据采集
+
+ 协同人员
+ 协同人员
+
+
+
+ 责任人
+ 责任人
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
- 协同人员
- 协同人员
-
-
-
- 责任人
- 责任人
-
-
-
- 工作文件
-
- 明细导入
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -982,6 +979,23 @@
}
},
watch: {
+ detailData: {
+ deep: true,
+ handler: function (newV, oldV) {
+ this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty
+ if (this.detailData.inspectionResult === '不合格') {
+ if (this.detailData.disposalMeasures === '让步接收' || this.detailData.disposalMeasures === '') {
+ this.detailData.batchQualifiedQty = this.detailData.rollQty
+ } else if (this.detailData.disposalMeasures === '挑选使用') {
+ this.detailData.batchQualifiedQty = this.detailData.rollQty - this.detailData.notPassQty
+ } else {
+ this.detailData.batchQualifiedQty = 0
+ }
+ } else {
+ this.detailData.batchQualifiedQty = this.detailData.rollQty
+ }
+ }
+ },
detailList: {
deep: true,
handler: function (newV, oldV) {
@@ -1583,7 +1597,10 @@
operatorName: '',
responsiblePerson: '',
responsiblePersonName: '',
- state: ''
+ state: '',
+ passQty: '',
+ notPassQty: '',
+ batchQualifiedQty: ''
},
detailInformationFlag: false,
detailList: [],
@@ -1606,7 +1623,10 @@
responsiblePerson: '',
responsiblePersonName: '',
subDetailList: [],
- type: ''
+ type: '',
+ passQty: '',
+ notPassQty: '',
+ batchQualifiedQty: ''
},
detailColumnList: [
{
@@ -3418,6 +3438,9 @@
this.saveInformationData.operator = this.detailData.operator
this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
+ this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty
+ this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty
+ this.saveInformationData.batchQualifiedQty = this.detailData.batchQualifiedQty == null ? 0 : this.detailData.batchQualifiedQty
this.saveInformationData.type = type
this.transferLoadFlag = true
// this.saveInformationData.subDetailList = this.acquisitionList
@@ -3527,6 +3550,13 @@
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.state = row.state
+ if (row.state === '待检验') {
+ this.detailData.passQty = row.samplingQty
+ } else {
+ this.detailData.passQty = row.passQty
+ this.detailData.notPassQty = row.notPassQty
+ }
+ this.detailData.batchQualifiedQty = row.batchQualifiedQty
this.getInspectionFormData()
this.inspectorSearch()
// this.acquisitionList = []
@@ -3834,6 +3864,13 @@
})
},
+ // 检验结论改变事件
+ resultChange () {
+ if (this.detailData.inspectionResult === '不合格') {
+ this.detailData.passQty = 0
+ }
+ },
+
// 校验用户是否收藏
favoriteIsOk () {
let userFavorite = {
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index c401233..4c507ae 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -314,24 +314,54 @@
-
-
-
-
-
-
-
+
-
- 数据采集
+
+ 协同人员
+ 协同人员
+
+
+
+ 责任人
+ 责任人
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -343,65 +373,32 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
- 协同人员
- 协同人员
-
-
-
- 责任人
- 责任人
-
-
-
- 工作文件
-
- 明细导入
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -958,6 +955,23 @@
}
},
watch: {
+ detailData: {
+ deep: true,
+ handler: function (newV, oldV) {
+ this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty
+ if (this.detailData.inspectionResult === '不合格') {
+ if (this.detailData.disposalMeasures === '让步接收' || this.detailData.disposalMeasures === '') {
+ this.detailData.batchQualifiedQty = this.detailData.rollQty
+ } else if (this.detailData.disposalMeasures === '挑选使用') {
+ this.detailData.batchQualifiedQty = this.detailData.rollQty - this.detailData.notPassQty
+ } else {
+ this.detailData.batchQualifiedQty = 0
+ }
+ } else {
+ this.detailData.batchQualifiedQty = this.detailData.rollQty
+ }
+ }
+ },
detailList: {
deep: true,
handler: function (newV, oldV) {
@@ -1557,7 +1571,10 @@
operatorName: '',
responsiblePerson: '',
responsiblePersonName: '',
- state: ''
+ state: '',
+ passQty: '',
+ notPassQty: '',
+ batchQualifiedQty: ''
},
detailInformationFlag: false,
detailList: [],
@@ -1580,7 +1597,10 @@
responsiblePerson: '',
responsiblePersonName: '',
subDetailList: [],
- type: ''
+ type: '',
+ passQty: '',
+ notPassQty: '',
+ batchQualifiedQty: ''
},
detailColumnList: [
{
@@ -3391,6 +3411,9 @@
this.saveInformationData.operator = this.detailData.operator
this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
+ this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty
+ this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty
+ this.saveInformationData.batchQualifiedQty = this.detailData.batchQualifiedQty == null ? 0 : this.detailData.batchQualifiedQty
this.saveInformationData.type = type
this.transferLoadFlag = true
// this.saveInformationData.subDetailList = this.acquisitionList
@@ -3500,6 +3523,13 @@
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.state = row.state
+ if (row.state === '待检验') {
+ this.detailData.passQty = row.samplingQty
+ } else {
+ this.detailData.passQty = row.passQty
+ this.detailData.notPassQty = row.notPassQty
+ }
+ this.detailData.batchQualifiedQty = row.batchQualifiedQty
this.getInspectionFormData()
this.inspectorSearch()
// this.acquisitionList = []
@@ -3809,6 +3839,13 @@
})
},
+ // 检验结论改变事件
+ resultChange () {
+ if (this.detailData.inspectionResult === '不合格') {
+ this.detailData.passQty = 0
+ }
+ },
+
// 校验用户是否收藏
favoriteIsOk () {
let userFavorite = {
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index acd875e..ad731db 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -328,94 +328,91 @@
-
-
-
-
-
-
-
+
-
- 数据采集
+
+ 协同人员
+ 协同人员
+
+
+
+ 责任人
+ 责任人
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
- 协同人员
- 协同人员
-
-
-
- 责任人
- 责任人
-
-
-
- 工作文件
-
- 明细导入
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -979,6 +976,23 @@
}
},
watch: {
+ detailData: {
+ deep: true,
+ handler: function (newV, oldV) {
+ this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty
+ if (this.detailData.inspectionResult === '不合格') {
+ if (this.detailData.disposalMeasures === '让步接收' || this.detailData.disposalMeasures === '') {
+ this.detailData.batchQualifiedQty = this.detailData.rollQty
+ } else if (this.detailData.disposalMeasures === '挑选使用') {
+ this.detailData.batchQualifiedQty = this.detailData.rollQty - this.detailData.notPassQty
+ } else {
+ this.detailData.batchQualifiedQty = 0
+ }
+ } else {
+ this.detailData.batchQualifiedQty = this.detailData.rollQty
+ }
+ }
+ },
detailList: {
deep: true,
handler: function (newV, oldV) {
@@ -1603,7 +1617,10 @@
operatorName: '',
responsiblePerson: '',
responsiblePersonName: '',
- state: ''
+ state: '',
+ passQty: '',
+ notPassQty: '',
+ batchQualifiedQty: ''
},
detailInformationFlag: false,
detailList: [],
@@ -1626,7 +1643,10 @@
responsiblePerson: '',
responsiblePersonName: '',
subDetailList: [],
- type: ''
+ type: '',
+ passQty: '',
+ notPassQty: '',
+ batchQualifiedQty: ''
},
detailColumnList: [
{
@@ -3470,6 +3490,9 @@
this.saveInformationData.operator = this.detailData.operator
this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
+ this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty
+ this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty
+ this.saveInformationData.batchQualifiedQty = this.detailData.batchQualifiedQty == null ? 0 : this.detailData.batchQualifiedQty
this.saveInformationData.type = type
this.transferLoadFlag = true
// this.saveInformationData.subDetailList = this.acquisitionList
@@ -3581,6 +3604,13 @@
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.state = row.state
+ if (row.state === '待检验') {
+ this.detailData.passQty = row.samplingQty
+ } else {
+ this.detailData.passQty = row.passQty
+ this.detailData.notPassQty = row.notPassQty
+ }
+ this.detailData.batchQualifiedQty = row.batchQualifiedQty
this.getInspectionFormData()
this.inspectorSearch()
// this.acquisitionList = []
@@ -3888,6 +3918,13 @@
})
},
+ // 检验结论改变事件
+ resultChange () {
+ if (this.detailData.inspectionResult === '不合格') {
+ this.detailData.passQty = 0
+ }
+ },
+
// 校验用户是否收藏
favoriteIsOk () {
let userFavorite = {
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 85dcc7a..137084b 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -216,99 +216,114 @@
-
+
+
+
+
+
+ 协同人员
+ 协同人员
+
+
+
+ 责任人
+ 责任人
+
+
+
+
-
+
-
+
-
+
-
-
+
+
+
-
- 数据采集
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 协同人员
- 协同人员
-
-
-
- 责任人
- 责任人
-
-
-
- 工作文件
-
- 明细导入
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -704,6 +719,23 @@
}
},
watch: {
+ detailData: {
+ deep: true,
+ handler: function (newV, oldV) {
+ this.detailData.notPassQty = this.detailData.samplingQty - this.detailData.passQty
+ if (this.detailData.inspectionResult === '不合格') {
+ if (this.detailData.disposalMeasures === '让步接收') {
+ this.detailData.batchQualifiedQty = this.detailData.rollQty
+ } else if (this.detailData.disposalMeasures === '返工返修' || this.detailData.disposalMeasures === '拒收退回') {
+ this.detailData.batchQualifiedQty = 0
+ } else if (this.detailData.disposalMeasures === '挑选使用') {
+ this.detailData.batchQualifiedQty = this.detailData.rollQty - this.detailData.notPassQty
+ }
+ } else {
+ this.detailData.batchQualifiedQty = this.detailData.rollQty
+ }
+ }
+ },
detailList: {
deep: true,
handler: function (newV, oldV) {
@@ -1623,7 +1655,10 @@
responsiblePerson: '',
responsiblePersonName: '',
invdefinetype: '',
- state: ''
+ state: '',
+ passQty: '',
+ notPassQty: '',
+ batchQualifiedQty: ''
},
detailInformationFlag: false,
detailList: [],
@@ -1650,7 +1685,10 @@
responsiblePerson: '',
responsiblePersonName: '',
subDetailList: [],
- type: ''
+ type: '',
+ passQty: '',
+ notPassQty: '',
+ batchQualifiedQty: ''
},
// 子明细数据对象
tableData: [],
@@ -2344,6 +2382,9 @@
this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
this.saveInformationData.type = type
+ this.saveInformationData.passQty = this.detailData.passQty == null ? 0 : this.detailData.passQty
+ this.saveInformationData.notPassQty = this.detailData.notPassQty == null ? 0 : this.detailData.notPassQty
+ this.saveInformationData.batchQualifiedQty = this.detailData.batchQualifiedQty == null ? 0 : this.detailData.batchQualifiedQty
this.transferLoadFlag = true
// this.saveInformationData.subDetailList = this.acquisitionList
saveIQCDetailedRecord(this.saveInformationData).then(({data}) => {
@@ -2453,6 +2494,13 @@
this.detailData.responsiblePersonName = row.responsiblePersonName
this.detailData.invdefinetype = row.invdefinetype
this.detailData.state = row.state
+ if (row.state === '待检验') {
+ this.detailData.passQty = row.samplingQty
+ } else {
+ this.detailData.passQty = row.passQty
+ this.detailData.notPassQty = row.notPassQty
+ }
+ this.detailData.batchQualifiedQty = row.batchQualifiedQty
this.getInspectionFormData()
this.inspectorSearch()
// this.acquisitionList = []
@@ -2840,6 +2888,13 @@
})
},
+ // 检验结论改变事件
+ resultChange () {
+ if (this.detailData.inspectionResult === '不合格') {
+ this.detailData.passQty = 0
+ }
+ },
+
// 校验用户是否收藏
favoriteIsOk () {
let userFavorite = {