From 5e6aaeb58eb166ab6a9cde4b326d8a19a2dd29ce Mon Sep 17 00:00:00 2001 From: liushuai Date: Sat, 5 Oct 2019 15:54:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/request.js b/src/utils/request.js index 867f7256..8c2ae1c1 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.103:8005/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.102:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service From 3c48d2583ebb0fc3a33af0c639e5f7e922bacf5d Mon Sep 17 00:00:00 2001 From: liushuai Date: Sun, 6 Oct 2019 08:27:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquipmentMonitoring.js | 35 ++ .../CreatingPurchasingMaterials.js | 2 +- src/api/WorkshopProcurement/NewArrivalList.js | 23 +- src/utils/request.js | 2 +- .../EquipmentMonitoring/index.vue | 432 +++++++++++++----- .../ManufacturingCenter/ParseQuery/index.vue | 147 ++---- .../CreatingPurchasingMaterials/index.vue | 8 +- .../NewArrivalList/index.vue | 53 ++- .../OutsourcingMaterialsInvoice/index.vue | 32 +- 9 files changed, 479 insertions(+), 255 deletions(-) create mode 100644 src/api/ManufacturingCenter/EquipmentMonitoring.js diff --git a/src/api/ManufacturingCenter/EquipmentMonitoring.js b/src/api/ManufacturingCenter/EquipmentMonitoring.js new file mode 100644 index 00000000..867714f8 --- /dev/null +++ b/src/api/ManufacturingCenter/EquipmentMonitoring.js @@ -0,0 +1,35 @@ +import request from '@/utils/request' +// 查询加工工时统计表 +export function getwork_state() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'MES_机加工MES_设备数据采集_工作状态_查询' + } + }) +} +// 查询工位状态 +export function getOP_state() { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'MES_机加工MES_设备数据采集_工位状态_查询' + } + }) +} +// 查询零件图号 +export function searchtooltip(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'MES_机加工MES_工位零件图号查询', + param: '工位号=' + num + } + }) +} diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js index 2ce93a00..2f9738e1 100644 --- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js +++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js @@ -33,7 +33,7 @@ export function saveWeight(num1, num2, num3, num4) { data: { type: '2', name: '备料管理_采购计划明细_保存重量和备注', - param: `采购计划明细流水号=${num1}&重量=${num2}&备注=${num3}&单价=${num4}` + param: `采购计划明细流水号=${num1}&成品尺寸=${num2}&备注=${num3}&单价=${num4}` } }) } diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js index 85e039b5..f56be492 100644 --- a/src/api/WorkshopProcurement/NewArrivalList.js +++ b/src/api/WorkshopProcurement/NewArrivalList.js @@ -26,38 +26,39 @@ export function searchMateriel(num) { }) } // 查询到货单 -export function searchArriveOrder(pageCurrent, pageSize) { +export function searchArriveOrder(num, num1, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_到货单查询', + param: `供应商名称_check=${num}&供应商名称=${num1}`, Pagination: pageCurrent + '&' + pageSize } }) } // 新增到货单 -export function addPurchaseOrder(num1, num2, num3, num4, num5) { +export function addPurchaseOrder(num1, num2, num3, num4, num5, num6) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_新增到货单', - param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}` + param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}&供应商流水号=${num6}` } }) } // 编辑采购单 -export function editPurchaseOrder(num1, num2, num3, num4, num5, num6) { +export function editPurchaseOrder(num1, num2, num3, num4, num5, num6, num7) { return request({ url: '', method: 'post', data: { type: '2', name: '备料管理_编辑到货单', - param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}&到货单流水号=${num6}` + param: `材料=${num1}&单位=${num2}&数量=${num3}&金额=${num4}&备注=${num5}&到货单流水号=${num6}&供应商流水号=${num7}` } }) } @@ -97,3 +98,15 @@ export function addMateriel(num1, num2, num3) { } }) } +// 查询供应商 +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: { + 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/utils/request.js b/src/utils/request.js index 8c2ae1c1..f61bf8ab 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.0.102:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue index 6dbf76b1..e2493725 100644 --- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue +++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue @@ -1,234 +1,328 @@ -