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

2019-09-30 17:24:36 +08:00
parent f86a745aad 6c1892d325
commit a1be61437d
3 changed files with 75 additions and 58 deletions
--- a/src/api/PurchasingCenter/CreateInquirySheet.js
+++ b/src/api/PurchasingCenter/CreateInquirySheet.js
@@ -82,7 +82,7 @@ export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2
    method: 'post',
    data: {
      type: '1',
-      name: '采购管理_采购部采购_查询物料_分配后',
+      name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存',
      param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}`,
      Pagination: pageCurrent + '&' + pageSize
    }