diff --git a/src/api/ManufacturingCenter/ProductionPlanQuery.js b/src/api/ManufacturingCenter/ProductionPlanQuery.js index f2f4a098..8951b484 100644 --- a/src/api/ManufacturingCenter/ProductionPlanQuery.js +++ b/src/api/ManufacturingCenter/ProductionPlanQuery.js @@ -25,8 +25,8 @@ export function searchtable() { ModularID: router.currentRoute.path, type: '1', name: '车间生产管理工艺_生产计划_查询零件', - param: `机床流水号=${arguments[0]}&零件图号_check=${arguments[1]}&零件图号=${arguments[2]}&投产时间_check=${arguments[3]}&开始时间=${arguments[4]}&结束时间=${arguments[5]}&加急_check=${arguments[6]}`, - pagination: arguments[7] + '&' + arguments[8] + param: `机床流水号_check=${arguments[0]}&机床流水号=${arguments[1]}&零件图号_check=${arguments[2]}&零件图号=${arguments[3]}&投产时间_check=${arguments[4]}&开始时间=${arguments[5]}&结束时间=${arguments[6]}&加急_check=${arguments[7]}`, + pagination: arguments[8] + '&' + arguments[9] } }) } diff --git a/src/api/ManufacturingCenter/RequestApprovalQuery.js b/src/api/ManufacturingCenter/RequestApprovalQuery.js index 6e9f60f8..e36c94cd 100644 --- a/src/api/ManufacturingCenter/RequestApprovalQuery.js +++ b/src/api/ManufacturingCenter/RequestApprovalQuery.js @@ -25,7 +25,7 @@ export function searchTable1(radio, check1, supplier, check2, start, end, check3 ModularID: router.currentRoute.path, type: '1', name: '采购管理_情况审核查询_查询数据', - param: '查询全部=' + radio + '&供应商名称_check=' + check1 + '&供应商名称=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end + '&人员编号_check=' + check3 + '&人员编号=' + name, + param: '查询全部=' + radio + '&供应商流水号_check=' + check1 + '&供应商流水号=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end + '&人员编号_check=' + check3 + '&人员编号=' + name, Pagination: pageCurrent + '&' + pageSize } }) @@ -44,3 +44,16 @@ export function searchTable2(num) { } }) } +// 查询供应商 +export function searchSupplier() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_供应商_查询数据_根据条件' + } + }) +} diff --git a/src/api/PurchasingCenter/InvoiceSettlementApprove.js b/src/api/PurchasingCenter/InvoiceSettlementApprove.js index 59060016..516102a5 100644 --- a/src/api/PurchasingCenter/InvoiceSettlementApprove.js +++ b/src/api/PurchasingCenter/InvoiceSettlementApprove.js @@ -12,7 +12,7 @@ export function searchTable1(...group) { ModularID: router.currentRoute.path, type: '1', name: '采购管理_发票结算申请单_查询数据', - param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}`, + param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}&供应商_check=${group[6]}&供应商流水号=${group[7]}`, Pagination: group[3] + '&' + group[4] } }) @@ -45,3 +45,17 @@ export function excuteApprove(...data) { } }) } +// 查询供应商 +export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_供应商_查询数据_根据条件', + param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12 + } + }) +} diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index d667ecf7..1a46b381 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -427,6 +427,11 @@ {{ scope.row.操作员 }} + + + - + + + + diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index 121a4b9f..2f84e1a2 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -210,7 +210,7 @@ - + - + + 查询 全部 通过 未过 - 查询 导出 - + - + + + + - - -
- + - + + + + - - -
+ + + + + + + + +
{ + searchtable(check, this.machineNameValue, this.partNamecheck, this.partName, check7, this.outTime[0], this.outTime[1], check8, this.pageCurrent, this.pageSize).then(response => { this.tableData = response.data.rows this.total = response.data.total this.loading = false }) } else { - this.$message.warning('请先选择机床') + this.$message.warning('请输入筛选条件') } }, tableRowClassName({ row }) { diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue index c0967360..866393c0 100644 --- a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue +++ b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue @@ -1,8 +1,15 @@