diff --git a/m.zip b/m.zip deleted file mode 100644 index 197fb93..0000000 Binary files a/m.zip and /dev/null differ diff --git a/src/views/QualityAssurance/InquiryTransitInformation/index.vue b/src/views/QualityAssurance/InquiryTransitInformation/index.vue index 6707c5e..0898a83 100644 --- a/src/views/QualityAssurance/InquiryTransitInformation/index.vue +++ b/src/views/QualityAssurance/InquiryTransitInformation/index.vue @@ -286,9 +286,7 @@ export default { } }) }, - selectDate() { - this.tableData = [] - this.loading = true + getParam(pageCurrent, pageSize) { let orderNumberValue_check, stationNumberValue_check, stationNumberValueN_check, assemblyNumberValue_check, engineTypeValue_check this.assemblyNumberValue ? assemblyNumberValue_check = 1 : (assemblyNumberValue_check = 0, this.assemblyNumberValue = '') this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '') @@ -308,10 +306,16 @@ export default { param[9] = ['订单号', this.orderNumberValue] param[10] = ['机型_ischeck', engineTypeValue_check] param[11] = ['机型', this.engineTypeValue] - param[12] = ['PageCurrent', this.pageCurrent] - param[13] = ['PageSize', this.pageSize] + param[12] = ['PageCurrent', pageCurrent] + param[13] = ['PageSize', pageSize] param[14] = ['PageCount', '1111', 'int', '1'] param[15] = ['ItemCount', '1111', 'int', '1'] + return param + }, + selectDate() { + this.tableData = [] + this.loading = true + var param = this.getParam(this.pageCurrent, this.pageSize) var Data = this.CreateData('11', '质量数据查询_测量数据发动机在线状态_查询_NEW', param) this.ExecDatabase(Data).then(response => { if (response.data.result.length !== 0) { @@ -323,29 +327,7 @@ export default { }, exportExcel() { if (this.tableData.length !== 0) { - let orderNumberValue_check, stationNumberValue_check, stationNumberValueN_check, assemblyNumberValue_check, engineTypeValue_check - this.assemblyNumberValue ? assemblyNumberValue_check = 1 : (assemblyNumberValue_check = 0, this.assemblyNumberValue = '') - this.stationNumberValue ? stationNumberValue_check = 1 : (stationNumberValue_check = 0, this.stationNumberValue = '') - this.stationNumberValueN ? stationNumberValueN_check = 1 : (stationNumberValueN_check = 0, this.stationNumberValueN = '') - this.orderNumberValue ? orderNumberValue_check = 1 : (orderNumberValue_check = 0, this.orderNumberValue = '') - this.engineTypeValue ? engineTypeValue_check = 1 : (engineTypeValue_check = 0, this.engineTypeValue = '') - var param = [] - param[0] = ['开始时间', this.dateTime[0]] - param[1] = ['结束时间', this.dateTime[1]] - param[2] = ['工位号N_ischeck', stationNumberValueN_check] - param[3] = ['工位号N', this.stationNumberValueN] - param[4] = ['发动机号_check', assemblyNumberValue_check] - param[5] = ['发动机号', this.assemblyNumberValue] - param[6] = ['工位号_check', stationNumberValue_check] - param[7] = ['工位号', this.stationNumberValue] - param[8] = ['订单号_ischeck', orderNumberValue_check] - param[9] = ['订单号', this.orderNumberValue] - param[10] = ['机型_ischeck', engineTypeValue_check] - param[11] = ['机型', this.engineTypeValue] - param[12] = ['PageCurrent', 1] - param[13] = ['PageSize', 99999999] - param[14] = ['PageCount', '1111', 'int', '1'] - param[15] = ['ItemCount', '1111', 'int', '1'] + var param = this.getParam(1, 99999999) var exportData = JSON.parse(this.CreateData('2005', '质量数据查询_测量数据发动机在线状态_查询_NEW', param)) exportData.exportFileName = '过站信息查询' exportData.exportColumns = '机型=产品型号,发动机号=产品编号,工位号,托盘编号,到达时间,离开时间,在线时间=生产节拍(m),是否合格'