From bb4a2316cbd1023d343cf5f5dd0caa9b9811675c Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 7 Aug 2024 17:08:11 +0800
Subject: [PATCH] =?UTF-8?q?2024-08-07=20OMS=E6=8A=A5=E8=A1=A8=E4=BC=98?=
=?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/qc/FQASResultEntry.vue | 8 ++-
src/views/modules/qc/IPQCResultEntry.vue | 15 +++--
src/views/modules/qc/IQCResultEntry.vue | 35 ++++++-----
src/views/modules/qc/OQCResultEntry.vue | 8 ++-
src/views/modules/report/FQAS_report.vue | 48 ++++++++++----
src/views/modules/report/IPQC_report.vue | 80 ++++++++++++++++--------
src/views/modules/report/IQC_report.vue | 25 ++++++++
src/views/modules/report/OQC_report.vue | 47 ++++++++++----
8 files changed, 193 insertions(+), 73 deletions(-)
diff --git a/src/views/modules/qc/FQASResultEntry.vue b/src/views/modules/qc/FQASResultEntry.vue
index 496e3ae..af738cd 100644
--- a/src/views/modules/qc/FQASResultEntry.vue
+++ b/src/views/modules/qc/FQASResultEntry.vue
@@ -2439,8 +2439,12 @@
this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
- this.detailData.passQty = row.passQty
- this.detailData.notPassQty = row.notPassQty
+ if (row.state === '待检验') {
+ this.detailData.passQty = row.samplingQty
+ } else {
+ this.detailData.passQty = row.passQty
+ this.detailData.notPassQty = row.notPassQty
+ }
this.getInspectionFormData()
this.inspectorSearch()
// this.acquisitionList = []
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index a9d507e..e4a97d6 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -573,10 +573,13 @@
+
+
-
+
-
+
+
@@ -3401,8 +3404,12 @@
this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
- this.detailData.passQty = row.passQty
- this.detailData.notPassQty = row.notPassQty
+ if (row.state === '待检验') {
+ this.detailData.passQty = row.samplingQty
+ } else {
+ this.detailData.passQty = row.passQty
+ this.detailData.notPassQty = row.notPassQty
+ }
this.getInspectionFormData()
this.inspectorSearch()
// this.acquisitionList = []
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index ef69bbf..929e029 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -2071,19 +2071,19 @@
fixed: '',
columnWidth: 80,
},
- {
- columnProp: 'passQty',
- headerAlign: "center",
- align: "right",
- columnLabel: '合格数量',
- columnHidden: false,
- columnImage: false,
- columnSortable: false,
- sortLv: 0,
- status: true,
- fixed: '',
- columnWidth: 80,
- },
+ // {
+ // columnProp: 'passQty',
+ // headerAlign: "center",
+ // align: "right",
+ // columnLabel: '合格数量',
+ // columnHidden: false,
+ // columnImage: false,
+ // columnSortable: false,
+ // sortLv: 0,
+ // status: true,
+ // fixed: '',
+ // columnWidth: 80,
+ // },
],
batchIndex: '',
currentRow: {},
@@ -2271,7 +2271,6 @@
submitList: JSON.parse(JSON.stringify(this.IQCSelections)),
itemList: JSON.parse(JSON.stringify(this.batchDetailList))
}
- console.log(tempData)
batchSaveIQCDetailedRecord(tempData).then(({data}) => {
if (data && data.code === 0) {
this.getDataList()
@@ -3064,8 +3063,12 @@
this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
- this.detailData.passQty = row.passQty
- this.detailData.notPassQty = row.notPassQty
+ if (row.state === '待检验') {
+ this.detailData.passQty = row.samplingQty
+ } else {
+ this.detailData.passQty = row.passQty
+ this.detailData.notPassQty = row.notPassQty
+ }
this.getInspectionFormData()
this.inspectorSearch()
// this.acquisitionList = []
diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue
index b5e32cf..9e31854 100644
--- a/src/views/modules/qc/OQCResultEntry.vue
+++ b/src/views/modules/qc/OQCResultEntry.vue
@@ -2439,8 +2439,12 @@
this.detailData.operatorName = row.operatorName
this.detailData.responsiblePerson = row.responsiblePerson
this.detailData.responsiblePersonName = row.responsiblePersonName
- this.detailData.passQty = row.passQty
- this.detailData.notPassQty = row.notPassQty
+ if (row.state === '待检验') {
+ this.detailData.passQty = row.samplingQty
+ } else {
+ this.detailData.passQty = row.passQty
+ this.detailData.notPassQty = row.notPassQty
+ }
this.getInspectionFormData()
this.inspectorSearch()
// this.acquisitionList = []
diff --git a/src/views/modules/report/FQAS_report.vue b/src/views/modules/report/FQAS_report.vue
index b030e27..edfec4a 100644
--- a/src/views/modules/report/FQAS_report.vue
+++ b/src/views/modules/report/FQAS_report.vue
@@ -43,20 +43,23 @@
-
+
-
+
-
+
-
+
-
+
+
+
+
@@ -64,6 +67,12 @@
+
+
+
+
+
+
-
-
-
+
-
-
+
-
+
-
-
+
查询
@@ -242,6 +249,7 @@
partDesc:'',
state: '',
inspectionResult: '',
+ itemResult: '',
disposalMeasures: '',
inspectorName: '',
page: 1,
@@ -911,6 +919,24 @@
fixed: '',
columnWidth: 100,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001003,
+ serialNumber: '107001003Table1ItemResultDesc',
+ tableId: "107001003Table1",
+ tableName: "FQAS报表",
+ columnProp: 'itemResultDesc',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '项目检验结论',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 100,
+ },
],
SubDetailColumnList: [
{
diff --git a/src/views/modules/report/IPQC_report.vue b/src/views/modules/report/IPQC_report.vue
index a65e791..ea5cfbf 100644
--- a/src/views/modules/report/IPQC_report.vue
+++ b/src/views/modules/report/IPQC_report.vue
@@ -24,11 +24,33 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -43,6 +65,12 @@
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
-
+
-
-
+
查询
@@ -225,6 +232,7 @@
inspectionNo: '',
state: '',
inspectionResult: '',
+ itemResult: '',
orderNo: '',
operationDesc: '',
buDesc: '',
@@ -845,6 +853,24 @@
fixed: '',
columnWidth: 100,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001002,
+ serialNumber: '107001002Table1ItemResultDesc',
+ tableId: "107001002Table1",
+ tableName: "IPQC报表",
+ columnProp: 'itemResultDesc',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '项目检验结论',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 100,
+ },
],
SubDetailColumnList: [
{
diff --git a/src/views/modules/report/IQC_report.vue b/src/views/modules/report/IQC_report.vue
index 7fa32ff..6705b0b 100644
--- a/src/views/modules/report/IQC_report.vue
+++ b/src/views/modules/report/IQC_report.vue
@@ -88,6 +88,12 @@
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
+
+
@@ -64,6 +66,12 @@
+
+
+
+
+
+
-
-
-
+
-
-
+
-
+
-
-
+
查询
@@ -242,6 +248,7 @@ export default {
partDesc:'',
state: '',
inspectionResult: '',
+ itemResult: '',
disposalMeasures: '',
inspectorName: '',
page: 1,
@@ -911,6 +918,24 @@ export default {
fixed: '',
columnWidth: 100,
},
+ {
+ userId: this.$store.state.user.name,
+ functionId: 107001004,
+ serialNumber: '107001004Table1ItemResultDesc',
+ tableId: "107001004Table1",
+ tableName: "OQC子明细",
+ columnProp: 'itemResultDesc',
+ headerAlign: "center",
+ align: "center",
+ columnLabel: '项目检验结论',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 100,
+ },
],
SubDetailColumnList: [
{