Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/api/WorkshopProcurement/NewArrivalList.js

@@ -38,26 +38,26 @@ export function searchLxPurchaseOrder(pageCurrent, pageSize, check1, num, check2
   })
 }
 // 查询采购计划明细
-export function searchMateriel(num) {
+export function searchMateriel(num, check, num1) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_采购计划明细_查询数据_未选入',
-      param: `供应商=${num}`
+      param: `供应商=${num}&零件图号_check=${check}&零件图号=${num1}`
     }
   })
 }
 // 查询离线采购计划明细
-export function searchLxMateriel(num) {
+export function searchLxMateriel(num, check, num1) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_离线采购计划明细_查询数据_未选入',
-      param: `供应商流水号=${num}`
+      param: `供应商流水号=${num}&零件图号_check=${check}&零件图号=${num1}`
     }
   })
 }

src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js

@@ -132,15 +132,14 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c
   })
 }
 // 查询到货单
-export function searchArriveOrder(num, num1, num2, num3, num5, pageCurrent, pageSize) {
+export function searchArriveOrder(num, num1, num2, num3, num5) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '备料管理_到货单查询',
-      param: `供应商_check=${num}&供应商=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}`,
-      Pagination: pageCurrent + '&' + pageSize
+      param: `供应商_check=${num}&供应商=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}`
     }
   })
 }