@@ -530,7 +539,7 @@ export default {
// 成品总入库
finishProductInTotal() {
// GP12合格+后道合格
- return this.boardData.gP12QualifiedTotal + this.boardData.afterPolishInTotal
+ return this.boardData.gP12QualifiedTotal + this.boardData.afterPolishInTotal + (this.boardData.statisticsProductMaintenanceQualifiedTotal ?? 0)
},
},
created() {
diff --git a/src/views/qualityManagement/FQC/qualityStatistics.vue b/src/views/qualityManagement/FQC/qualityStatistics.vue
index 34ae86e..bd99741 100644
--- a/src/views/qualityManagement/FQC/qualityStatistics.vue
+++ b/src/views/qualityManagement/FQC/qualityStatistics.vue
@@ -437,8 +437,9 @@ export default {
},
// 总合格率
passRate() {
+ let _totalQuantity = this.totalQuantity * 1.0
if (this.totalQuantity > 0) {
- return Math.ceil((this.totalQualifiedNumber / this.totalQuantity) * 100) + '%'
+ return ((this.totalQualifiedNumber / _totalQuantity) * 100).toFixed(1) + '%'
} else {
return '0%'
}
diff --git a/src/views/wmsManagement/WmOneTimeQualifiedProduct/WmGP12QualityStatistics.vue b/src/views/wmsManagement/WmOneTimeQualifiedProduct/WmGP12QualityStatistics.vue
index 569f1b6..7990fa6 100644
--- a/src/views/wmsManagement/WmOneTimeQualifiedProduct/WmGP12QualityStatistics.vue
+++ b/src/views/wmsManagement/WmOneTimeQualifiedProduct/WmGP12QualityStatistics.vue
@@ -9,27 +9,12 @@
-
+
-
+
@@ -55,25 +40,10 @@
- 新增记录
+ 新增记录
- 批量删除
+ 批量删除
导出
@@ -89,17 +59,9 @@
报废数:{{ totalBaofeiTotal }}
-
+
-
+
@@ -130,31 +92,12 @@
-
-
+
+
-
+
@@ -256,7 +199,7 @@ import {
delWmGp12QualityStatistics,
updateWmGp12QualityStatistics,
getWmGp12QualityStatistics,
- exportTableData
+ exportTableData,
} from '@/api/wmsManagement/wmGp12QualityStatistics.js'
import ThePartNumberSelect from './ThePartNumberSelect.vue'
export default {
@@ -284,7 +227,7 @@ export default {
pageSize: 10,
startTime: null,
endTime: null,
- type:-1,
+ type: -1,
sort: 'createdTime',
sortType: 'desc',
},
@@ -350,7 +293,7 @@ export default {
typeOptions: [],
// 数据列表
dataList: [],
- allDataList:[],
+ allDataList: [],
// 总记录数
total: 0,
// 提交按钮是否显示
@@ -389,8 +332,9 @@ export default {
},
// 总合格率
passRate() {
+ let _totalQuantity = this.totalQuantity * 1.0
if (this.totalQuantity > 0) {
- return Math.floor((this.totalQualifiedNumber / this.totalQuantity) * 100) + '%'
+ return ((this.totalQualifiedNumber / _totalQuantity) * 100).toFixed(1) + '%'
} else {
return '0%'
}
@@ -436,7 +380,7 @@ export default {
requireNumber: 0,
team: 'GP12',
isReturnWorkpiece: false,
- isPolish:false,
+ isPolish: false,
qualifiedNumber: 0,
qualifiedRate: 0,
paoguangTotal: 0,
@@ -562,9 +506,11 @@ export default {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
- }).then(async () => {
- await exportTableData(queryParams)
- }).catch()
+ })
+ .then(async () => {
+ await exportTableData(queryParams)
+ })
+ .catch()
},
},
}
diff --git a/src/views/wmsManagement/WmPolishInventory/WmPolishQualityStatistics.vue b/src/views/wmsManagement/WmPolishInventory/WmPolishQualityStatistics.vue
index a6ebe00..3f7cbde 100644
--- a/src/views/wmsManagement/WmPolishInventory/WmPolishQualityStatistics.vue
+++ b/src/views/wmsManagement/WmPolishInventory/WmPolishQualityStatistics.vue
@@ -381,8 +381,9 @@ export default {
},
// 总合格率
passRate() {
+ let _totalQuantity = this.totalQuantity * 1.0
if (this.totalQuantity > 0) {
- return Math.floor((this.totalQualifiedNumber / this.totalQuantity) * 100) + '%'
+ return ((this.totalQualifiedNumber / _totalQuantity) * 100).toFixed(1) + '%'
} else {
return '0%'
}
diff --git a/src/views/wmsManagement/WmPolishInventory/WmPolishWorkQualityStatistics.vue b/src/views/wmsManagement/WmPolishInventory/WmPolishWorkQualityStatistics.vue
index d950738..8ccaed8 100644
--- a/src/views/wmsManagement/WmPolishInventory/WmPolishWorkQualityStatistics.vue
+++ b/src/views/wmsManagement/WmPolishInventory/WmPolishWorkQualityStatistics.vue
@@ -308,8 +308,9 @@ export default {
},
// 总合格率
passRate() {
+ let _totalQuantity = this.totalQuantity * 1.0
if (this.totalQuantity > 0) {
- return Math.floor((this.totalQualifiedNumber / this.totalQuantity) * 100) + '%'
+ return ((this.totalQualifiedNumber / _totalQuantity) * 100).toFixed(1) + '%'
} else {
return '0%'
}