From ac47b69ea33d98d898787d1a79cf97f4db23d3f9 Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Tue, 24 Sep 2019 08:22:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=88=91=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- .../SparePartsOutStockRecord/index.vue | 4 +- src/views/Inventory/Inboundscanning/index.vue | 24 +++++---- .../ActualTimeSupplement/index.vue | 4 +- .../CreatePreparationBill/index.vue | 16 ++++-- .../InitialProduction/index.vue | 12 +++-- .../MachiningSequenceAdjustment/index.vue | 20 +++++-- .../MaterialArrivalManagement/index.vue | 20 +++++-- .../PartAssignment/index.vue | 20 ++++--- .../ProcessingStatusEdit/index.vue | 42 +++++++++------ .../ProductionCapacityBalance/index.vue | 24 +++++---- .../RepairTimeEntry/index.vue | 8 +-- .../WorkshopEquipmentManagement/index.vue | 4 +- .../MarketingCenter/CreateProject/index.vue | 18 ++++--- .../InterBudgetaryBudgets/index.vue | 9 ++-- .../OutFactoryMaintenance/index.vue | 4 +- .../index.vue | 53 +++++++++++-------- .../OutsourcingTaskExecution/index.vue | 15 +++--- .../OutsourcingTaskQuery/index.vue | 4 +- .../MaterialManagement/index.vue | 2 +- .../CreatingPurchasingMaterials/index.vue | 22 +++++--- .../OutsourcingMaterialsInvoice/index.vue | 14 ++--- .../OutsourcingStockArrival/index.vue | 18 ++++--- .../RequestOutsourcingMaterials/index.vue | 18 ++++--- 24 files changed, 241 insertions(+), 136 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index f9d3fd3e..8ff60856 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx` export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx` const service = axios.create({ - baseURL: `http://192.168.1.231:8005/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue index 860f4119..a0a3f650 100644 --- a/src/views/Assembly/SparePartsOutStockRecord/index.vue +++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue @@ -39,7 +39,9 @@ style="width: 130px" type="date" placeholder="选择日期"/> - 查询 + + 查询 + diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue index f9d0e835..4c64d609 100644 --- a/src/views/Inventory/Inboundscanning/index.vue +++ b/src/views/Inventory/Inboundscanning/index.vue @@ -5,8 +5,12 @@ 零件图号 查询 - 清空 - 入库 + + 清空 + + + 入库 + @@ -79,13 +83,15 @@ diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue index 67371a06..50e4d14f 100644 --- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue +++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue @@ -43,7 +43,9 @@ 工艺名称: 查询 - 新增 + + 新增 + diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 26d1fca9..991351c5 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -5,10 +5,18 @@ 零件图号: 查询 - 查询全部 - 导出备料单 - 自家备料 - 外购备料 + + 查询全部 + + + 导出备料单 + + + 自家备料 + + + 外购备料 + diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 16d62a56..2d06b88f 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -192,9 +192,15 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - 打回 - 投产 - 合并生产 + + 打回 + + + 投产 + + + 合并生产 + diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue index 69b03344..e50dfeba 100644 --- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue +++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue @@ -271,11 +271,21 @@ diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue index b988de83..0fd90e85 100644 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -22,9 +22,15 @@ 零件图号: - 查询 - 自家备料确认 - 打回 + + 查询 + + + 自家备料确认 + + + 打回 + @@ -62,8 +68,12 @@ 零件图号: - 查询 - 外购备料确认 + + 查询 + + + 外购备料确认 + diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index b5d84259..b22e0eaa 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -190,9 +190,15 @@ format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期"/> - 制造部采购 - 采购部门采购 - 车间生产 + + 制造部采购 + + + 采购部门采购 + + + 车间生产 + @@ -286,12 +292,12 @@