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