From 3a898ee319a5d66267447332b16cb2474c65bd70 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 13 Jan 2020 12:03:47 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E8=BF=BD=E6=BA=AF=E5=8A=A0=E5=B7=A5?= =?UTF-8?q?=E8=BF=87=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProcessingStatusNew.js | 23 +++ src/utils/request.js | 7 +- .../ProcessingStatusNew/index.vue | 151 ++++++++++++++---- .../TraceabilityOfParts/index.vue | 8 +- 4 files changed, 154 insertions(+), 35 deletions(-) diff --git a/src/api/ManufacturingCenter/ProcessingStatusNew.js b/src/api/ManufacturingCenter/ProcessingStatusNew.js index 3db420b9..3fa1db57 100644 --- a/src/api/ManufacturingCenter/ProcessingStatusNew.js +++ b/src/api/ManufacturingCenter/ProcessingStatusNew.js @@ -129,3 +129,26 @@ where s1.group_idx= 1` } }) } + +export function searchWorkTime(code) { + return request({ + url: '', + method: 'post', + data: { + type: 1, + name: '车间生产管理工艺_零件工艺计划_完成零件数量状态更改查询', + param: '工序流水号=' + code + '=int' + } + }) +} +export function submit2(num, num1, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工艺计划_完成零件数量状态更改', + param: `工序流水号=${num}&完成数量=${num1}&操作者=${num2}` + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index da1b48bb..2cb92ad8 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,8 +17,8 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.0.107:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.0.107:8079/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 @@ -26,8 +26,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.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue index 0e26c366..e459cc65 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -1,7 +1,8 @@