diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js index 4893b14b..741bae7b 100644 --- a/src/api/Assembly/QualityInspectionInformationInquiry.js +++ b/src/api/Assembly/QualityInspectionInformationInquiry.js @@ -48,4 +48,14 @@ export function selecttable(check1, value1, check2, value2, check3, value3, chec } }) } - +export function searchPic(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '质检管理_图片_查询数据', + param: '质检流水号=' + num + } + }) +} diff --git a/src/api/Outsourcing/OutsourcingTaskExecution.js b/src/api/Outsourcing/OutsourcingTaskExecution.js index 6cb9d904..8bfec972 100644 --- a/src/api/Outsourcing/OutsourcingTaskExecution.js +++ b/src/api/Outsourcing/OutsourcingTaskExecution.js @@ -49,14 +49,14 @@ export function getprocedure(processPlan, single) { }) } // 外协厂家查询 -export function searchManufactor(name) { +export function searchManufactor(check, name) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_基础表_外协厂家_查询数据_ 根据条件', - param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=1=bit&外协厂家名称=' + name + '=string&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string' + param: '序号_check=0=bit&序号=' + ' ' + '=string&外协厂家名称_check=' + check + '=bit&外协厂家名称=' + name + '&外协厂家简称_check=0=bit&外协厂家简称=' + ' ' + '=string&地址_check=0=bit&地址=' + ' ' + '=string&联系人_check=0=bit&联系人=' + ' ' + '=string&电话_check=0=bit&电话=' + ' ' + '=string&传真_check=0=bit&传真=' + ' ' + '=string&备注_check=0=bit&备注=' + ' ' + '=string&类别_check=0=bit&类别=' + ' ' + '=string&关注_check=0=bit&关注=' + ' ' + '=string&设备情况_check=0=bit&设备情况=' + ' ' + '=string' } }) } diff --git a/src/utils/request.js b/src/utils/request.js index 39e0294c..4646e1be 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -22,7 +22,7 @@ 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`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index 3e3727b5..abe7b529 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -144,16 +144,17 @@ @current-change="handleCurrentChange"/> - -
- -
+ + + +