diff --git a/src/utils/request.js b/src/utils/request.js index d440babd..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.0.104:8005/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.101:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue index 79f3c16c..a058d7fa 100644 --- a/src/views/Assembly/AssemblyExecution/index.vue +++ b/src/views/Assembly/AssemblyExecution/index.vue @@ -131,7 +131,7 @@ - + 编辑 确定 diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue index f6475a73..ccc0d7d8 100644 --- a/src/views/Assembly/AssemblyQualityInspection/index.vue +++ b/src/views/Assembly/AssemblyQualityInspection/index.vue @@ -34,7 +34,7 @@ :value="item.value"/> 查询 - + 导出 diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index b413ecb5..430294a4 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -66,7 +66,7 @@ :value="item.value"/> 查询 - + 导出 diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue index a0a3f650..afa13d52 100644 --- a/src/views/Assembly/SparePartsOutStockRecord/index.vue +++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue @@ -39,7 +39,7 @@ style="width: 130px" type="date" placeholder="选择日期"/> - + 查询 diff --git a/src/views/BasicData/PartsNumberMaintenance/index.vue b/src/views/BasicData/PartsNumberMaintenance/index.vue index 783436aa..25233287 100644 --- a/src/views/BasicData/PartsNumberMaintenance/index.vue +++ b/src/views/BasicData/PartsNumberMaintenance/index.vue @@ -35,7 +35,7 @@ 基本件三表数量 - + 全部删除 @@ -125,7 +125,7 @@ - + 编辑 - + 外购件和标准件三表数量 - + 全部删除 diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index 6ccef91b..7c7a2d3a 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -198,7 +198,7 @@ 创建 领料单 - + 选入 diff --git a/src/views/Inventory/Inboundscanning/index.vue b/src/views/Inventory/Inboundscanning/index.vue index 5befe324..c272bd0a 100644 --- a/src/views/Inventory/Inboundscanning/index.vue +++ b/src/views/Inventory/Inboundscanning/index.vue @@ -5,10 +5,10 @@ 零件图号 查询 - + 清空 - + 入库 @@ -83,7 +83,7 @@ - + 工艺名称: 查询 - + 新增 diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 991351c5..36dc2157 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -5,16 +5,16 @@ 零件图号: 查询 - + 查询全部 - + 导出备料单 - + 自家备料 - + 外购备料 diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 787ed697..f608a3a0 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -192,13 +192,13 @@ @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - + 打回 - + 投产 - + 合并生产 diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue index a00a566d..26528d60 100644 --- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue +++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue @@ -271,19 +271,19 @@ - + - + - + - + - + diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue index 0fd90e85..5e764737 100644 --- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue +++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue @@ -22,13 +22,13 @@ 零件图号: - + 查询 - + 自家备料确认 - + 打回 @@ -68,10 +68,10 @@ 零件图号: - + 查询 - + 外购备料确认 diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index b22e0eaa..72867631 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -190,13 +190,13 @@ format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期"/> - + 制造部采购 - + 采购部门采购 - + 车间生产 @@ -292,12 +292,12 @@ - + - + @@ -365,12 +365,12 @@ - + - + diff --git a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue index 778a6f26..bd86ff96 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusEdit/index.vue @@ -82,7 +82,7 @@ - + {{ process[scope.$index][0] }}{{ planDate[scope.$index][0] }} {{ realDate[scope.$index][0] }} {{ worker[scope.$index][0] }} @@ -91,7 +91,7 @@ - + {{ process[scope.$index][1] }}{{ planDate[scope.$index][1] }} {{ realDate[scope.$index][1] }} {{ worker[scope.$index][1] }} @@ -100,7 +100,7 @@ - + {{ process[scope.$index][2] }}{{ planDate[scope.$index][2] }} {{ realDate[scope.$index][2] }} {{ worker[scope.$index][2] }} @@ -109,7 +109,7 @@ - + {{ process[scope.$index][3] }}{{ planDate[scope.$index][3] }} {{ realDate[scope.$index][3] }} {{ worker[scope.$index][3] }} @@ -118,7 +118,7 @@ - + {{ process[scope.$index][4] }}{{ planDate[scope.$index][4] }} {{ realDate[scope.$index][4] }} {{ worker[scope.$index][4] }} diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue index 5fde40f2..c26ec400 100644 --- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue +++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue @@ -47,7 +47,7 @@ value-format="yyyy-MM-dd" style="top: 1px;" placeholder="选择开始日期"/> - + 零件计划变更 导出Excel @@ -142,7 +142,7 @@ layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange" @current-change="handleCurrentChange"/> - + 选入 全部选入 @@ -431,11 +431,11 @@ @size-change="handleSizeChange1" @current-change="handleCurrentChange1"/> - + 虚拟排产 确定零件计划 - + 全部选出 diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue index a5f25df9..6cf4fa72 100644 --- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue +++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue @@ -87,7 +87,7 @@ size="small" value-format="yyyy-MM-dd" placeholder="选择日期"/> - + 设定 diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue index a2d89836..f43cab92 100644 --- a/src/views/MarketingCenter/CreateProject/index.vue +++ b/src/views/MarketingCenter/CreateProject/index.vue @@ -31,7 +31,7 @@ type="date" placeholder="请选择结束日期"/> 查询 - + 新增 @@ -107,7 +107,7 @@ - + 零件图号: - + 查询 @@ -151,7 +151,7 @@ - + 保存 diff --git a/src/views/Outsourcing/OutFactoryMaintenance/index.vue b/src/views/Outsourcing/OutFactoryMaintenance/index.vue index 74aa1bb4..f9a00bb6 100644 --- a/src/views/Outsourcing/OutFactoryMaintenance/index.vue +++ b/src/views/Outsourcing/OutFactoryMaintenance/index.vue @@ -7,7 +7,7 @@ 电话: 查询 - + 新增 diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue index 936c2c4d..22e9faf8 100644 --- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue +++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue @@ -172,7 +172,7 @@ - + 到票 - + 扣款 - + 下调金额:(百分比) - + 计算价格 - + 确定价格 - + 成交 导出外协加工任务单 diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue index f4f896cd..ce98b5ba 100644 --- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue @@ -13,7 +13,7 @@ size="small" placeholder="选择日期"/> 查询 - + 导出外协加工任务单 diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 925eb56f..3646c6c6 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -408,7 +408,7 @@ size="small" style="margin-left: 10px" @click="createInquirySheet">创建询价单 - + 打印 导出 - + 保存 @@ -551,7 +551,7 @@ - + 移出 diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index e7690880..2a4dc026 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -162,7 +162,7 @@ - + ①选择合同模板: @@ -176,7 +176,7 @@ ②递交审批: - + 递交 diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index 4b9ca454..e450c44b 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -19,7 +19,7 @@ icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent00=1;pageSize00=10;total00=0;searchTable00()">查询 - + 变更询价状态 - + - + 确定 编辑 删除 - + 导出 @@ -350,7 +350,7 @@ layout="total, sizes, prev, pager, next, jumper" @size-change="handleSizeChange2" @current-change="handleCurrentChange2"/> - + 生成 保存 diff --git a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue index f381ba9d..80e6f0b3 100644 --- a/src/views/PurchasingCenter/PurchaseContractSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseContractSearch/index.vue @@ -60,7 +60,7 @@ icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询 - + 型 号: 查询 - + 导出 diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue index 8f6c996e..b2432f95 100644 --- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue +++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue @@ -212,7 +212,7 @@ - + 零件图号: - + 查询 - + 选入物料 - + 打回 @@ -79,11 +79,11 @@ 供应商: - + 查询 创建采购单 - + 保存 diff --git a/src/views/WorkshopProcurement/OfflineContract1/index.vue b/src/views/WorkshopProcurement/OfflineContract1/index.vue index 652262cc..e1155ca4 100644 --- a/src/views/WorkshopProcurement/OfflineContract1/index.vue +++ b/src/views/WorkshopProcurement/OfflineContract1/index.vue @@ -131,7 +131,7 @@ @click="addMateriel">选入物料 - + diff --git a/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue b/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue index 38191a6b..c05810b5 100644 --- a/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue +++ b/src/views/WorkshopProcurement/OutsourcingStockArrival/index.vue @@ -12,7 +12,7 @@ 供应商: - + - + 到货