From c53f5a495a03a7bdb3216c94a72e4c803cbb3fbe Mon Sep 17 00:00:00 2001 From: chenjianan Date: Fri, 4 Jan 2019 09:54:25 +0800 Subject: [PATCH 1/9] request --- src/utils/request.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 558460f9..69fb2138 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -3,23 +3,23 @@ import axios from 'axios' // import store from '../store' // import { getToken } from '@/utils/auth' -export const wsuri = `ws://192.168.0.2:61101//WebMoudule//websocket` +export const wsuri = `ws://192.168.1.212:61101//WebMoudule//websocket` export const name = `OP8888` // 创建axios实例 -export const readFile = `http://192.168.0.2:8411/webpage/file/` // invoice -export const readImg = `http://192.168.0.2:8411/webpage/img/` // delivery/MS/performancebond -export const upload = `http://192.168.0.2:8411/submit/uploadFile.ashx` // ContractInformationManagement -export const upload2 = `http://192.168.0.2:8411/submit/upload2.ashx` // delivery -export const upload3 = `http://192.168.0.2:8411/submit/upload3.ashx` // performancebond -export const uploadInvoiceScan = `http://192.168.0.2:8411/submit/uploadInvoiceScan.ashx` // invoice -export const download = `http://192.168.0.2:8411/submit/downloadFile.ashx` // ContractInformationManagement +export const readFile = `http://192.168.1.212:8411/webpage/file/` // invoice +export const readImg = `http://192.168.1.212:8411/webpage/img/` // delivery/MS/performancebond +export const upload = `http://192.168.1.212:8411/submit/uploadFile.ashx` // ContractInformationManagement +export const upload2 = `http://192.168.1.212:8411/submit/upload2.ashx` // delivery +export const upload3 = `http://192.168.1.212:8411/submit/upload3.ashx` // performancebond +export const uploadInvoiceScan = `http://192.168.1.212:8411/submit/uploadInvoiceScan.ashx` // invoice +export const download = `http://192.168.1.212:8411/submit/downloadFile.ashx` // ContractInformationManagement const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.0.2:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 From 62f58a1e4396ad213ecfae0378da75c0aeeabe45 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 4 Jan 2019 11:52:17 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E8=B7=AF=E7=BA=BF?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartWorkCraftSelect_rdlc/index.vue | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 1d2c2221..9112c622 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -4,8 +4,8 @@ 零件号： 查询 - 导出工艺定额卡 - 导出加工路线单 + 导出工艺定额卡 + 导出加工路线单 @@ -45,7 +45,7 @@ - +
@@ -238,7 +238,7 @@
GAOJING
 - +
@@ -688,12 +688,12 @@ export default { }) } }, - downLoadCjn(tableid) { // 下载工艺定额卡 + downLoaddek(tableid) { // 下载工艺定额卡 getExplorer() method5(tableid) Cleanup() }, - downLoadCjn1(tableid) { // 下载零件加工路线单 + downLoadlxd(tableid) { // 下载零件加工路线单 getExplorer() method5(tableid) Cleanup() @@ -701,13 +701,7 @@ export default { } } - + From 10f76b86830f64830d6d0782cda8ccbbe8b88b1b Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 4 Jan 2019 15:33:16 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E5=88=B6=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/ProcessPlanning.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js index 6f0f26fc..be639a9b 100644 --- a/src/api/ManufacturingCenter/ProcessPlanning.js +++ b/src/api/ManufacturingCenter/ProcessPlanning.js @@ -209,8 +209,8 @@ export function gongyiCopy(num1, num2) { method: 'post', data: { type: '1', - name: '车间生产管理工艺_零件工序_工艺拷贝_工艺流水号', - param: '工艺流水号_完成工艺=' + num1 + '=int&工艺流水号_被拷工艺=' + num2 + '=int' + name: '车间生产管理工艺_零件工序_工艺拷贝_工艺计划流水号', + param: '工艺计划流水号_完成工艺=' + num1 + '=int&工艺计划流水号_被拷工艺=' + num2 + '=int' } }) } From dcb990e1354c8cefafda4b5685754d4a2be9cbe2 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 4 Jan 2019 16:00:19 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E5=B7=A5=E8=89=BA?= =?UTF-8?q?=E5=88=B6=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- .../ProcessPlanning/index.vue | 22 ++++++++----------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 69fb2138..1668f767 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -19,7 +19,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.212:8411/submit/MESCommonBase.ashx`, + baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index 89d9bb97..676e867a 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -43,9 +43,10 @@ 查询 + 是否核准在制零件工艺调整 - 切换编辑模式 + 切换编辑模式
种类: @@ -57,9 +58,8 @@ - 是否核准 规格: - + 投产总数量:
@@ -81,8 +81,6 @@ 计算公差 - 复制并保存 - 粘贴 典艺 @@ -90,7 +88,9 @@ 删除 - 保存 + 复制并保存 + + 保存 @@ -353,10 +353,9 @@ - + - @@ -834,6 +833,8 @@ export default { }, WYbtn() { // 完艺按钮 this.tableData4 = [] + this.tuhaoValue = '' + this.remark1 = '' this.dialogFormVisible1 = true }, selectPerson(row) { // 选择工艺员 @@ -1218,20 +1219,15 @@ export default { .doing-row4 { background: #f0f9eb; } - .el-card { margin-bottom: 15px; } - .el-date-editor { width: 150px } - span { margin: 10px 0 10px 10px; } - -
江苏高精机电
装备有限公司