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

2020-02-08 19:10:11 +08:00
parent bd56a45125 df3b5b2011
commit 47e25ccf26
65 changed files with 899 additions and 303 deletions
--- a/src/api/Inventory/MaterialOut.js
+++ b/src/api/Inventory/MaterialOut.js
@@ -35,14 +35,14 @@ export function searchgroup(num) {
  })
 }
 // 领料单查询
-export function searchList(pageCurrent, pageSize, listNumber_check, listNumber) {
+export function searchList(pageCurrent, pageSize, listPeople_check, listPeople, check1, time1, time2) {
  return request({
    url: '',
    method: 'post',
    data: {
      type: '1',
      name: '车间装配管理_领料单_查询数据',
-      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + '&是否审批=1',
+      param: '制单人_check=' + listPeople_check + '&制单人=' + listPeople + '&时间段_check=' + check1 + '&开始时间=' + time1 + '&结束时间=' + time2 + '&是否审批=1',
      Pagination: pageCurrent + '&' + pageSize
    }
  })