diff --git a/src/api/Outsourcing/OutsourcingQCSearch.js b/src/api/Outsourcing/OutsourcingQCSearch.js index e69de29b..cd3a4590 100644 --- a/src/api/Outsourcing/OutsourcingQCSearch.js +++ b/src/api/Outsourcing/OutsourcingQCSearch.js @@ -0,0 +1,28 @@ +import request from '@/utils/request' + +// 查询外协到货单列表 +export function searchTable1(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_外协到货单_查询数据', + param: ``, + Pagination: params[0] + '&' + params[1] + } + }) +} +// 查询外协到货单明细 +export function searchTable2(...params) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理_外协到货单明细_查询数据', + param: `外协到货单流水号=${params[2]}`, + Pagination: params[0] + '&' + params[1] + } + }) +} 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/tool.js b/src/utils/tool.js index b84e353b..005cfadf 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/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue index 8422f332..b5b97528 100644 --- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue +++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue @@ -1,10 +1,155 @@