From 62b80fda72a157a2a17d6faf4479e066dfbfbb1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <9634538+git_rabbit@user.noreply.gitee.com> Date: Fri, 23 Feb 2024 18:21:02 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E5=8E=9F=E6=9D=90=E6=96=99?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81=202.?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F=E7=BB=9F=E8=AE=A1=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouseManagement/material_receipt.js | 26 ++ .../FQC/qualityStatistics.vue | 239 ++++++++++++----- .../warehouseManagement/material_receipt.vue | 240 ++++++++++++++++++ .../paint_material_preparation.vue | 240 ++++++++++++++++++ 4 files changed, 676 insertions(+), 69 deletions(-) create mode 100644 src/api/warehouseManagement/material_receipt.js create mode 100644 src/views/warehouseManagement/material_receipt.vue create mode 100644 src/views/warehouseManagement/paint_material_preparation.vue diff --git a/src/api/warehouseManagement/material_receipt.js b/src/api/warehouseManagement/material_receipt.js new file mode 100644 index 0000000..ec7cbd2 --- /dev/null +++ b/src/api/warehouseManagement/material_receipt.js @@ -0,0 +1,26 @@ +import request from '@/utils/request' +import { downFile } from '@/utils/request' + +export function getMaterialReceiptList(query) { + return request({ + url: '/mes/wm/mrt/getMaterialReceiptList', + method: 'get', + params: query, + }) +} + +export function saveOneMaterialReceipt(data) { + return request({ + url: '/mes/wm/mrt/saveOneMaterialReceipt', + method: 'post', + data: data, + }) +} + +export function savePageMaterialReceipts(data) { + return request({ + url: '/mes/wm/mrt/savePageMaterialReceipts', + method: 'post', + data: data, + }) +} \ No newline at end of file diff --git a/src/views/qualityManagement/FQC/qualityStatistics.vue b/src/views/qualityManagement/FQC/qualityStatistics.vue index e550cbf..7468ae1 100644 --- a/src/views/qualityManagement/FQC/qualityStatistics.vue +++ b/src/views/qualityManagement/FQC/qualityStatistics.vue @@ -2,40 +2,45 @@
- + - + - + - + - + - + - + - + - 搜索 - EXCEL导出 + + 搜索 + EXCEL导出 +
+
+ +
{{ reportType_options[search.reportType].label }}
@@ -47,75 +52,140 @@ :header-cell-style="headerCellStyle" ref="xTable" :column-config="{ resizable: true }" - :row-config="{ isHover: true }" - v-loading="loading" + :row-config="{ isHover: true,isCurrent:true,height:20 }" + :loading="loading" :data="QualityStatisticsTable" :merge-cells="mergeCells" + :cell-style="cellStyle" + size="mini" + align="center" + max-height="800px" + :export-config="{}" > - - - - - + + + + + - - - + + + - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + - +
@@ -130,6 +200,7 @@ export default { name: 'qualityStatistics', data() { return { + inputWidth:'180px', pickerOptions: { shortcuts: [ { @@ -174,9 +245,9 @@ export default { pagination: { total: 0, pageNum: 1, - pageSize: 10, + pageSize: 60, }, - loading: true, + loading: false, QualityStatisticsTable: [], mergeCells: [ // { row: 0, col: 0, rowspan: 3, colspan: 0 }, @@ -220,6 +291,10 @@ export default { //todo 获取统计数据 getList() { + this.loading = true; + setTimeout(()=>{ + this.loading = false; + },30000) let query = { ...this.search, ...this.pagination } delete query['reportType'] delete query['total'] @@ -228,40 +303,40 @@ export default { case 0: GetQualityStatisticsTable_first(query).then((res) => { if (res.code == 200) { - this.loading = false this.QualityStatisticsTable = res.data.item1 - this.pagination.total = res.data.item2 + this.pagination.total = parseInt(res.data.item2/3) this.mergeTable(3) + this.loading = false } }) break case 1: GetQualityStatisticsTable_again(query).then((res) => { if (res.code == 200) { - this.loading = false this.QualityStatisticsTable = res.data.item1 - this.pagination.total = res.data.item2 + this.pagination.total = parseInt(res.data.item2/2) this.mergeTable(2) + this.loading = false } }) break case 2: GetQualityStatisticsTable_final(query).then((res) => { if (res.code == 200) { - this.loading = false this.QualityStatisticsTable = res.data.item1 - this.pagination.total = res.data.item2 + this.pagination.total = parseInt(res.data.item2/2) this.mergeTable(2) + this.loading = false } }) break case 3: GetQualityStatisticsTable_total(query).then((res) => { if (res.code == 200) { - this.loading = false this.QualityStatisticsTable = res.data.item1 - this.pagination.total = res.data.item2 + this.pagination.total = parseInt(res.data.item2/2) this.mergeTable(2) + this.loading = false; } }) break @@ -273,15 +348,41 @@ export default { return { backgroundColor: '#2D3D51', color: '#ffffff', + border:'1px solid #161823', + fontSize:'18px' } }, + + cellStyle() { + return { + border:'1px solid #161823', + fontSize:'16px', + fontWeight:'700' + } + }, //todo 导出excel exportDataEvent() { - this.$refs.xTable1.exportData({ type: 'csv' }) + this.$refs.xTable.openExport() }, + + // 合格率去除小数 + offsetRate(num){ + if(num === null){ + return ""; + } + return parseInt(num); + }, + // 数据去除0 + offsetValue(num){ + if(num === 0||num === '0'){ + return ""; + } + return num; + } }, } - + diff --git a/src/views/warehouseManagement/material_receipt.vue b/src/views/warehouseManagement/material_receipt.vue new file mode 100644 index 0000000..8922682 --- /dev/null +++ b/src/views/warehouseManagement/material_receipt.vue @@ -0,0 +1,240 @@ + + + + + \ No newline at end of file diff --git a/src/views/warehouseManagement/paint_material_preparation.vue b/src/views/warehouseManagement/paint_material_preparation.vue new file mode 100644 index 0000000..6a840fb --- /dev/null +++ b/src/views/warehouseManagement/paint_material_preparation.vue @@ -0,0 +1,240 @@ + + + + + \ No newline at end of file