From ac3477bf778885132d56eb800a7a2ff33806dd51 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 26 Oct 2019 15:48:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/ShopScheduling.js | 40 +++++ .../Inventory/OfflinePartsStorage/index.vue | 1 + .../ShopScheduling/index.vue | 137 +++++++++++++++--- 3 files changed, 154 insertions(+), 24 deletions(-) diff --git a/src/api/ManufacturingCenter/ShopScheduling.js b/src/api/ManufacturingCenter/ShopScheduling.js index aa12a67c..779c6245 100644 --- a/src/api/ManufacturingCenter/ShopScheduling.js +++ b/src/api/ManufacturingCenter/ShopScheduling.js @@ -22,3 +22,43 @@ export function getParts(pageCurrent, pageSize) { } }) } +export function getGongxu(num) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: `select 姓名,排产时间,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 工艺编号 is not null and 工艺编号<>0 and 考核状态 = 6 and 工艺计划流水号=${num} order by 工序顺序` + } + }) +} +export function searchTableData2(num) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: `select 姓名,零件图号,零件名称,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 排产人员=${num} order by 工序顺序` + } + }) +} +export function XuanRu(num, num2) { + return request({ + url: '', + method: 'post', + data: { + type: '4', + name: `update 车间生产管理工艺_零件工序 set 排产人员=${num},排产时间= GETDATE() where 工序流水号=${num2}` + } + }) +} +export function XuanChu(num) { + return request({ + url: '', + method: 'post', + data: { + type: '4', + name: `update 车间生产管理工艺_零件工序 set 排产人员= null,排产时间= null where 工序流水号=${num}` + } + }) +} diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue index 1cdd00e6..080f7ef2 100644 --- a/src/views/Inventory/OfflinePartsStorage/index.vue +++ b/src/views/Inventory/OfflinePartsStorage/index.vue @@ -237,6 +237,7 @@ export default { }, // 查询离线合同明细 async searchContractDetail() { + this.table1 = [] if (this.contractValue && this.searchType === '2') { this.qrCode = this.contractValue } else if (!this.supplierValue) { diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index b6e08907..72443dc2 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -4,17 +4,17 @@ - + - 移除 - 添加 + + - + - + - - + + - + - + - + - + @@ -121,10 +121,11 @@ -