diff --git a/src/api/ManufacturingCenter/ProcessingStatus.js b/src/api/ManufacturingCenter/ProcessingStatus.js index 9892821f..aa1e8c88 100644 --- a/src/api/ManufacturingCenter/ProcessingStatus.js +++ b/src/api/ManufacturingCenter/ProcessingStatus.js @@ -66,7 +66,7 @@ export function getExport(num) { method: 'post', data: { type: '3', - name: `select 机床流水号,组件流水号,车间生产管理工艺_零件工艺计划.工艺计划流水号,车间生产管理工艺_零件工艺计划.零件图号_零件工艺计划,车间生产管理工艺_零件工序_视图.零件名称,待加工工序顺序,车间生产管理工艺_零件工序.工序流水号,车间生产管理工艺_零件工序.工艺编号,车间生产管理工艺_基础表_工艺名称.工艺名称,批次数量,材料 + name: `select 机床流水号,机床图号,组件流水号,组号,车间生产管理工艺_零件工艺计划.工艺计划流水号,车间生产管理工艺_零件工艺计划.零件图号_零件工艺计划,车间生产管理工艺_零件工序_视图.零件名称,待加工工序顺序,车间生产管理工艺_零件工序.工序流水号,车间生产管理工艺_零件工序.工艺编号,车间生产管理工艺_基础表_工艺名称.工艺名称,批次数量,材料 from ( select 工艺计划流水号,min(工序顺序) as 待加工工序顺序 from 车间生产管理工艺_零件工序_视图 where 完成日期_短 is null and 考核状态 = 6 diff --git a/src/views/ManufacturingCenter/ProcessingStatus/index.vue b/src/views/ManufacturingCenter/ProcessingStatus/index.vue index c8271a02..73b88622 100644 --- a/src/views/ManufacturingCenter/ProcessingStatus/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatus/index.vue @@ -398,8 +398,8 @@ export default { getExport(this.Group).then(res => { console.log(res.data) import('@/vendor/Export2Excel').then(excel => { - const tHeader = ['图号及规格', '制品名称', '计划数', '材料', '当前工序名'] - const filterVal = ['零件图号_零件工艺计划', '零件名称', '批次数量', '材料', '工艺名称'] + const tHeader = ['机床', '组号', '图号及规格', '制品名称', '计划数', '材料', '当前工序名'] + const filterVal = ['机床图号', '组号', '零件图号_零件工艺计划', '零件名称', '批次数量', '材料', '工艺名称'] const list = res.data const data = this.formatJson(filterVal, list) excel.export_json_to_excel({ diff --git a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue index f0b7c63c..e6b8c119 100644 --- a/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue +++ b/src/views/ManufacturingCenter/ProjectPlanningQuery/index.vue @@ -176,7 +176,7 @@ {{ scope.row.任务名称 }} - + @@ -216,7 +216,7 @@ {{ scope.row.任务名称 }} - + @@ -261,7 +261,7 @@ {{ scope.row.任务名称 }} - + @@ -306,7 +306,7 @@ {{ scope.row.任务名称 }} - + @@ -351,7 +351,7 @@ {{ scope.row.任务名称 }} - +