diff --git a/src/views/modules/qc/FAIResultEntry.vue b/src/views/modules/qc/FAIResultEntry.vue
index 25a548d..de8669a 100644
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@@ -365,7 +365,10 @@
-
+
+
+
+
@@ -431,7 +434,8 @@
min-width="90"
label="操作">
-
+
+
@@ -996,6 +1000,7 @@ export default {
} else {
this.detailData.batchQualifiedQty = this.detailData.rollQty
}
+ this.detailData.notbatchQualifiedQty = this.detailData.rollQty - this.detailData.batchQualifiedQty
}
},
detailList: {
@@ -3460,6 +3465,10 @@ export default {
this.detailData.disposalRemark = ''
}
}
+ if (this.detailData.passQty>this.detailData.rollQty){
+ this.$message.warning('合格数量不能大于送检数量！')
+ return
+ }
this.saveDetailInformation(type)
},
@@ -4163,7 +4172,7 @@ export default {
partNo: '',
partDesc: '',
operationDesc: '',
- status: '下达'
+ status: 'N'
}
this.seqInfoList = []
},
diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 46044ef..8cf9f04 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -348,7 +348,10 @@
-
+
+
+
+
@@ -414,7 +417,8 @@
min-width="90"
label="操作">
-
+
+
@@ -971,6 +975,7 @@
} else {
this.detailData.batchQualifiedQty = this.detailData.rollQty
}
+ this.detailData.notbatchQualifiedQty = this.detailData.rollQty - this.detailData.batchQualifiedQty
}
},
detailList: {
@@ -3427,6 +3432,10 @@
this.detailData.disposalRemark = ''
}
}
+ if (this.detailData.passQty>this.detailData.rollQty){
+ this.$message.warning('合格数量不能大于送检数量！')
+ return
+ }
this.saveDetailInformation(type)
},
@@ -4134,7 +4143,7 @@
partNo: '',
partDesc:'',
operationDesc: '',
- status: '下达'
+ status: 'N'
}
this.seqInfoList = []
},
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 75fa13e..362223c 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -349,20 +349,23 @@
-
-
+
+
-
+
-
+
-
+
+
+
+
@@ -425,10 +428,11 @@
prop=""
header-align="center"
align="center"
- min-width="90"
+ :min-width="90"
label="操作">
-
+
+
@@ -451,7 +455,7 @@
prop=""
header-align="center"
align="right"
- min-width="80"
+ :min-width="80"
label="实测值">
@@ -462,7 +466,7 @@
prop=""
header-align="center"
align="center"
- min-width="80"
+ :min-width="80"
label="检验明细">
点击输入
@@ -473,7 +477,7 @@
prop=""
header-align="center"
align="right"
- min-width="80"
+ :min-width="80"
label="抽样数量">
@@ -484,7 +488,7 @@
prop=""
header-align="center"
align="right"
- min-width="80"
+ :min-width="80"
label="不合格数量">
@@ -495,7 +499,7 @@
prop=""
header-align="center"
align="right"
- min-width="90"
+ :min-width="90"
label="项目检验结论">
@@ -869,7 +873,7 @@
@@ -992,6 +996,7 @@
} else {
this.detailData.batchQualifiedQty = this.detailData.rollQty
}
+ this.detailData.notbatchQualifiedQty = this.detailData.rollQty - this.detailData.batchQualifiedQty
}
},
detailList: {
@@ -1601,7 +1606,7 @@
partNo:'',
partDesc:'',
rollQty:'',
- samplingQty: '',
+ samplingQty: 0,
unqualifiedQty: 0,
unqualifiedQuantity:'',
disposalMeasures:'',
@@ -1621,9 +1626,10 @@
responsiblePerson: '',
responsiblePersonName: '',
state: '',
- passQty: '',
- notPassQty: '',
- batchQualifiedQty: ''
+ passQty: 0,
+ notPassQty: 0,
+ batchQualifiedQty: 0,
+ notbatchQualifiedQty: 0
},
detailInformationFlag: false,
detailList: [],
@@ -3504,6 +3510,10 @@
this.detailData.disposalRemark = ''
}
}
+ if (this.detailData.passQty>this.detailData.rollQty){
+ this.$message.warning('合格数量不能大于送检数量！')
+ return
+ }
this.saveDetailInformation(type)
},
@@ -4201,7 +4211,7 @@
partNo: '',
partDesc: '',
operationDesc: '',
- status: '下达'
+ status: 'N'
}
this.seqInfoList = []
},
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index f20add7..677b6ed 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -252,7 +252,10 @@
-
+
+
+
+
@@ -336,7 +339,8 @@
min-width="90"
label="操作">
-
+
+
@@ -848,6 +852,7 @@
} else {
this.detailData.batchQualifiedQty = this.detailData.rollQty
}
+ this.detailData.notbatchQualifiedQty = this.detailData.rollQty - this.detailData.batchQualifiedQty
}
},
detailList: {
@@ -2538,6 +2543,10 @@
this.detailData.disposalRemark = ''
}
}
+ if (this.detailData.passQty>this.detailData.rollQty){
+ this.$message.warning('合格数量不能大于送检数量！')
+ return
+ }
this.saveDetailInformation(type)
},
diff --git a/src/views/modules/qc/PQCResultEntry.vue b/src/views/modules/qc/PQCResultEntry.vue
index 6bcb172..20642d1 100644
--- a/src/views/modules/qc/PQCResultEntry.vue
+++ b/src/views/modules/qc/PQCResultEntry.vue
@@ -4571,7 +4571,7 @@ export default {
partNo: '',
partDesc:'',
operationDesc: '',
- status: '下达'
+ status: 'N'
}
this.seqInfoList = []
},