From da9a5636d89307f06b129e7c0251e40888f4d1c2 Mon Sep 17 00:00:00 2001 From: liushuai Date: Tue, 29 Jan 2019 15:06:26 +0800 Subject: [PATCH 1/2] =?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 +- .../ImportParts/specificationData.vue | 1 - .../TechnologyCenter/QueryParts/index.vue | 1 + .../DepartmentBuyerRequestFund/index.vue | 27 +++++++++++-------- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 554b1f2b..f997ba78 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -20,7 +20,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231: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/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue index a62636bd..32bf7368 100644 --- a/src/views/TechnologyCenter/ImportParts/specificationData.vue +++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue @@ -122,7 +122,6 @@ :data="tableData10" :cell-class-name="cell" style="width: 100%" - height="440" size="mini" highlight-current-row border> diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue index 60b377d3..5c56c35e 100644 --- a/src/views/TechnologyCenter/QueryParts/index.vue +++ b/src/views/TechnologyCenter/QueryParts/index.vue @@ -131,6 +131,7 @@ border> diff --git a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue index afa3b525..97e20d1a 100644 --- a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue +++ b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue @@ -331,17 +331,22 @@ export default { this.searchTable1() }, requestFund(row) { // 请款 - const day1 = new Date() - const day2 = day1.getFullYear() + '-' + (day1.getMonth() + 1) + '-' + day1.getDate() - requestFund(row.采购合同流水号, row.本次应请款, day2, this.id).then(response => { - if (response.data[0].result === '1') { - this.$message.success('请款成功') - this.searchTable1() - this.startRequestDate = '' - this.endRequestDate = '' - this.tableData2 = [] - } else { this.$message.error('请款失败') } - }) + console.log(row.本次应请款) + if (row.本次应请款 !== '') { + const day1 = new Date() + const day2 = day1.getFullYear() + '-' + (day1.getMonth() + 1) + '-' + day1.getDate() + requestFund(row.采购合同流水号, row.本次应请款, day2, this.id).then(response => { + if (response.data[0].result === '1') { + this.$message.success('请款成功') + this.searchTable1() + this.startRequestDate = '' + this.endRequestDate = '' + this.tableData2 = [] + } else { this.$message.error('请款失败') } + }) + } else { + this.$message.warning('请输入金额') + } }, cancelRequestFund(row) { // 取消请款 console.log(row) From 345e24b43f5d868f9daeb50aa289625b81f9f864 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 29 Jan 2019 15:06:27 +0800 Subject: [PATCH 2/2] =?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 --- .../ManufacturingCenter/ProcessPlanning.js | 49 +++-- .../ProcessingStatusEdit.js | 2 +- .../ProcessPlanning/index.vue | 181 +++++------------- 3 files changed, 82 insertions(+), 150 deletions(-) diff --git a/src/api/ManufacturingCenter/ProcessPlanning.js b/src/api/ManufacturingCenter/ProcessPlanning.js index e2f5e2d7..8275846b 100644 --- a/src/api/ManufacturingCenter/ProcessPlanning.js +++ b/src/api/ManufacturingCenter/ProcessPlanning.js @@ -1,5 +1,41 @@ import request from '@/utils/request' +// 典艺查询<高精原有数据> +export function searchProcess11(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_原零件工艺查询_MESWORK', + param: '零件图号=' + num + } + }) +} +// 典艺查询<高精原有数据> +export function numChange(num) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_原零件工艺明细查询_MESWORK', + param: '典艺流水号=' + num + } + }) +} +// 保存主表工艺 +export function selectRequest(num0, num1, num2, num3, request0) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号', + param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0 + } + }) +} // 初始化 工艺员A export function initCraftmen() { return request({ @@ -322,18 +358,7 @@ export function saveApprove(num0, num1, request0, spec, num2, outhelp, num3, num } }) } -// 选择工艺要求 -export function selectRequest(num0, num1, num2, num3, request0) { - return request({ - url: '', - method: 'post', - data: { - type: '2', - name: '车间生产管理工艺_零件工序_修改数据_根据工序流水号和工艺计划流水号', - param: '工序流水号=' + num0 + '&工艺计划流水号=' + num1 + '&工艺编号=' + num2 + '&工艺顺序=' + num3 + '&工艺要求=' + request0 - } - }) -} + // 粘贴 export function pasteTable(oldNum, newNum) { return request({ diff --git a/src/api/ManufacturingCenter/ProcessingStatusEdit.js b/src/api/ManufacturingCenter/ProcessingStatusEdit.js index 539d1ef1..913bdf76 100644 --- a/src/api/ManufacturingCenter/ProcessingStatusEdit.js +++ b/src/api/ManufacturingCenter/ProcessingStatusEdit.js @@ -17,7 +17,7 @@ export function getMachines() { method: 'post', data: { type: '1', - name: '车间生产管理工艺_传递后_机床名称_根据机床查询', + name: '车间生产管理工艺_传递后_机床名称_加工进度修改模块查询', param: '是否传递=2=int&考核状态=6=int&工艺任务分配状态=2=int&定额任务分配状态=2=int&单件是否外协=1=int' } }) diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue index dcfe4c35..53cefd83 100644 --- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue @@ -82,8 +82,8 @@ 长度: 计算重量 - ∮ ° # □ ∥ ± × Ⅰ Ⅱ Ⅲ ⊥ ％ ■ ∠ mm ◎ ○ δ μm ／ ◇ () - 计算重量 + + @@ -144,16 +144,11 @@ 计算公差 粘贴 - 典艺 - - 完艺 - - 删除 - - 复制并保存 - - 保存 - + 原有 + 完艺 + 删除 + 复制并保存 + 保存 - + - - - - - + + + + 查询 - - - - - - - - - 查询 - - - - + + + + 工艺拷贝 - - - - - - - 工艺拷贝 - @@ -472,12 +424,7 @@ 工艺拷贝 - +