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

src/api/Inventory/PartOut.js

@@ -1,14 +1,14 @@
 import request from '@/utils/request'
 
 // 领料单查询
-export function searchList(listNumber_check, listNumber, pageCurrent, pageSize) {
+export function searchList(listNumber_check, listNumber, pageCurrent, pageSize, isCheck) {
   return request({
     url: '',
     method: 'post',
     data: {
       type: '1',
       name: '车间装配管理_领料单_领料单查询',
-      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber,
+      param: '领料单编号_check=' + listNumber_check + '&领料单编号=' + listNumber + '&是否确认=0',
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/login.js

@@ -11,7 +11,6 @@ export function login(username, password) {
     }
   })
 }
-
 export function getInfo(token) {
   return request({
     url: '',
@@ -23,7 +22,6 @@ export function getInfo(token) {
     }
   })
 }
-
 // 查询按钮功能实现
 export function editPassword(num1, num2, num3, num4) {
   return request({