diff --git a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js index 3f8f6066..76649a97 100644 --- a/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js +++ b/src/api/ManufacturingCenter/PartWorkCraftSelect_rdlc.js @@ -78,8 +78,8 @@ export function returnEdit(num) { method: 'post', data: { type: '2', - name: '车间生产管理工艺_在制零件工艺调整_修改工艺', - param: '工艺计划流水号=' + num + name: '车间生产管理工艺_在制零件工艺调整_修改工艺_循环', + param: `工艺计划流水号组=${num}` } }) } diff --git a/src/api/Outsourcing/OutsourcingQCSearch.js b/src/api/Outsourcing/OutsourcingQCSearch.js index e69de29b..53d65092 100644 --- a/src/api/Outsourcing/OutsourcingQCSearch.js +++ b/src/api/Outsourcing/OutsourcingQCSearch.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +// 查询外协到货单列表 +export function searchTable1(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_外协到货单_查询数据', + param: `外协到货单号_check=${params[2]}&外协到货单号=${params[3]}&外协厂家_check=${params[4]}&外协厂家=${params[5]}`, + Pagination: params[0] + '&' + params[1] + } + }) +} +// 查询外协到货单明细 +export function searchTable2(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_外协到货单明细_查询数据', + param: `外协到货单流水号=${params[0]}` + } + }) +} +// 查询外协到货单明细 +export function searchTableDetail(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '质检管理_外协质检数据_查询数据', + param: `检测类型=${params[0]}&外协到货单明细流水号=${params[1]}` + } + }) +} diff --git a/src/api/Outsourcing/OutsourcingTaskQuery.js b/src/api/Outsourcing/OutsourcingTaskQuery.js index d59d251b..ac006459 100644 --- a/src/api/Outsourcing/OutsourcingTaskQuery.js +++ b/src/api/Outsourcing/OutsourcingTaskQuery.js @@ -155,15 +155,15 @@ export function deleteData1(Number) { } }) } -// 选入零件 -export function insertParts(processNum, Number) { +// 零件到货 +export function Arrival(Number) { return request({ url: '', method: 'post', data: { type: '2', - name: '车间生产管理_外协加工任务单明细_增加数据', - param: '外协加工任务单流水号=' + Number + '=int&工艺计划流水号=' + processNum + '=int' + name: '车间生产管理_外协零件_到货', + param: `外协加工任务单明细流水号组=${Number}` } }) } 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/OutsourcingQCSearch.svg b/src/icons/svg/OutsourcingQCSearch.svg new file mode 100644 index 00000000..6366a880 --- /dev/null +++ b/src/icons/svg/OutsourcingQCSearch.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 b84e353b..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/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 8a3308e0..4fa43c68 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -50,7 +50,12 @@ height="550" border highlight-current-row + @selection-change="handleSelectionChange" @row-click="click"> +