From 202b5c88ac876ced42c1c00e39b07211df9b7b4c Mon Sep 17 00:00:00 2001 From: liushuai Date: Fri, 3 Apr 2020 17:59:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RequestApprovalQuery2.js | 59 ++++ src/views/Inventory/MaterialOut/index.vue | 2 +- .../ContractApprovalQuery/index.vue | 5 + .../ContractApprovalQuery1/index.vue | 7 +- .../RequestApprovalQuery/index.vue | 5 + .../RequestApprovalQuery1/index.vue | 24 +- .../ContractApprovalQuery2/index.vue | 333 +++++++++++++++++- .../ProcurementContractApproval/index.vue | 1 + .../RequestApprovalQuery2/index.vue | 264 ++++++++++++++ 9 files changed, 682 insertions(+), 18 deletions(-) create mode 100644 src/api/WorkshopProcurement/RequestApprovalQuery2.js create mode 100644 src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue diff --git a/src/api/WorkshopProcurement/RequestApprovalQuery2.js b/src/api/WorkshopProcurement/RequestApprovalQuery2.js new file mode 100644 index 00000000..a0069796 --- /dev/null +++ b/src/api/WorkshopProcurement/RequestApprovalQuery2.js @@ -0,0 +1,59 @@ +import request from '@/utils/request' +import state from '@/store' +import router from '@/router' + +// 初始化采购员 +export function initBuyer() { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '人事档案管理_人员与角色_查询数据_采购员' + } + }) +} +// 采购合同查询 +export function searchTable1(radio, check1, supplier, check2, start, end, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '车间采购管理_采购合同_请款审批_查询数据', + param: '查询全部=' + radio + '&供应商流水号_check=' + check1 + '&供应商流水号=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询离线合同请款信息明细 +export function searchTable2(num) { + return request({ + url: '', + method: 'post', + data: { + UserID: state.state.user.id, + ModularID: router.currentRoute.path, + type: '1', + name: '采购管理_采购合同_请款明细_查询数据', + param: `采购合同请款流水号=${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/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index 70678e4d..153eaf31 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -224,7 +224,7 @@
取消 - 确 定 + 确 定
diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue index e258a728..cb1b504a 100644 --- a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue +++ b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue @@ -74,6 +74,11 @@ {{ scope.row.审核情况内容 }} + + + + + + + + + + + + + + + + + + + + + + +