diff --git a/src/api/ManufacturingCenter/TraceabilityOfParts.js b/src/api/ManufacturingCenter/TraceabilityOfParts.js new file mode 100644 index 00000000..1d6fcea6 --- /dev/null +++ b/src/api/ManufacturingCenter/TraceabilityOfParts.js @@ -0,0 +1,57 @@ +import request from '@/utils/request' + +export function SelectPart() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK', + param: '项目流水号_check=' + arguments[0] + '&项目流水号=' + arguments[1] + '&机床流水号_check=' + arguments[2] + '&机床流水号=' + arguments[3] + '&组件流水号_check=' + arguments[4] + '&组件流水号=' + arguments[5] + '&零件图号_check=' + arguments[6] + '&零件图号=' + arguments[7] + '&考核状态_check=' + arguments[8] + '&考核状态=' + arguments[9] + '&单件是否外协_check=' + arguments[10] + '&单件是否外协=' + arguments[11] + '&时间=' + arguments[12] + '&机加工开始时间=' + arguments[13] + '&机加工结束时间=' + arguments[14] + '&零件类型=' + arguments[15] + '&工艺计划流水号=' + arguments[16] + } + }) +} +export function getTable(stepNumber, a, b, c, d, e, f, g, i, j, k, l, m) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程', + param: '项目流水号_check=' + stepNumber + '=string&项目流水号=' + a + '=string&机床流水号_check=' + b + '=string&机床流水号=' + c + '=string&组件流水号_check=' + d + '=string&组件流水号=' + e + '=string&零件图号_check=' + f + '=string&零件图号=' + g + '=string&是否查询全部数据=1=string&单件是否外协=' + i + '=string&考核状态=6=int&开始时间_check=' + j + '&开始时间=' + k + '&结束时间_check=' + l + '&结束时间=' + m + } + }) +} +export function SelectProcessingProgress() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_加工进度查询_查询', + param: '工艺计划流水号=' + arguments[0] + } + }) +} +export function SelectPreparation() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '零件追溯_备料信息_查询数据', + param: '工艺计划流水号=' + arguments[0] + } + }) +} +export function SelectOut() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '零件追溯_外协信息_查询数据', + param: '工艺计划流水号=' + arguments[0] + } + }) +} diff --git a/src/api/Outsourcing/OutsourcingQCSearch.js b/src/api/Outsourcing/OutsourcingQCSearch.js index b4dace89..53d65092 100644 --- a/src/api/Outsourcing/OutsourcingQCSearch.js +++ b/src/api/Outsourcing/OutsourcingQCSearch.js @@ -8,7 +8,7 @@ export function searchTable1(...params) { data: { type: '1', name: '车间生产管理_外协到货单_查询数据', - param: ``, + param: `外协到货单号_check=${params[2]}&外协到货单号=${params[3]}&外协厂家_check=${params[4]}&外协厂家=${params[5]}`, Pagination: params[0] + '&' + params[1] } }) diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js index b2fcf305..0445867b 100644 --- a/src/api/PurchasingCenter/PurchaseSituationSearch.js +++ b/src/api/PurchasingCenter/PurchaseSituationSearch.js @@ -31,7 +31,7 @@ export function searchTable1(...params) { data: { type: '1', name: '采购管理_采购部采购_查询物料_分配后_加供应商', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}`, + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件类型=${params[6]}&物料名称_check=${params[7]}&物料名称=${params[8]}&物料规格_check=${params[9]}&物料规格=${params[10]}&物料型号_check=${params[11]}&物料型号=${params[12]}`, Pagination: params[4] + '&' + params[5] } }) @@ -44,7 +44,7 @@ export function searchTable2(...params) { data: { type: '1', name: '采购管理_采购部采购_查询物料_基本件_分配后_加供应商', - param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`, + param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}&零件名称_check=${params[6]}&零件名称=${params[7]}&零件规格_check=${params[8]}&零件规格=${params[9]}&零件图号_check=${params[10]}&零件图号=${params[11]}`, Pagination: params[4] + '&' + params[5] } }) diff --git a/src/icons/svg/TraceabilityOfParts.svg b/src/icons/svg/TraceabilityOfParts.svg new file mode 100644 index 00000000..6e5db806 --- /dev/null +++ b/src/icons/svg/TraceabilityOfParts.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/utils/request.js b/src/utils/request.js index 39e0294c..05ba122c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,65 +26,4 @@ const service = axios.create({ timeout: 1500000 // 请求超时时间 }) -// request拦截器 -// service.interceptors.request.use( -// config => { -// if (store.getters.token) { -// config.headers['X-Token'] = getToken() // 让每个请求携带自定义token 请根据实际情况自行修改 -// } -// return config -// }, -// error => { -// // Do something with request error -// console.log(error) // for debug -// Promise.reject(error) -// } -// ) - -// response 拦截器 -// service.interceptors.response.use( -// response => { -// /** -// * code为非20000是抛错 可结合自己业务进行修改 -// */ -// const res = response.data -// if (res.code !== 20000) { -// Message({ -// message: res.message, -// type: 'error', -// duration: 5 * 1000 -// }) -// -// // 50008:非法的token; 50012:其他客户端登录了; 50014:Token 过期了; -// if (res.code === 50008 || res.code === 50012 || res.code === 50014) { -// MessageBox.confirm( -// '你已被登出,可以取消继续留在该页面,或者重新登录', -// '确定登出', -// { -// confirmButtonText: '重新登录', -// cancelButtonText: '取消', -// type: 'warning' -// } -// ).then(() => { -// store.dispatch('FedLogOut').then(() => { -// location.reload() // 为了重新实例化vue-router对象 避免bug -// }) -// }) -// } -// return Promise.reject('error') -// } else { -// return response.data -// } -// }, -// error => { -// console.log('err' + error) // for debug -// Message({ -// message: error.message, -// type: 'error', -// duration: 5 * 1000 -// }) -// return Promise.reject(error) -// } -// ) - export default service diff --git a/src/utils/tool.js b/src/utils/tool.js index 005cfadf..ba0f89ff 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -128,7 +128,7 @@ export function groupBy(datas, keys) { group.data1 = group.data1 || 0 group.key.数量 = group.data1 += v.数量 group.data2 = group.data2 || '' - group.key.机床图号_组号 = group.data2 += (v.机床图号 || '') + '-' + (v.组号 ? v.组号.split('组')[0] : '') + ' ' + group.key.机床图号_组号 = group.data2 += (v.机床图号 || '') + '-' + (v.组号 ? v.组号.split('组')[0] : '') + '
' group.data3 = group.data3 || 0 group.key.合计 = group.data3 += v.合计 }) diff --git a/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue new file mode 100644 index 00000000..00abcfba --- /dev/null +++ b/src/views/ManufacturingCenter/TraceabilityOfParts/index.vue @@ -0,0 +1,531 @@ + + + + + diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue index a0da4aa5..c4a471a8 100644 --- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue +++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue @@ -1,10 +1,14 @@