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 01/19] =?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 @@ 工艺拷贝 - + + From db36852ac6ef3b03cee3e89a46bb1c459673f692 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 15 Feb 2019 16:19:05 +0800 Subject: [PATCH 18/19] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/WorkshopEquipmentManagement/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue index 85f1a436..8d273457 100644 --- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue +++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue @@ -311,7 +311,6 @@ export default { type: 'success' }) this.dialogFormVisible = false - this.title = '' this.fetchData() } else { this.$message.error('信息添加失败') From b4dd09e66f2e273c54b3cd85b511700d545e19a8 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 18 Feb 2019 09:43:35 +0800 Subject: [PATCH 19/19] a --- .../ManufacturingCenter/ProductionCapacityBalance/index.vue | 1 - .../ManufacturingCenter/WorkshopEquipmentManagement/index.vue | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue index 2369f17c..0a7a50fc 100644 --- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue +++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue @@ -1202,7 +1202,6 @@ export default { if (this.零件图号.length !== 0) { for (let i = 0; i < this.零件图号.length; i++) { selection2(this.工艺计划流水号[i]).then(response => { - console.log(response.data, 2) for (let k = 0; k < response.data.length; k++) { this.process[i][k] = response.data[k].工艺名称简称 this.planDate[i][k] = response.data[k].计划日期_短 diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue index 8d273457..f2855422 100644 --- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue +++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue @@ -111,7 +111,7 @@ - +