diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js index 615372cc..70849d00 100644 --- a/src/api/Assembly/QualityInspectionInformationInquiry.js +++ b/src/api/Assembly/QualityInspectionInformationInquiry.js @@ -35,14 +35,15 @@ export function searchgroup(num) { }) } // 组件查询 -export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4) { +export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '质量管理_质量情况_查询数据', - param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4, + Pagination: pageCurrent + '&' + pageSize } }) } diff --git a/src/api/Assembly/SparePartsOutStockRecord.js b/src/api/Assembly/SparePartsOutStockRecord.js index 2cfefe58..09a480be 100644 --- a/src/api/Assembly/SparePartsOutStockRecord.js +++ b/src/api/Assembly/SparePartsOutStockRecord.js @@ -24,14 +24,15 @@ export function searchgroup(num) { }) } // 车间生产管理工艺_备料管理_备料出库记录_视图_查询数据 -export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5) { +export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_备料管理_备料出库记录_视图_查询数据', - param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件图号_check=' + check3 + '&零件图号=' + value3 + '&开始时间_check=' + check4 + '&开始时间=' + value4 + '&结束时间_check=' + check5 + '&结束时间=' + value5 + param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件图号_check=' + check3 + '&零件图号=' + value3 + '&开始时间_check=' + check4 + '&开始时间=' + value4 + '&结束时间_check=' + check5 + '&结束时间=' + value5, + Pagination: pageCurrent + '&' + pageSize } }) } diff --git a/src/api/ManufacturingCenter/machiningHoursStatistics.js b/src/api/ManufacturingCenter/machiningHoursStatistics.js index 444da7f9..5bab3b71 100644 --- a/src/api/ManufacturingCenter/machiningHoursStatistics.js +++ b/src/api/ManufacturingCenter/machiningHoursStatistics.js @@ -26,3 +26,40 @@ export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) { } }) } +// 初始化机床项目 +export function initProject() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_项目名称_查询数据' + } + }) +} +// 车间生产管理工艺_工时统计_机床查询_查询数据 +export function searchtable4(num1, num2, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计_机床查询_查询数据', + param: '机床流水号_check=' + num1 + '&机床流水号=' + num2, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 车间生产管理工艺_工时统计_组号查询_查询数据 +export function searchtable5(num1, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计_组号查询_查询数据', + param: '机床流水号=' + num1, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index c91260a6..fa12ff43 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -31,7 +31,7 @@ 零件: - 查询 + 查询 @@ -97,6 +97,17 @@ +
+ +
@@ -114,7 +125,11 @@ export default { QualityTypeNumber: [], QualityTypeValue: '', tableData1: [], - SpareParts: '' + SpareParts: '', + loading: false, + total: null, // 总条数 + pageSize: 10, // 每页显示条数 + pageCurrent: 1 // 后台获取页 } }, created() { @@ -165,10 +180,21 @@ export default { if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 } if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 } if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 } - selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue).then(response => { - this.tableData1 = response.data - console.log(response.data, 1111) + selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.pageCurrent, this.pageSize).then(response => { + this.tableData1 = response.data.rows + this.loading = false + this.total = response.data.total }) + }, + // 分页 + handleSizeChange(val) { + this.pageCurrent = 1 + this.pageSize = val + this.selecttable() + }, + handleCurrentChange(val) { + this.pageCurrent = val + this.selecttable() } } } diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue index 94b32697..7f415c0c 100644 --- a/src/views/Assembly/SparePartsOutStockRecord/index.vue +++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue @@ -39,7 +39,7 @@ style="width: 160px" type="date" placeholder="选择日期"/> - 查询 + 查询 @@ -54,16 +54,6 @@ {{ scope.row.机床图号 }} - - - - - - - + - - - +
+ +
@@ -104,7 +100,11 @@ export default { machineNumber: [], groupNumberValue: '', groupNumber: [], - tableData1: [] + tableData1: [], + loading: false, + total: null, // 总条数 + pageSize: 10, // 每页显示条数 + pageCurrent: 1 // 后台获取页 } }, created() { @@ -144,10 +144,21 @@ export default { if (this.PartDrawingNumber !== '' && this.PartDrawingNumber !== null) { this.check3 = 1 } else { this.check3 = 0 } if (this.startTime === '' || this.startTime === null) { this.startTime_check = 0 } else { this.startTime_check = 1 } if (this.endTime === '' || this.endTime === null) { this.endTime_check = 0 } else { this.endTime_check = 1 } - selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.PartDrawingNumber, this.startTime_check, this.startTime, this.endTime_check, this.endTime).then(response => { - this.tableData1 = response.data - console.log(response.data, 1111) + selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.PartDrawingNumber, this.startTime_check, this.startTime, this.endTime_check, this.endTime, this.pageCurrent, this.pageSize).then(response => { + this.tableData1 = response.data.rows + this.loading = false + this.total = response.data.total }) + }, + // 分页 + handleSizeChange(val) { + this.pageCurrent = 1 + this.pageSize = val + this.selecttable() + }, + handleCurrentChange(val) { + this.pageCurrent = val + this.selecttable() } } } diff --git a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue index 93e072fb..fe3a562a 100644 --- a/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue +++ b/src/views/ManufacturingCenter/machiningHoursStatistics/index.vue @@ -26,7 +26,7 @@ - +