From 0985586effe6fb037b08bb89bf878b79ab53e865 Mon Sep 17 00:00:00 2001 From: "liulujia@meswork.com" Date: Thu, 6 Feb 2020 16:42:34 +0800 Subject: [PATCH] =?UTF-8?q?20200206lljV2=E5=A4=96=E8=B4=AD=E5=A4=87?= =?UTF-8?q?=E6=96=99=E9=83=A8=E5=88=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorkshopProcurement/OfflineProcurement.js | 4 +- src/utils/request.js | 2 +- .../MaterialArrival/index.vue | 2 +- .../OfflineProcurement/index.vue | 41 ++++++++++++++----- 4 files changed, 35 insertions(+), 14 deletions(-) diff --git a/src/api/WorkshopProcurement/OfflineProcurement.js b/src/api/WorkshopProcurement/OfflineProcurement.js index 7b693454..5ff7f799 100644 --- a/src/api/WorkshopProcurement/OfflineProcurement.js +++ b/src/api/WorkshopProcurement/OfflineProcurement.js @@ -109,14 +109,14 @@ export function getGroups(stepNumber) { }) } -export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize) { +export function getTable(checkbox_Machine, Machine, checkbox_Group, Group, checkbox_number, number, k, m, pageCurrent, pageSize, ordername, order) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序_横向赋值新建存储过程_新', - param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m, + param: '项目流水号_check=0=string&机床流水号_check=' + checkbox_Machine + '=string&机床流水号=' + Machine + '=string&组件流水号_check=' + checkbox_Group + '=string&组件流水号=' + Group + '=string&零件图号_check=' + checkbox_number + '=string&零件图号=' + number + '=string&是否查询全部数据=1=string&单件是否外协=1=string&考核状态=6=int&开始时间_check=0&开始时间=' + k + '&结束时间_check=0&结束时间=' + m + '&排序名称=' + ordername + '&排序方式=' + order, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/utils/request.js b/src/utils/request.js index aae52c5b..7d0dbbf6 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -20,7 +20,7 @@ export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx` export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx` export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/downloadFile.ashx' // 导出excel -export const ExcelWaiGou = 'http://123.56.95.229:8010/submit/excel.ashx' // 导出excel +export const ExcelWaiGou = 'http://192.168.0.106:8045/submit/excel.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://123.56.95.229:8010/webpage/file/` export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 diff --git a/src/views/ManufacturingCenter/MaterialArrival/index.vue b/src/views/ManufacturingCenter/MaterialArrival/index.vue index 640fa768..d4dafd3d 100644 --- a/src/views/ManufacturingCenter/MaterialArrival/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrival/index.vue @@ -20,7 +20,7 @@ 查询 - 完成 + 完成 diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue index 2bddfa61..c81b7196 100644 --- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue +++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue @@ -25,19 +25,19 @@ 查询 - + - + - + @@ -52,7 +52,7 @@ {{ scope.row.批次数量 }} - + @@ -71,8 +71,8 @@ - 离线采购计划编号: - + 离线备料单号: + 供应商: { + getTable(this.checkbox_Machine, this.Machine, this.checkbox_Group, this.Group, this.checkbox_number, this.number, '', '', this.pageCurrent10, this.pageSize10, this.ordername, this.order).then(response => { if (response.data.rows.length !== 0) { for (let i = 0; i < response.data.rows.length; i++) { this.tableData10.push({