diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js index 6b20a96d..4893b14b 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, pageCurrent, pageSize) { +export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, 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 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/api/ManufacturingCenter/GroupMatching.js b/src/api/ManufacturingCenter/GroupMatching.js index b31f7507..582033f8 100644 --- a/src/api/ManufacturingCenter/GroupMatching.js +++ b/src/api/ManufacturingCenter/GroupMatching.js @@ -32,14 +32,14 @@ export function searchgroup(num, pageCurrent, pageSize) { } }) } -export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time, pageCurrent, pageSize) { +export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_基本件成组配套_查询数据', - param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string', + param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int', pagination: pageCurrent + '&' + pageSize } }) @@ -67,14 +67,14 @@ export function searchPurchaseTable(check, entryNameValue, check1, machine, chec } }) } -export function searchTable1(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time, pageCurrent, pageSize) { +export function searchTable1(check, entryNameValue, check1, machine, check2, groupNum, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '库存管理_车间采购出库_零件查询', - param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string', + param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int', pagination: pageCurrent + '&' + pageSize } }) @@ -90,3 +90,29 @@ export function processingStatus(num) { } }) } +// 查询表1标准件和外购件 +export function searchTable01(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购部采购_查询物料_分配后_加供应商', + param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}`, + Pagination: params[6] + '&' + params[7] + } + }) +} +// 查询表1基本件 +export function searchTable02(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商', + param: `项目流水号_check=${params[0]}&项目流水号=${params[1]}&机床流水号_check=${params[2]}&机床流水号=${params[3]}&组件流水号_check=${params[4]}&组件流水号=${params[5]}`, + Pagination: params[6] + '&' + params[7] + } + }) +} diff --git a/src/api/TechnologyCenter/QueryParts.js b/src/api/TechnologyCenter/QueryParts.js index f5863d45..52e3273b 100644 --- a/src/api/TechnologyCenter/QueryParts.js +++ b/src/api/TechnologyCenter/QueryParts.js @@ -81,3 +81,14 @@ export function deletePurchaseData(num) { } }) } +export function getFileData(MachineDrawValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床总图_查询数据', + param: `机床流水号=${MachineDrawValue}` + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index c609d18e..39e0294c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -11,14 +11,16 @@ export const name1 = `OP1000` export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice export const readImg = `http://192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond export const upload = `http://192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement -export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const upload2 = `http://192.168.1.231:8411/submit/upload2.ashx` // delivery export const upload3 = `http://192.168.1.231:8411/submit/upload3.ashx` // performancebond export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoiceScan1.ashx` // invoice(workshop) export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement -export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 +// 技术中心程序发布时要更改下面所有的IP到0段 +export const ServerIP = `http://192.168.1.231:8411/webpage/file/` +export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 +export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 const service = axios.create({ baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index 10673baf..bb0d5683 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -31,6 +31,22 @@ 零件: + 时间区间: + + ~ + 查询 @@ -130,6 +146,8 @@ export default { return { machineNumberValue: '', machineNumber: [], + startTime: '', + endTime: '', groupNumberValue: '', groupNumber: [], QualityTypeNumber: [], @@ -190,7 +208,9 @@ 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, this.pageCurrent, this.pageSize).then(response => { + if (this.startTime !== '' && this.startTime !== null) { this.check5 = 1 } else { this.check5 = 0 } + if (this.endTime !== '' && this.endTime !== null) { this.check6 = 1 } else { this.check6 = 0 } + selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.pageCurrent, this.pageSize).then(response => { this.tableData1 = response.data.rows this.loading = false this.total = response.data.total diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index d0cb1f1c..6d9fe67a 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -20,44 +20,20 @@ 组号: - 年: - - 月: - - - - 入库时间: - - 查询 + 查询 +

车间生产

- + border + stripe>