From 5572376c18e0212217d6508f4beaaa69cc43efec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= Date: Fri, 18 Oct 2024 20:07:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B6=82=E8=A3=85=E6=8A=9B=E5=85=89=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wmsManagement/wmGp12QualityStatistics.js | 7 +- .../wmPolishQualityStatistics.js | 7 +- .../wmPolishWorkQualityStatistics.js | 7 +- .../FqcWarehouseBoard/index.vue | 79 +++++++++- .../WmGP12QualityStatistics.vue | 81 +++++++++- .../WmOneTimeQualifiedProduct/index.vue | 16 ++ .../WmPolishQualityStatistics.vue | 80 +++++++++- .../WmPolishWorkQualityStatistics.vue | 149 ++++++++++-------- .../wmsManagement/WmPolishInventory/index.vue | 30 +++- 9 files changed, 373 insertions(+), 83 deletions(-) diff --git a/src/api/wmsManagement/wmGp12QualityStatistics.js b/src/api/wmsManagement/wmGp12QualityStatistics.js index 8f91b8a..5018dee 100644 --- a/src/api/wmsManagement/wmGp12QualityStatistics.js +++ b/src/api/wmsManagement/wmGp12QualityStatistics.js @@ -1,5 +1,5 @@ import request from '@/utils/request' - +import { downFile } from '@/utils/request' /** * GP12质检记录表分页查询 * @param {查询条件} data @@ -12,6 +12,11 @@ export function listWmGp12QualityStatistics(query) { }) } +// 导出 +export async function exportTableData(query) { + await downFile('/mes/wm/WmGp12QualityStatistics/export', { ...query }) +} + /** * 新增GP12质检记录表 * @param data diff --git a/src/api/wmsManagement/wmPolishQualityStatistics.js b/src/api/wmsManagement/wmPolishQualityStatistics.js index f7d51f1..6be5074 100644 --- a/src/api/wmsManagement/wmPolishQualityStatistics.js +++ b/src/api/wmsManagement/wmPolishQualityStatistics.js @@ -1,5 +1,5 @@ import request from '@/utils/request' - +import { downFile } from '@/utils/request' /** * 抛光管理-质量统计分页查询 * @param {查询条件} data @@ -54,4 +54,9 @@ export function delWmPolishQualityStatistics(pid) { url: '/mes/wm/WmPolishQualityStatistics/' + pid, method: 'delete' }) +} + +// 导出 +export async function exportTableData(query) { + await downFile('/mes/wm/WmPolishQualityStatistics/export', { ...query }) } \ No newline at end of file diff --git a/src/api/wmsManagement/wmPolishWorkQualityStatistics.js b/src/api/wmsManagement/wmPolishWorkQualityStatistics.js index 6f3d84c..d48a3f9 100644 --- a/src/api/wmsManagement/wmPolishWorkQualityStatistics.js +++ b/src/api/wmsManagement/wmPolishWorkQualityStatistics.js @@ -1,5 +1,5 @@ import request from '@/utils/request' - +import { downFile } from '@/utils/request' /** * 抛光管理-质量统计分页查询 * @param {查询条件} data @@ -12,6 +12,11 @@ export function listWmPolishWorkQualityStatistics(query) { }) } +// 导出 +export async function exportTableData(query) { + await downFile('/mes/wm/WmPolishWorkQualityStatistics/export', { ...query }) +} + /** * 新增抛光管理-质量统计 * @param data diff --git a/src/views/kanbanManagement/FqcWarehouseBoard/index.vue b/src/views/kanbanManagement/FqcWarehouseBoard/index.vue index 765e126..37c725e 100644 --- a/src/views/kanbanManagement/FqcWarehouseBoard/index.vue +++ b/src/views/kanbanManagement/FqcWarehouseBoard/index.vue @@ -27,6 +27,8 @@ + 抛光库存 + 抛光合格数
成品仓库
@@ -104,14 +106,20 @@
合格数 - {{ boardData.polishQualifiedTotal - boardData.polishDoorknobQualifiedTotal }} + {{ boardData.polishQualifiedTotal }}
- + + +
+ 倒车雷达 + {{ boardData.polishParkingSensorbQualifiedTotal }} +
+ +
+ 倒车雷达 + {{ boardData.afterPolishParkingSensorbQualifiedTotal }} +
@@ -197,7 +211,13 @@
合格数 - {{ boardData.gP12QualifiedTotal - boardData.gP12DoorknobQualifiedTotal }} + {{ boardData.gP12QualifiedTotal }} +
+ + +
+ 合格率 + {{ boardData.gP12QualifiePassRate }}
+ +
+ 倒车雷达 + {{ boardData.productParkingSensorbQualifiedTotal }} +
@@ -273,6 +305,40 @@ + + +
+ 统计数据 + +
+ + +
+ 总上件数 + {{ boardData.productRequireTotal }} +
+ + +
+ 总合格数 + {{ boardData.statisticsProductAndPolishQualifiedTotal }} +
+ + +
+ 产线合格数 + {{ boardData.productQualifiedTotal }} +
+ + +
+ 抛光合格数 + {{ boardData.statisticsPolishQualifiedTotal }} +
+ + + +
@@ -289,7 +355,8 @@ export default { timer1: null, queryParams: { partnumber: '', - startTime: this.$dayjs('2024-8-26').toDate(), + startTime: this.$dayjs('2024-10-14').toDate(), + // startTime: this.$dayjs('2024-1-1').toDate(), endTime: null, }, boardData: { @@ -381,7 +448,7 @@ export default { } .main-box { width: 100%; - height: 100vh; + /* height: 100vh; */ display: flex; flex-direction: column; background-color: #e6e8eb; diff --git a/src/views/wmsManagement/WmOneTimeQualifiedProduct/WmGP12QualityStatistics.vue b/src/views/wmsManagement/WmOneTimeQualifiedProduct/WmGP12QualityStatistics.vue index 96f44ca..569f1b6 100644 --- a/src/views/wmsManagement/WmOneTimeQualifiedProduct/WmGP12QualityStatistics.vue +++ b/src/views/wmsManagement/WmOneTimeQualifiedProduct/WmGP12QualityStatistics.vue @@ -37,6 +37,13 @@ + + + + + + + @@ -68,9 +75,19 @@ >批量删除 + + 导出 + - +
+ 投入数:{{ totalQuantity }} + 合格数:{{ totalQualifiedNumber }} + 合格率:{{ passRate }} + 抛光数:{{ totalPaoguangTotal }} + 打磨数:{{ totalDamoTotal }} + 报废数:{{ totalBaofeiTotal }} +
返工件 + + + @@ -156,6 +179,9 @@ + + +
@@ -230,6 +256,7 @@ import { delWmGp12QualityStatistics, updateWmGp12QualityStatistics, getWmGp12QualityStatistics, + exportTableData } from '@/api/wmsManagement/wmGp12QualityStatistics.js' import ThePartNumberSelect from './ThePartNumberSelect.vue' export default { @@ -257,6 +284,7 @@ export default { pageSize: 10, startTime: null, endTime: null, + type:-1, sort: 'createdTime', sortType: 'desc', }, @@ -322,6 +350,7 @@ export default { typeOptions: [], // 数据列表 dataList: [], + allDataList:[], // 总记录数 total: 0, // 提交按钮是否显示 @@ -337,6 +366,36 @@ export default { ThePartNumberSelectRef: null, } }, + computed: { + // 投入数 + totalQuantity() { + return this.allDataList.reduce((acc, data) => acc + data.requireNumber, 0) + }, + // 合格数 + totalQualifiedNumber() { + return this.allDataList.reduce((acc, data) => acc + data.qualifiedNumber, 0) + }, + // 抛光数 + totalPaoguangTotal() { + return this.allDataList.reduce((acc, data) => acc + data.paoguangTotal, 0) + }, + // 打磨数 + totalDamoTotal() { + return this.allDataList.reduce((acc, data) => acc + data.damoTotal, 0) + }, + // 报废数 + totalBaofeiTotal() { + return this.allDataList.reduce((acc, data) => acc + data.baofeiTotal, 0) + }, + // 总合格率 + passRate() { + if (this.totalQuantity > 0) { + return Math.floor((this.totalQualifiedNumber / this.totalQuantity) * 100) + '%' + } else { + return '0%' + } + }, + }, created() { // 列表数据查询 this.getList() @@ -354,6 +413,14 @@ export default { this.loading = false } }) + let params = JSON.parse(JSON.stringify(this.queryParams)) + params.pageNum = 1 + params.pageSize = 100000 + listWmGp12QualityStatistics(params).then((res) => { + if (res.code == 200) { + this.allDataList = res.data.result + } + }) }, // 取消按钮 cancel() { @@ -369,6 +436,7 @@ export default { requireNumber: 0, team: 'GP12', isReturnWorkpiece: false, + isPolish:false, qualifiedNumber: 0, qualifiedRate: 0, paoguangTotal: 0, @@ -487,6 +555,17 @@ export default { PartNumberSelect(value) { this.form.partnumber = value }, + /** 导出按钮操作 **/ + handleExport() { + const queryParams = this.queryParams + this.$confirm('是否确认导出所查询数据项?', '警告', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }).then(async () => { + await exportTableData(queryParams) + }).catch() + }, }, } diff --git a/src/views/wmsManagement/WmOneTimeQualifiedProduct/index.vue b/src/views/wmsManagement/WmOneTimeQualifiedProduct/index.vue index beb3095..675e8fe 100644 --- a/src/views/wmsManagement/WmOneTimeQualifiedProduct/index.vue +++ b/src/views/wmsManagement/WmOneTimeQualifiedProduct/index.vue @@ -60,6 +60,7 @@
一次合格品仓库零件数:{{ partTotal }} + 当前查询结果零件数:{{ totalQuantity }}
acc + data.quantity, 0) + }, + }, created() { // 列表数据查询 this.getList() @@ -433,6 +441,14 @@ export default { this.loading = false } }) + let params = JSON.parse(JSON.stringify(this.queryParams)) + params.pageNum = 1 + params.pageSize = 100000 + listWmOneTimeInventory(params).then((res) => { + if (res.code == 200) { + this.allDataList = res.data.result + } + }) getPartNumber().then((res) => { if (res.code === 200) { this.partTotal = res.data diff --git a/src/views/wmsManagement/WmPolishInventory/WmPolishQualityStatistics.vue b/src/views/wmsManagement/WmPolishInventory/WmPolishQualityStatistics.vue index a2ba3a0..a6ebe00 100644 --- a/src/views/wmsManagement/WmPolishInventory/WmPolishQualityStatistics.vue +++ b/src/views/wmsManagement/WmPolishInventory/WmPolishQualityStatistics.vue @@ -40,6 +40,13 @@ + + + + + + + 搜索 重置 @@ -68,9 +75,19 @@ >批量删除 + + 导出 + - +
+ 投入数:{{ totalQuantity }} + 合格数:{{ totalQualifiedNumber }} + 合格率:{{ passRate }} + 抛光数:{{ totalPaoguangTotal }} + 打磨数:{{ totalDamoTotal }} + 报废数:{{ totalBaofeiTotal }} +
返工件 + + + @@ -150,6 +173,9 @@ + + +
@@ -224,6 +250,7 @@ import { delWmPolishQualityStatistics, updateWmPolishQualityStatistics, getWmPolishQualityStatistics, + exportTableData } from '@/api/wmsManagement/wmPolishQualityStatistics.js' import ThePartNumberSelect from './ThePartNumberSelect.vue' export default { @@ -316,6 +343,7 @@ export default { typeOptions: [], // 数据列表 dataList: [], + allDataList:[], // 总记录数 total: 0, // 提交按钮是否显示 @@ -330,6 +358,36 @@ export default { ThePartNumberSelectRef: null, } }, + computed: { + // 投入数 + totalQuantity() { + return this.allDataList.reduce((acc, data) => acc + data.requireNumber, 0) + }, + // 合格数 + totalQualifiedNumber() { + return this.allDataList.reduce((acc, data) => acc + data.qualifiedNumber, 0) + }, + // 抛光数 + totalPaoguangTotal() { + return this.allDataList.reduce((acc, data) => acc + data.paoguangTotal, 0) + }, + // 打磨数 + totalDamoTotal() { + return this.allDataList.reduce((acc, data) => acc + data.damoTotal, 0) + }, + // 报废数 + totalBaofeiTotal() { + return this.allDataList.reduce((acc, data) => acc + data.baofeiTotal, 0) + }, + // 总合格率 + passRate() { + if (this.totalQuantity > 0) { + return Math.floor((this.totalQualifiedNumber / this.totalQuantity) * 100) + '%' + } else { + return '0%' + } + }, + }, created() { // 列表数据查询 this.getList() @@ -347,6 +405,14 @@ export default { this.loading = false } }) + let params = JSON.parse(JSON.stringify(this.queryParams)) + params.pageNum = 1 + params.pageSize = 100000 + listWmPolishQualityStatistics(params).then((res) => { + if (res.code == 200) { + this.allDataList = res.data.result + } + }) }, // 取消按钮 cancel() { @@ -362,6 +428,7 @@ export default { requireNumber: 0, team: 'A', isReturnWorkpiece: false, + isOver:false, qualifiedNumber: 0, qualifiedRate: 0, paoguangTotal: 0, @@ -480,6 +547,17 @@ export default { PartNumberSelect(value) { this.form.partnumber = value }, + /** 导出按钮操作 **/ + handleExport() { + const queryParams = this.queryParams + this.$confirm('是否确认导出所查询数据项?', '警告', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning', + }).then(async () => { + await exportTableData(queryParams) + }).catch() + }, }, } diff --git a/src/views/wmsManagement/WmPolishInventory/WmPolishWorkQualityStatistics.vue b/src/views/wmsManagement/WmPolishInventory/WmPolishWorkQualityStatistics.vue index e49608d..d950738 100644 --- a/src/views/wmsManagement/WmPolishInventory/WmPolishWorkQualityStatistics.vue +++ b/src/views/wmsManagement/WmPolishInventory/WmPolishWorkQualityStatistics.vue @@ -9,27 +9,12 @@