From aa27408b54f28d3b5c77b32dc04438139e849a1d Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 10 Oct 2019 11:29:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7=E3=80=81?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=B6=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EquipmentMonitoring.js | 22 + .../Inventory/PurchasePartsStorage/index.vue | 526 ++++++++++++++++++ .../EquipmentMonitoring/index.vue | 46 +- 3 files changed, 582 insertions(+), 12 deletions(-) create mode 100644 src/views/Inventory/PurchasePartsStorage/index.vue diff --git a/src/api/ManufacturingCenter/EquipmentMonitoring.js b/src/api/ManufacturingCenter/EquipmentMonitoring.js index f38dab0e..f1fa9fe4 100644 --- a/src/api/ManufacturingCenter/EquipmentMonitoring.js +++ b/src/api/ManufacturingCenter/EquipmentMonitoring.js @@ -57,3 +57,25 @@ export function getDaijiagong(num) { } }) } +// 查询总装 +export function getZongzhuang() { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: 'SELECT 机床图号 FROM PDM_机床名称 where 机床装配实际开始时间 is not null and 机床装配实际完成时间 is null' + } + }) +} +// 查询部装 +export function getBuzhuang() { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: 'SELECT 机床图号,组号,任务名称 FROM 车间管理_工作计划 inner join PDM_机床名称 on 车间管理_工作计划.机床流水号=PDM_机床名称.机床流水号 where 计划类型=1 and 是否工作=1 and 组号 <> \'\'' + } + }) +} diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue new file mode 100644 index 00000000..91ad8480 --- /dev/null +++ b/src/views/Inventory/PurchasePartsStorage/index.vue @@ -0,0 +1,526 @@ + + + + + diff --git a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue index 71659433..8087b19b 100644 --- a/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue +++ b/src/views/ManufacturingCenter/EquipmentMonitoring/index.vue @@ -491,20 +491,18 @@ - -
{{ tooltip1 }}
{{ tooltip2 }}
{{ tooltip3 }}
+ +
-
{{ 机床总装 }}
- -
{{ tooltip1 }}
{{ tooltip2 }}
{{ tooltip3 }}
+ +
-
{{ 部件装配 }}
@@ -515,12 +513,14 @@