From bd052a9dd59fca0b0dee343e26a9937c4a83e05b Mon Sep 17 00:00:00 2001 From: liushuai Date: Mon, 26 Nov 2018 10:37:47 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=90=E7=BB=84=E9=85=8D=E5=A5=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/GroupMatching.js | 12 + .../WorkshopEquipmentManagement.js | 2 +- .../GroupMatching/index.vue | 385 +++++++++++++++++- .../CreatingProcurementContracts/index.vue | 3 + 4 files changed, 388 insertions(+), 14 deletions(-) diff --git a/src/api/ManufacturingCenter/GroupMatching.js b/src/api/ManufacturingCenter/GroupMatching.js index a1a30ad5..a99a4220 100644 --- a/src/api/ManufacturingCenter/GroupMatching.js +++ b/src/api/ManufacturingCenter/GroupMatching.js @@ -56,3 +56,15 @@ export function searchPurchaseTable(check, entryNameValue, check1, machine, chec } }) } +export function searchTable1(check, entryNameValue, check1, machine, check2, groupNum, check3, year, check4, month, check5, time, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '库存管理_车间采购出库_零件查询', + param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '=int&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&年_check=' + check3 + '=int&年=' + year + '=string&月_check=' + check4 + '=int&月=' + month + '=int&入库时间_check=' + check5 + '=int&入库时间=' + time + '=string', + pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js index 3d4cfda6..d24ecf3d 100644 --- a/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js +++ b/src/api/ManufacturingCenter/WorkshopEquipmentManagement.js @@ -6,7 +6,7 @@ export function getData(check, equipmentName, pageCurrent, pageSize) { method: 'post', data: { type: '1', - name: '设备管理_设备加工能力_查询数据_设备维护', + name: '设备管理_设备加工能力_查询数据_设备维护NEW', param: '设备名称_check=' + check + '=int&设备名称=' + equipmentName, pagination: pageCurrent + '&' + pageSize } diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue index 162f5595..2b57204b 100644 --- a/src/views/ManufacturingCenter/GroupMatching/index.vue +++ b/src/views/ManufacturingCenter/GroupMatching/index.vue @@ -158,13 +158,83 @@
+ @size-change="handleSizeChange4" + @current-change="handleCurrentChange4"/> +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
@@ -273,7 +343,7 @@