diff --git a/src/api/ManufacturingCenter/ContractDetailsInquiry.js b/src/api/ManufacturingCenter/ContractDetailsInquiry.js index a4aa8bb5..537bd2e8 100644 --- a/src/api/ManufacturingCenter/ContractDetailsInquiry.js +++ b/src/api/ManufacturingCenter/ContractDetailsInquiry.js @@ -26,15 +26,14 @@ export function initMachine(projectNum) { } // 查询项目详情 -export function searchatabledata(projectNum, machineValue, pageCurrent, pageSize) { +export function searchatabledata(projectNum, machineValue) { return request({ url: '', method: 'post', data: { type: '1', name: '项目工时统计_合同详情查询_工时综合查询', - param: `项目流水号=${projectNum}&机床流水号=${machineValue}`, - Pagination: pageCurrent + '&' + pageSize + param: `项目流水号=${projectNum}&机床流水号=${machineValue}` } }) } diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue index 76c40d39..b469b23e 100644 --- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue +++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue @@ -2,7 +2,7 @@
项目名称 - + --> - 加工总工时（小时）: - - 计划总工时（小时）: - + + + + 查询 + 导出 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + -
- -
@@ -129,15 +120,13 @@ export default { projectValue: '', // 项目名称 machineValue: '', // 机床名称 machine: [], + loading: false, part: [], // 分組 partValue: '', specificationValue: '', // 规格型号 totalProcessingHours: '', // 加工总工时 totalPlannedHours: '', // 计划总工时 - tableData: [], // 详情表 - PageCurrent: 1, - PageSize: 1000, - total: 0 + tableData: [] // 详情表 } }, created() { @@ -161,40 +150,58 @@ export default { }, // 查询按钮 searchTable() { this.tableData = [] - searchatabledata(this.projectValue, this.machineValue, this.PageCurrent, this.PageSize).then(response => { - if (response.data.rows.length !== 0) { - for (let i = 0; i < response.data.rows.length; i++) { - this.tableData.push({ - 跟单号: response.data.rows[i].跟单号, - 序号: response.data.rows[i].工序顺序, - 工序名: response.data.rows[i].工艺名称, - 计划数量: response.data.rows[i].批次数量, - 计划准备工时: response.data.rows[i].准结定额工时, - 单件计划工时: response.data.rows[i].单件定额工时, - 计划工时: Number(response.data.rows[i].批次数量) * (Number(response.data.rows[i].单件定额工时) + Number(response.data.rows[i].准结定额工时)), - 计划加工日期: response.data.rows[i].计划日期.split(' ')[0], - 加工数量: response.data.rows[i].批次数量, - 加工准备工时: response.data.rows[i].修补准结工时, - 加工工时: response.data.rows[i].设备工时, - 加工日期: response.data.rows[i].操作时间, - 图号及规格: response.data.rows[i].机床图号, - 制品名称: response.data.rows[i].零件名称 - }) - this.totalProcessingHours += Number(response.data.rows[i].设备工时) - this.totalPlannedHours += Number(Number(response.data.rows[i].批次数量) * (Number(response.data.rows[i].单件定额工时) + Number(response.data.rows[i].准结定额工时))) + if (this.machineValue) { + this.loading = true + searchatabledata(this.projectValue, this.machineValue).then(response => { + if (response.data.length !== 0) { + for (let i = 0; i < response.data.length; i++) { + this.tableData.push({ + 跟单号: response.data[i].跟单号, + 序号: response.data[i].工序顺序, + 工序名: response.data[i].工艺名称, + 计划数量: response.data[i].批次数量, + 计划准备工时: response.data[i].准结定额工时, + 单件计划工时: response.data[i].单件定额工时, + 计划工时: Number(response.data[i].批次数量) * (Number(response.data[i].单件定额工时) + Number(response.data[i].准结定额工时)), + 计划加工日期: response.data[i].计划日期.split(' ')[0], + 加工数量: response.data[i].批次数量, + 加工准备工时: response.data[i].修补准结工时, + 加工工时: response.data[i].设备工时, + 加工日期: response.data[i].操作时间, + 图号及规格: response.data[i].机床图号, + 制品名称: response.data[i].零件名称 + }) + } + this.loading = false } - } - this.total = response.data.total + }) + } else { + this.$message.warning('请选择要查询的机床') + } + }, + formatJson(filterVal, jsonData) { + return jsonData.map(v => filterVal.map(j => { + return v[j] + })) + }, + exportExcel() { + if (this.tableData.length === 0) { + this.$message.warning('请查询出要导出的数据') + return + } + import('@/vendor/Export2Excel').then(excel => { + const tHeader = ['跟单号', '工序', '工序名', '计划件数', '计划准结(分)', '计划定额(分)', '计划工时(分)', '计划加工日期', '加工件数', '录入准结(分)', '加工工时(分)', '加工日期', '图号及规格', '制品名称'] + const filterVal = ['跟单号', '序号', '工序名', '计划数量', '计划准备工时', '单件计划工时', '计划工时', '计划加工日期', '加工数量', '加工准备工时', '加工工时', '加工日期', '图号及规格', '制品名称'] + const list = this.tableData + const data = this.formatJson(filterVal, list) + excel.export_json_to_excel({ + header: tHeader, + data, + filename: '机床工时表', + autoWidth: true, + bookType: 'xlsx' + }) }) - }, - handleSizeChange(val) { - this.PageCurrent = 1 - this.PageSize = val - this.searchTable() - }, - handleCurrentChange(val) { - this.PageCurrent = val - this.searchTable() } } } diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue index cce8e487..af9ec742 100644 --- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue +++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue @@ -16,13 +16,13 @@ 导出 - + - + @@ -32,7 +32,7 @@ {{ scope.row.跟单号 }} - + @@ -42,22 +42,22 @@ {{ scope.row.工艺名称 }} - + - + - + - + @@ -69,15 +69,15 @@ - + - + @@ -87,7 +87,7 @@ {{ scope.row.项目名称 }} - + @@ -97,7 +97,7 @@ {{ scope.row.组号 }} - + @@ -117,7 +117,8 @@ export default { data() { return { tableData: [], - startTime: '' + startTime: '', + loading: false } }, methods: { @@ -132,7 +133,7 @@ export default { return } import('@/vendor/Export2Excel').then(excel => { - const tHeader = ['日期', '姓名', '图号', '跟单号', '序号', '工序名称', '录入准结工时', '实际工时', '合格数', '不合格数', '备注', '计划准结工时', '计划定额工时', '项目名称', '机床图号', '组号', '设计', '材料'] + const tHeader = ['日期', '姓名', '图号', '跟单号', '工序', '工序名', '录入准结(分)', '实际工时(分)', '合格件数', '废品件数', '备注', '计划准结(分)', '计划定额(分)', '项目名称', '机床图号', '组号', '设计', '材料'] const filterVal = ['操作时间', '姓名', '零件图号_短', '跟单号', '工序顺序', '工艺名称', '修补准结工时', '设备工时', '合格数', '不合格数', '备注', '准结定额工时', '单件定额工时', '项目名称', '机床图号', '组号', '设计者', '材料'] const list = this.tableData const data = this.formatJson(filterVal, list) @@ -147,8 +148,10 @@ export default { }, searchTable() { if (this.startTime[0] && this.startTime[1]) { + this.loading = true searchTable(this.startTime[0], this.startTime[1]).then(response => { this.tableData = response.data + this.loading = false }) } else { this.$message.warning('请选择时间段') diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 34c9667e..03955470 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -119,7 +119,7 @@ - +