From 9155f5ad08a08fb02fe924f73f9e84a27d493ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Mon, 21 Jul 2025 16:44:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=BB=B4=E4=BF=AE=E5=8F=8D=E9=A6=88=EF=BC=9A?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=EF=BC=9A=E4=BA=BA=E5=91=98?=
=?UTF-8?q?=E9=80=89=E6=8B=A9=E6=97=B6=E7=8F=AD=E6=AC=A1=E4=B8=8B=E6=8B=89?=
=?UTF-8?q?=E5=86=85=E5=AE=B9=E6=A0=B9=E6=8D=AEBU=E6=9F=A5=E8=AF=A2=202.**?=
=?UTF-8?q?*=E4=BB=BB=E5=8A=A1=EF=BC=9A=E6=A3=80=E9=AA=8C=E5=8D=95?=
=?UTF-8?q?=EF=BC=9A=E5=A1=AB=E5=86=99=E5=AE=9E=E6=B5=8B=E5=80=BC=E5=90=8E?=
=?UTF-8?q?=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=88=A4=E5=AE=9A=E6=A3=80=E9=AA=8C?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=93=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/modules/eam/eamFeedBack.vue | 10 ++++++--
src/views/modules/qc/FAIResultEntry.vue | 30 ++++++++++++++++++++++-
src/views/modules/qc/FQCResultEntry.vue | 31 +++++++++++++++++++++++-
src/views/modules/qc/IPQCResultEntry.vue | 30 ++++++++++++++++++++++-
src/views/modules/qc/IQCResultEntry.vue | 30 ++++++++++++++++++++++-
src/views/modules/qc/PQCResultEntry.vue | 30 ++++++++++++++++++++++-
6 files changed, 154 insertions(+), 7 deletions(-)
diff --git a/src/views/modules/eam/eamFeedBack.vue b/src/views/modules/eam/eamFeedBack.vue
index a1729a8..a06a58d 100644
--- a/src/views/modules/eam/eamFeedBack.vue
+++ b/src/views/modules/eam/eamFeedBack.vue
@@ -1217,7 +1217,6 @@
// 获取数据列表
this.getDataList()
}
- this.getClassesList()
// 获取用户角色
this.getUserRoleList()
},
@@ -1563,7 +1562,12 @@
this.saveFeedMatterFlag = true
},
getClassesList() {
- getClassesList().then(({data}) => {
+ let split = this.saveModalData.bu.split('_')
+ let params = {
+ site: split[0],
+ buNo: split[1]
+ }
+ getClassesList(params).then(({data}) => {
if (data.code === 0) {
this.classesList = data.rows
} else {
@@ -1852,6 +1856,8 @@
} else {
this.operatorData.roleId = ''
}
+ //根据bu查询班次信息
+ this.getClassesList()
// 查询人员
getOperatorListByOrder(this.operatorData).then(({data}) => {
if (data && data.code === 0) {
diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 1268caa..9ac750a 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -450,7 +450,7 @@
min-width="80"
label="实测值">
-
+
@@ -3825,6 +3825,34 @@
this.$refs[aaa].focus()
})
},
+ updateItemResult(row){
+ if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) {
+ return;
+ }
+ if (row.maxValue == null && row.minValue == null) {
+ if (row.numberValue!=row.defaultValue){
+ row.itemResult = 'N'
+ }
+ }else if (row.maxValue != null && row.minValue != null){
+ if (row.numberValue>row.maxValue ||row.numberValuerow.maxValue) {
+ row.itemResult = 'N'
+ }else {
+ row.itemResult = 'Y'
+ }
+ }else if(row.minValue != null){
+ if ( row.numberValue
-
+
@@ -3799,6 +3799,35 @@
this.$refs[aaa].focus()
})
},
+ updateItemResult(row){
+ if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) {
+ this.$message.success("tuichu")
+ return;
+ }
+ if (row.maxValue == null && row.minValue == null) {
+ if (row.numberValue!=row.defaultValue){
+ row.itemResult = 'N'
+ }
+ }else if (row.maxValue != null && row.minValue != null){
+ if (row.numberValue>row.maxValue ||row.numberValuerow.maxValue) {
+ row.itemResult = 'N'
+ }else {
+ row.itemResult = 'Y'
+ }
+ }else if(row.minValue != null){
+ if ( row.numberValue
-
+
@@ -3879,6 +3879,34 @@
this.$refs[aaa].focus()
})
},
+ updateItemResult(row){
+ if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) {
+ return;
+ }
+ if (row.maxValue == null && row.minValue == null) {
+ if (row.numberValue!=row.defaultValue){
+ row.itemResult = 'N'
+ }
+ }else if (row.maxValue != null && row.minValue != null){
+ if (row.numberValue>row.maxValue ||row.numberValuerow.maxValue) {
+ row.itemResult = 'N'
+ }else {
+ row.itemResult = 'Y'
+ }
+ }else if(row.minValue != null){
+ if ( row.numberValue
-
+
@@ -2867,6 +2867,34 @@
this.$refs[aaa].focus()
})
},
+ updateItemResult(row){
+ if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) {
+ return;
+ }
+ if (row.maxValue == null && row.minValue == null) {
+ if (row.numberValue!=row.defaultValue){
+ row.itemResult = 'N'
+ }
+ }else if (row.maxValue != null && row.minValue != null){
+ if (row.numberValue>row.maxValue ||row.numberValuerow.maxValue) {
+ row.itemResult = 'N'
+ }else {
+ row.itemResult = 'Y'
+ }
+ }else if(row.minValue != null){
+ if ( row.numberValue
-
+
@@ -4140,6 +4140,34 @@ export default {
this.$refs[aaa].focus()
})
},
+ updateItemResult(row){
+ if (row.maxValue == null && row.minValue == null&&row.defaultValue==null) {
+ return;
+ }
+ if (row.maxValue == null && row.minValue == null) {
+ if (row.numberValue!=row.defaultValue){
+ row.itemResult = 'N'
+ }
+ }else if (row.maxValue != null && row.minValue != null){
+ if (row.numberValue>row.maxValue ||row.numberValuerow.maxValue) {
+ row.itemResult = 'N'
+ }else {
+ row.itemResult = 'Y'
+ }
+ }else if(row.minValue != null){
+ if ( row.numberValue