From decf0bf58e730366a9f44f6ffd200410bf66abbf Mon Sep 17 00:00:00 2001 From: liushuai Date: Wed, 13 May 2020 18:42:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Inventory/SelfMadePartsWarehouseOut.js | 3 +- .../Inventory/CreatePickingList/index.vue | 11 +- .../SelfMadePartsWarehouseOut/index.vue | 45 +- .../GroupMatching/index.vue | 28 + .../CreateInquirySheet/index.vue | 16 +- .../OfflinePartsQuery/index.vue | 5 + .../PurchaseSituationSearch/index.vue | 14 +- .../ProcurementContractEnquiry/index.vue | 925 +++++------------- 8 files changed, 339 insertions(+), 708 deletions(-) diff --git a/src/api/Inventory/SelfMadePartsWarehouseOut.js b/src/api/Inventory/SelfMadePartsWarehouseOut.js index 41635328..51723651 100644 --- a/src/api/Inventory/SelfMadePartsWarehouseOut.js +++ b/src/api/Inventory/SelfMadePartsWarehouseOut.js @@ -2,6 +2,7 @@ import request from '@/utils/request' import state from '@/store' import router from '@/router' +// 初始化机床项目 export function initProject() { return request({ url: '', @@ -10,7 +11,7 @@ export function initProject() { UserID: state.state.user.id, ModularID: router.currentRoute.path, type: '1', - name: 'PDM_项目名称_查询数据_按时间排序' + name: 'PDM_项目名称_查询数据' } }) } diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index ed557b17..f094b9d1 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -334,7 +334,7 @@ -
+
@@ -363,7 +363,7 @@ -
+
-
+
@@ -551,7 +551,7 @@ export default { total2: 0, pickListTable1: [], pageCurrent3: 1, - pageSize3: 10, + pageSize3: 40, total3: 0, pageCurrent4: 1, pageSize4: 10, @@ -1178,4 +1178,7 @@ export default { .el-table .Fail-row { background: #FF9797 !important; } + .el-select{ + width: 100px + } diff --git a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue index 23c0952a..a6251e26 100644 --- a/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue +++ b/src/views/Inventory/SelfMadePartsWarehouseOut/index.vue @@ -2,14 +2,21 @@
- + + + + + + + + - + -