diff --git a/src/api/productManagement/completionStatistics.js b/src/api/productManagement/completionStatistics.js new file mode 100644 index 0000000..b8f9786 --- /dev/null +++ b/src/api/productManagement/completionStatistics.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 获取报工列表 +export function getReportList(params) { + return request({ + url: '/productManagement/completionStatistics/list', + method: 'get', + params + }) +} + +// 新增报工 +export function addReport(data) { + return request({ + url: '/productManagement/completionStatistics/add', + method: 'post', + data + }) +} + +// 更新报工 +export function updateReport(data) { + return request({ + url: '/productManagement/completionStatistics/update', + method: 'put', + data + }) +} + +// 删除报工 +export function deleteReport(id) { + return request({ + url: `/productManagement/completionStatistics/delete/${id}`, + method: 'delete' + }) +} + +// 获取报工统计数据 +export function getReportStatistics() { + return request({ + url: '/productManagement/completionStatistics/statistics', + method: 'get' + }) +} \ No newline at end of file diff --git a/src/views/OperationManagement/paintingWorkshop.vue b/src/views/OperationManagement/paintingWorkshop.vue index 11dd479..5f35831 100644 --- a/src/views/OperationManagement/paintingWorkshop.vue +++ b/src/views/OperationManagement/paintingWorkshop.vue @@ -2,7 +2,7 @@
- + diff --git a/src/views/paintLabManagement/dataBatch.vue b/src/views/paintLabManagement/dataBatch.vue index fceba5d..ef36616 100644 --- a/src/views/paintLabManagement/dataBatch.vue +++ b/src/views/paintLabManagement/dataBatch.vue @@ -120,7 +120,7 @@ :header-cell-style="getHeaderCellStyle" ref="dataTable" :column-config="{ resizable: true }" - :row-config="{ isHover: false, isCurrent: false, height: 30 }" + :row-config="{ isHover: false, isCurrent: false }" :cell-config="{ height: 30 }" :loading="isLoading" :data="qualityStatisticsTable" :merge-cells="mergedCells" @@ -899,7 +899,7 @@ export default { }, resetColumns() { - this.$refs.dataTable.resetColumn(); + this.$refs.dataTable.resetCustom(); this.hiddenColumns = []; this.resetMergedCells(); }, diff --git a/src/views/paintLabManagement/dataRawMaterial copy.vue b/src/views/paintLabManagement/dataRawMaterial copy.vue index c699d2f..aabe8f2 100644 --- a/src/views/paintLabManagement/dataRawMaterial copy.vue +++ b/src/views/paintLabManagement/dataRawMaterial copy.vue @@ -44,13 +44,13 @@
-
+
{{ reportType_options[search.reportType].label }} 共 {{ realTotal }} 条
@@ -581,7 +581,7 @@ resetColumn() { const $table = this.$refs.xTable; this.hiddenCells = []; - $table.resetColumn(); + $table.resetCustom(); this.resetMergeTable(); }, resetMergeTable(){ diff --git a/src/views/paintLabManagement/dataRawMaterial.vue b/src/views/paintLabManagement/dataRawMaterial.vue index 26bd0b8..791416d 100644 --- a/src/views/paintLabManagement/dataRawMaterial.vue +++ b/src/views/paintLabManagement/dataRawMaterial.vue @@ -3,266 +3,121 @@ - + - + - + - + - +
- 搜索 - 增加记录 - 导出当前搜索数据 + 搜索 + 增加记录 + 导出当前搜索数据
- +
原材料数据记录 共 {{ realTotal }} 条
- + 保存所有修改（已修改 {{ Object.keys(modifiedRows).length }} 处） - - + + - + - + - + - + - + - + - + - + - + - + - + @@ -328,8 +183,8 @@ export default { ), endDate: new Date( new Date(new Date().toLocaleDateString()).getTime() + - 24 * 60 * 60 * 1000 - - 1 + 24 * 60 * 60 * 1000 - + 1 ), batchNumber: null, colorCode: null, @@ -414,10 +269,10 @@ export default { const rowIndex = this.qualityStatistics.findIndex( (r) => r.id === row.id ); - + // 计算所属分组的起始索引（每5行一组） const groupIndex = Math.floor(rowIndex / 5) * 5; - + // 如果该组还未创建，初始化分组 if (!groupMap.has(groupIndex)) { groupMap.set(groupIndex, { @@ -430,7 +285,7 @@ export default { const group = groupMap.get(groupIndex); group.modifiedRows.add(rowIndex % 5); // 记录组内修改的位置 }); - + // 构建最终更新数据 const updateList = []; groupMap.forEach((group, groupIndex) => { @@ -616,7 +471,7 @@ export default { }, resetColumns() { - this.$refs.dataTable.resetColumn(); + this.$refs.dataTable.resetCustom(); this.hiddenColumns = []; this.resetMergedCells(); }, diff --git a/src/views/paintLabManagement/dataTest.vue b/src/views/paintLabManagement/dataTest.vue index b15b8be..4aa6747 100644 --- a/src/views/paintLabManagement/dataTest.vue +++ b/src/views/paintLabManagement/dataTest.vue @@ -108,7 +108,7 @@ :header-cell-style="getHeaderCellStyle" ref="xTable" :column-config="{ resizable: true }" - :row-config="{ isHover: false, isCurrent: false, height: 30 }" + :row-config="{ isHover: false, isCurrent: false }" :cell-config="{ height: 30 }" :loading="isLoading" :data="qualityStatisticsTable" :merge-cells="mergeCells" @@ -793,7 +793,7 @@ export default { showAllColumns() { this.hiddenCells = []; - this.$refs.xTable.resetColumn(); + this.$refs.xTable.resetCustom(); this.resetTableMerging(); }, diff --git a/src/views/productManagement/completion_statistics.vue b/src/views/productManagement/completion_statistics.vue index e69de29..32bd394 100644 --- a/src/views/productManagement/completion_statistics.vue +++ b/src/views/productManagement/completion_statistics.vue @@ -0,0 +1,321 @@ + + + + + \ No newline at end of file diff --git a/src/views/productManagement/workorder_online.vue b/src/views/productManagement/workorder_online.vue index d3fa6b6..05f26c4 100644 --- a/src/views/productManagement/workorder_online.vue +++ b/src/views/productManagement/workorder_online.vue @@ -25,14 +25,13 @@
@@ -52,8 +51,8 @@ @@ -100,7 +99,7 @@ export default { this.search.year = today.year(); this.search.week = today.week(); // 将0(周日)转为7 - this.search.date = today.day() === 0 ? 7 : today.day(); + this.search.date = '' + (today.day() === 0 ? 7 : today.day()); this.getList() }, methods: { @@ -143,6 +142,9 @@ export default { this.getList() } }) + .catch((err) => { + this.$message.info('动作取消') + }) }, //todo 更改单元格格式 rowClassName(item) { diff --git a/src/views/qualityManagement/FQC/qualityStatistics-backup.vue b/src/views/qualityManagement/FQC/qualityStatistics-backup.vue index 6f970a3..0f2048d 100644 --- a/src/views/qualityManagement/FQC/qualityStatistics-backup.vue +++ b/src/views/qualityManagement/FQC/qualityStatistics-backup.vue @@ -44,12 +44,12 @@
-
+
{{ reportType_options[search.reportType].label }} 共 {{ realTotal }} 条
- + @@ -493,7 +493,7 @@ resetColumn() { const $table = this.$refs.xTable; this.hiddenCells = []; - $table.resetColumn(); + $table.resetCustom(); this.resetMergeTable(); }, resetMergeTable() { diff --git a/src/views/qualityManagement/FQC/qualityStatistics.vue b/src/views/qualityManagement/FQC/qualityStatistics.vue index d945f27..bc0ee5e 100644 --- a/src/views/qualityManagement/FQC/qualityStatistics.vue +++ b/src/views/qualityManagement/FQC/qualityStatistics.vue @@ -4,27 +4,13 @@
- + - + @@ -34,7 +20,8 @@ - +
@@ -46,7 +33,8 @@ - + + @@ -67,44 +55,28 @@
- +
-
-
- {{ reportType_options[search.reportType].label }} 共 {{ realTotal }} 条 - 投入数:{{ totalQuantity }} - 合格数:{{ totalQualifiedNumber }} - 合格率:{{ passRate }} - 抛光数:{{ totalPaoguangTotal }} - 打磨数:{{ totalDamoTotal }} - 报废数:{{ totalBaofeiTotal }} - 倒车雷达:{{ parkingSensor }} -
+
+ {{ reportType_options[search.reportType].label }} 共 {{ realTotal }} 条 + 投入数:{{ totalQuantity }} + 合格数:{{ totalQualifiedNumber }} + 合格率:{{ passRate }} + 抛光数:{{ totalPaoguangTotal }} + 打磨数:{{ totalDamoTotal }} + 报废数:{{ totalBaofeiTotal }} + 倒车雷达:{{ parkingSensor }}
- + @@ -119,8 +91,8 @@ - - + + @@ -360,40 +332,34 @@ export default { if (newValue != null && newValue != oldValue) { try { window.sessionStorage.setItem('QualityStatisticsStartTime', JSON.stringify(newValue)) - } catch (err) {} + } catch (err) { } } }, 'search.endtime'(newValue, oldValue) { if (newValue != null && newValue != oldValue) { try { window.sessionStorage.setItem('QualityStatisticsEndTime', JSON.stringify(newValue)) - } catch (err) {} + } catch (err) { } } }, }, computed: { - // 投入数 + // 过滤掉倒车雷达的数据（优化：避免重复计算） + filteredDataList() { + return this.allDataList.filter(data => !data.productDescription.includes('倒车雷达')) + }, + + // 投入数（依赖过滤后的数据） totalQuantity() { return Math.trunc( - this.allDataList.reduce((acc, data) => { - if (!data.productDescription.includes('倒车雷达')) { - return acc + data.requireNumber - } else { - return acc - } - }, 0) / 3, + this.filteredDataList.reduce((acc, data) => acc + data.requireNumber, 0) / 3 ) }, - // 合格数 + + // 合格数（依赖过滤后的数据） totalQualifiedNumber() { return Math.trunc( - this.allDataList.reduce((acc, data) => { - if (!data.productDescription.includes('倒车雷达')) { - return acc + data.qualifiedNumber - } else { - return acc - } - }, 0) / 3, + this.filteredDataList.reduce((acc, data) => acc + data.qualifiedNumber, 0) / 3 ) }, // 抛光数 @@ -621,7 +587,7 @@ export default { //模拟点击 link.click() //最后，把这个URL进行销毁,免得他占内存 - URL.revokeObjectURL() + URL.revokeObjectURL(blobURL) }) // this.download('/mes/qc/statistics/downloadStatisticsTableExcel'); }, @@ -668,7 +634,7 @@ export default { resetColumn() { const $table = this.$refs.xTable this.hiddenCells = [] - $table.resetColumn() + $table.resetCustom() this.resetMergeTable() }, resetMergeTable() { @@ -705,7 +671,7 @@ export default { }) }, //修改数据 - updateDate(row) {}, + updateDate(row) { }, initReload() { this.resizeObserver = new ResizeObserver((entries) => { @@ -767,4 +733,10 @@ export default { // width: 1920px; // height: 1080px; // } +.middle-data { + width: 100%; + font-size: 20px; + text-align: center; + margin: 0 auto; +} diff --git a/src/views/qualityManagement/backend/report/QualityReport.vue b/src/views/qualityManagement/backend/report/QualityReport.vue index c603d30..a44e04f 100644 --- a/src/views/qualityManagement/backend/report/QualityReport.vue +++ b/src/views/qualityManagement/backend/report/QualityReport.vue @@ -1,12 +1,15 @@ @@ -204,7 +211,6 @@ export default { const mergedSet = new Set() this.mergeCells = [] const count = this.mergeColunmNumber - this.hiddenCells.length - for (let i = 0; i < this.dataList.length; i += num) { for (let j = 0; j < count; j++) { const rowspan = Math.min(num, this.dataList.length - i) @@ -263,17 +269,21 @@ export default { }, // 隐藏列 hideColumn(column) { - const $table = this.$refs.xTable - $table.hideColumn(column) this.hiddenCells.push(column.title) + this.$refs.xTable.hideColumn(column) this.resetMergeTable() + this.$nextTick(() => { + this.$refs.xTable.setMergeCells(this.mergeCells) + }) }, // 取消所有隐藏列 resetColumn() { - const $table = this.$refs.xTable this.hiddenCells = [] - $table.resetColumn() + this.$refs.xTable.resetColumns() this.resetMergeTable() + this.$nextTick(() => { + this.$refs.xTable.setMergeCells(this.mergeCells) + }) }, resetMergeTable() { this.mergeTable(3) diff --git a/src/views/qualityManagement/backend/report/QualityReportTable.vue b/src/views/qualityManagement/backend/report/QualityReportTable.vue index 8e363e3..dc306bc 100644 --- a/src/views/qualityManagement/backend/report/QualityReportTable.vue +++ b/src/views/qualityManagement/backend/report/QualityReportTable.vue @@ -1,22 +1,9 @@ - - + + @@ -262,9 +250,13 @@ export default { } }) + // 计算最大列数（表头列数） + const maxColumns = secondLevelHeader.length; + // 添加数据 allData.forEach((rowData) => { - const rowValues = [ + // 构建基础数据行 + const baseRowValues = [ rowData.workOrder, rowData.partNumber, rowData.description, @@ -285,10 +277,24 @@ export default { rowData.startTime, rowData.endTime, rowData.groupSort === 1 ? '抛光' : rowData.groupSort === 2 ? '打磨' : '报废', - ...this.groupTable.flatMap((group) => group.children.map((defect) => rowData[defect.code])), ] + + // 构建缺陷数据列 + const defectValues = this.groupTable.flatMap((group) => + group.children.map((defect) => rowData[defect.code] || '') + ) + + // 合并基础数据和缺陷数据 + const rowValues = [...baseRowValues, ...defectValues] + + // 确保行数据有足够的列数 + while (rowValues.length < maxColumns) { + rowValues.push('') + } + const row = worksheet.addRow(rowValues) row.eachCell((cell) => { + // 为所有单元格添加边框，包括空单元格 cell.border = { top: { style: 'thin', color: { argb: 'FF161823' } }, left: { style: 'thin', color: { argb: 'FF161823' } }, @@ -296,9 +302,35 @@ export default { right: { style: 'thin', color: { argb: 'FF161823' } }, } cell.font = { size: 14 } + + // 确保单元格内容居中 + cell.alignment = { vertical: 'middle', horizontal: 'center' } }) }) + // 确保表头也有完整边框 + firstLevelRow.eachCell((cell, colNumber) => { + if (colNumber <= maxColumns) { + cell.border = { + top: { style: 'thin', color: { argb: 'FF161823' } }, + left: { style: 'thin', color: { argb: 'FF161823' } }, + bottom: { style: 'thin', color: { argb: 'FF161823' } }, + right: { style: 'thin', color: { argb: 'FF161823' } }, + } + } + }) + + secondLevelRow.eachCell((cell, colNumber) => { + if (colNumber <= maxColumns) { + cell.border = { + top: { style: 'thin', color: { argb: 'FF161823' } }, + left: { style: 'thin', color: { argb: 'FF161823' } }, + bottom: { style: 'thin', color: { argb: 'FF161823' } }, + right: { style: 'thin', color: { argb: 'FF161823' } }, + } + } + }) + // 应用合并单元格 allMergeCells.forEach((merge) => { worksheet.mergeCells(merge.startRow, merge.startCol, merge.endRow, merge.endCol) @@ -318,6 +350,24 @@ export default { setMergeCells(mergeCells) { this.mergeCells = mergeCells }, + // 隐藏列 + hideColumn(column) { + const $table = this.$refs.vxeTable + if ($table && $table.hideColumn) { + $table.hideColumn(column) + } + }, + // 重置列显示 + resetColumns() { + const $table = this.$refs.vxeTable + if ($table && $table.resetCustom) { + $table.resetCustom() + } + }, + // 重置合并单元格 + resetMergeTable() { + this.$emit('resetMergeTable') + }, }, } diff --git a/src/views/qualityManagement/backend/touchScreen/record/QualityReport.vue b/src/views/qualityManagement/backend/touchScreen/record/QualityReport.vue index 1b20aa8..10cfc2b 100644 --- a/src/views/qualityManagement/backend/touchScreen/record/QualityReport.vue +++ b/src/views/qualityManagement/backend/touchScreen/record/QualityReport.vue @@ -218,7 +218,7 @@ export default { resetColumn() { const $table = this.$refs.xTable this.hiddenCells = [] - $table.resetColumn() + $table.resetCustom() this.resetMergeTable() }, resetMergeTable() { diff --git a/src/views/qualityManagement/backend/touchScreen/record/index.vue b/src/views/qualityManagement/backend/touchScreen/record/index.vue index 6e3e0ef..119b484 100644 --- a/src/views/qualityManagement/backend/touchScreen/record/index.vue +++ b/src/views/qualityManagement/backend/touchScreen/record/index.vue @@ -270,7 +270,7 @@ export default { resetColumn() { const $table = this.$refs.xTable this.hiddenCells = [] - $table.resetColumn() + $table.resetCustom() this.resetMergeTable() }, resetMergeTable() { diff --git a/src/views/qualityManagement/gp12/report/QualityReport.vue b/src/views/qualityManagement/gp12/report/QualityReport.vue index f77a3a4..7c474ee 100644 --- a/src/views/qualityManagement/gp12/report/QualityReport.vue +++ b/src/views/qualityManagement/gp12/report/QualityReport.vue @@ -1,12 +1,15 @@ @@ -252,17 +251,21 @@ export default { }, // 隐藏列 hideColumn(column) { - const $table = this.$refs.xTable - $table.hideColumn(column) this.hiddenCells.push(column.title) + this.$refs.xTable.hideColumn(column) this.resetMergeTable() + this.$nextTick(() => { + this.$refs.xTable.setMergeCells(this.mergeCells) + }) }, // 取消所有隐藏列 resetColumn() { - const $table = this.$refs.xTable this.hiddenCells = [] - $table.resetColumn() + this.$refs.xTable.resetColumns() this.resetMergeTable() + this.$nextTick(() => { + this.$refs.xTable.setMergeCells(this.mergeCells) + }) }, resetMergeTable() { this.mergeTable(3) diff --git a/src/views/qualityManagement/gp12/report/QualityReportTable.vue b/src/views/qualityManagement/gp12/report/QualityReportTable.vue index 050c5ce..ec6a160 100644 --- a/src/views/qualityManagement/gp12/report/QualityReportTable.vue +++ b/src/views/qualityManagement/gp12/report/QualityReportTable.vue @@ -1,22 +1,9 @@ - - + + @@ -262,9 +250,13 @@ export default { } }) + // 计算最大列数（表头列数） + const maxColumns = secondLevelHeader.length; + // 添加数据 allData.forEach((rowData) => { - const rowValues = [ + // 构建基础数据行 + const baseRowValues = [ rowData.workOrder, rowData.partNumber, rowData.description, @@ -285,10 +277,24 @@ export default { rowData.startTime, rowData.endTime, rowData.groupSort === 1 ? '抛光' : rowData.groupSort === 2 ? '打磨' : '报废', - ...this.groupTable.flatMap((group) => group.children.map((defect) => rowData[defect.code])), ] + + // 构建缺陷数据列 + const defectValues = this.groupTable.flatMap((group) => + group.children.map((defect) => rowData[defect.code] || '') + ) + + // 合并基础数据和缺陷数据 + const rowValues = [...baseRowValues, ...defectValues] + + // 确保行数据有足够的列数 + while (rowValues.length < maxColumns) { + rowValues.push('') + } + const row = worksheet.addRow(rowValues) - row.eachCell((cell) => { + row.eachCell((cell, colNumber) => { + // 为所有单元格添加边框，包括空单元格 cell.border = { top: { style: 'thin', color: { argb: 'FF161823' } }, left: { style: 'thin', color: { argb: 'FF161823' } }, @@ -296,6 +302,9 @@ export default { right: { style: 'thin', color: { argb: 'FF161823' } }, } cell.font = { size: 14 } + + // 确保单元格内容居中 + cell.alignment = { vertical: 'middle', horizontal: 'center' } }) }) @@ -313,6 +322,20 @@ export default { } catch (error) { console.error('导出全部数据失败:', error) } + }, + // 隐藏列 + hideColumn(column) { + const $table = this.$refs.vxeTable + if ($table && $table.hideColumn) { + $table.hideColumn(column) + } + }, + // 重置列显示 + resetColumns() { + const $table = this.$refs.vxeTable + if ($table && $table.resetCustom) { + $table.resetCustom() + } }, // 从外部接收 mergeCells 数据的方法 setMergeCells(mergeCells) { diff --git a/src/views/qualityManagement/gp12/touchScreen/record/index.vue b/src/views/qualityManagement/gp12/touchScreen/record/index.vue index 847021e..949c527 100644 --- a/src/views/qualityManagement/gp12/touchScreen/record/index.vue +++ b/src/views/qualityManagement/gp12/touchScreen/record/index.vue @@ -321,7 +321,7 @@ export default { resetColumn() { const $table = this.$refs.xTable this.hiddenCells = [] - $table.resetColumn() + $table.resetCustom() this.resetMergeTable() }, resetMergeTable() { diff --git a/src/views/wmsManagement/components/TheOutboundPlan/index.vue b/src/views/wmsManagement/components/TheOutboundPlan/index.vue index f8fe161..c717f72 100644 --- a/src/views/wmsManagement/components/TheOutboundPlan/index.vue +++ b/src/views/wmsManagement/components/TheOutboundPlan/index.vue @@ -47,7 +47,7 @@ - - + @@ -13,13 +14,16 @@ - + @@ -31,155 +35,155 @@ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/views/wmsManagement/components/TheWmBatchSearch/入库记录根据零件号/index.vue b/src/views/wmsManagement/components/TheWmBatchSearch/入库记录根据零件号/index.vue index f4a6383..351d5db 100644 --- a/src/views/wmsManagement/components/TheWmBatchSearch/入库记录根据零件号/index.vue +++ b/src/views/wmsManagement/components/TheWmBatchSearch/入库记录根据零件号/index.vue @@ -1,6 +1,7 @@