diff --git a/src/api/PurchasingCenter/PurchaseContractSearch.js b/src/api/PurchasingCenter/PurchaseContractSearch.js index ed3c83b8..30f3cc57 100644 --- a/src/api/PurchasingCenter/PurchaseContractSearch.js +++ b/src/api/PurchasingCenter/PurchaseContractSearch.js @@ -23,14 +23,14 @@ export function initBuyer() { }) } // 采购合同查询 -export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier, check5, approval, numberCheck, number) { +export function searchTable1(pageCurrent, pageSize, check1, start, end, check2, contract, check3, name, check4, supplier, check5, approval, numberCheck, number, check6, review) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_合同_查询数据_采购部采购', - param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&审批情况流水号_check=' + check5 + '&审批情况流水号=' + approval + '&采购合同编号_check=' + numberCheck + '&采购合同编号=' + number, + param: '时间段_check=' + check1 + '&开始时间=' + start + '=datetime&结束时间=' + end + '=datetime&采购合同流水号_check=' + check2 + '&采购合同流水号=' + contract + '&人员编号_check=' + check3 + '&人员编号=' + name + '&供应商名称_check=' + check4 + '&供应商名称=' + supplier + '&审批情况流水号_check=' + check5 + '&审批情况流水号=' + approval + '&采购合同编号_check=' + numberCheck + '&采购合同编号=' + number + '&审核情况流水号_check=' + check6 + '&审核情况流水号=' + review, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index a337cfdd..f163dd73 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -236,7 +236,7 @@ diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 2fabd94b..8e40c869 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -35,6 +35,8 @@ 物料名称: + 物料变更: + 物料规格: @@ -46,7 +48,7 @@ size="small" icon="el-icon-search" style="margin-left: 10px" - @click="pageCurrent11=1;pageSize11=150;total11=0;searchTable11()">查询 + @click="pageCurrent11=1;pageSize11=100;total11=0;searchTable11()">查询 - + @@ -122,7 +124,7 @@ {{ scope.row.物料型号 }} - + @@ -145,7 +147,10 @@