diff --git a/src/api/mes/reportWork.js b/src/api/mes/reportWork.js index 87f60379..bcd82547 100644 --- a/src/api/mes/reportWork.js +++ b/src/api/mes/reportWork.js @@ -163,4 +163,3 @@ export function getMesListBom(query) { // method: 'get' // }); // } - \ No newline at end of file diff --git a/src/api/mes/reportWorkConsume.js b/src/api/mes/reportWorkConsume.js index e9480859..a7126dc7 100644 --- a/src/api/mes/reportWorkConsume.js +++ b/src/api/mes/reportWorkConsume.js @@ -26,6 +26,15 @@ export function addReportWorkConsume(data) { }); } +// 新增生产报工物料消耗 +export function addConsumes(data) { + return request({ + url: '/mes/reportWorkConsume/addConsumes', + method: 'post', + data: data + }); +} + // 修改生产报工物料消耗 export function updateReportWorkConsume(data) { return request({ diff --git a/src/api/quality/qcTable.js b/src/api/quality/qcTable.js new file mode 100644 index 00000000..92d331b2 --- /dev/null +++ b/src/api/quality/qcTable.js @@ -0,0 +1,19 @@ +import request from '@/utils/request' + +// 来料质量报表 +export function getIncomeTableList(query) { + return request({ + url: '/quality/staticTable/getIncomeTableList', + method: 'get', + params: query + }); +} + +// 生产过程质量报表 +export function getProduceTableList(query) { + return request({ + url: '/quality/staticTable/getProduceTableList', + method: 'get', + params: query + }); +} diff --git a/src/views/device/repairOrder/selectSparePartsLedger.vue b/src/views/device/repairOrder/selectSparePartsLedger.vue index 2ff0dd6e..2df199aa 100644 --- a/src/views/device/repairOrder/selectSparePartsLedger.vue +++ b/src/views/device/repairOrder/selectSparePartsLedger.vue @@ -43,15 +43,15 @@ - - + + - - + + --> - + - + - + diff --git a/src/views/mes/reportWork/reportWorkConsume.vue b/src/views/mes/reportWork/reportWorkConsume.vue index 134e6d23..498d0add 100644 --- a/src/views/mes/reportWork/reportWorkConsume.vue +++ b/src/views/mes/reportWork/reportWorkConsume.vue @@ -7,7 +7,7 @@ plain icon="el-icon-plus" size="mini" - @click="handleAdd" + @click="handleSelectMaterial" >新增 @@ -87,8 +87,7 @@ - - + @@ -116,16 +115,17 @@ 确 定 取 消 + - diff --git a/src/views/quality/qcTableProduce/index.vue b/src/views/quality/qcTableProduce/index.vue new file mode 100644 index 00000000..0db5583f --- /dev/null +++ b/src/views/quality/qcTableProduce/index.vue @@ -0,0 +1,384 @@ + + +