diff --git a/config/index.js b/config/index.js index 7609b831..6427159f 100644 --- a/config/index.js +++ b/config/index.js @@ -7,8 +7,8 @@ const os = require('os') const networkInterfaces = os.networkInterfaces() -const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address -// const ip = '127.0.0.1' +// const ip = networkInterfaces['WLAN'][1] ? networkInterfaces['WLAN'][1].address : networkInterfaces['WLAN'][0].address +const ip = '127.0.0.1' module.exports = { dev: { // Paths diff --git a/src/views/BasicData/MenuManagement/index.vue b/src/views/BasicData/MenuManagement/index.vue index 46147ef0..d2f56526 100644 --- a/src/views/BasicData/MenuManagement/index.vue +++ b/src/views/BasicData/MenuManagement/index.vue @@ -3,7 +3,7 @@ - 创建一级菜单 + 创建一级菜单
@@ -83,7 +83,7 @@ - 创建二级菜单 + 创建二级菜单
@@ -394,3 +394,20 @@ export default { padding-right: 8px; } + diff --git a/src/views/BasicData/PartsNumberMaintenance/index.vue b/src/views/BasicData/PartsNumberMaintenance/index.vue index 55d90c68..4d5167f1 100644 --- a/src/views/BasicData/PartsNumberMaintenance/index.vue +++ b/src/views/BasicData/PartsNumberMaintenance/index.vue @@ -22,13 +22,13 @@ 零件图号: - 查询 + 查询
基本件三表数量 - 全部删除 + 全部删除
外购件和标准件三表数量 - 全部删除 + 全部删除
编辑 删除 @@ -291,6 +293,7 @@ 编辑 @@ -350,6 +353,7 @@ 编辑 @@ -421,6 +425,7 @@ 编辑 @@ -505,7 +510,7 @@
临时表 - 全部删除 + 全部删除
@@ -550,6 +555,7 @@ 删除 @@ -603,6 +609,7 @@ 删除 diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue index deb1164d..e27e0da0 100644 --- a/src/views/BasicData/PersonnelManagement/index.vue +++ b/src/views/BasicData/PersonnelManagement/index.vue @@ -3,9 +3,9 @@ - 新增 - 编辑 - 删除 + 新增 + 编辑 + 删除 @@ -14,10 +14,10 @@ - 新增 - 离职 - 离职名单 - 移动 + 新增 + 离职 + 离职名单 + 移动 + diff --git a/src/views/BasicData/ShiftManagement/index.vue b/src/views/BasicData/ShiftManagement/index.vue index 9c4d1c72..99082e4c 100644 --- a/src/views/BasicData/ShiftManagement/index.vue +++ b/src/views/BasicData/ShiftManagement/index.vue @@ -9,8 +9,8 @@ :label="item.label" :value="item.value"/> - 查询 - 新增 + 查询 + 新增 班次类型工作时间
@@ -475,3 +475,20 @@ export default { margin: 0px; } + diff --git a/src/views/BasicData/SystemRrolemaintenance/index.vue b/src/views/BasicData/SystemRrolemaintenance/index.vue index 6116e022..ad0c1740 100644 --- a/src/views/BasicData/SystemRrolemaintenance/index.vue +++ b/src/views/BasicData/SystemRrolemaintenance/index.vue @@ -3,8 +3,8 @@ - 查询 - 增加 + 查询 + 增加 + diff --git a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue index ede3a0eb..60ffc6be 100644 --- a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue +++ b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue @@ -13,8 +13,8 @@ :label="item.label" :value="item.value"/> - 查询 - 增加 + 查询 + 增加 @@ -403,3 +403,20 @@ export default { margin: 0px; } + diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue index f8f99a4c..6f5f66b4 100644 --- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue +++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue @@ -7,9 +7,9 @@ 工艺分类: - 新增 - 编辑 - 删除 + 新增 + 编辑 + 删除
@@ -606,3 +606,20 @@ export default { } } + diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index 31d5b1d0..72c1130a 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -20,8 +20,8 @@ :label="item.label" :value="item.value"/> - 查询 - 新增 + 查询 + 新增
@@ -384,3 +384,20 @@ export default { width:165px } + diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue index 79c95e6f..cf46232e 100644 --- a/src/views/Inventory/InventoryManagement/index.vue +++ b/src/views/Inventory/InventoryManagement/index.vue @@ -2,7 +2,7 @@
- 新建仓库 + 新建仓库
@@ -41,7 +41,7 @@ size="mini" icon="el-icon-edit" plain - type="warning" + type="primary" @click="handleEdit(scope.$index, scope.row, 'form')">修改 删除 - 增加货位 + 增加货位 @@ -605,3 +605,20 @@ export default { margin: 10px 0 10px 10px; } + diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index b9199e7f..b730652a 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -4,7 +4,7 @@
领料单编号: - 查询 + 查询 领料确认
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index e9a2284f..9fc75916 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -8,7 +8,7 @@ - 查询 + 查询
diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue index b6818390..58873d1c 100644 --- a/src/views/Inventory/OfflinePartsStorage/index.vue +++ b/src/views/Inventory/OfflinePartsStorage/index.vue @@ -17,7 +17,7 @@ :label="item.label" :value="item.value"/> - 查询明细 + 查询明细 @@ -68,7 +68,7 @@ :label="item.label" :value="item.value"/> - 确认入库 + 确认入库
@@ -351,3 +351,20 @@ export default { + diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue index fb22417f..3a28894d 100644 --- a/src/views/Inventory/PurchaseInRecord/index.vue +++ b/src/views/Inventory/PurchaseInRecord/index.vue @@ -22,7 +22,7 @@ - 查询 + 查询
- 查询 + 查询 - 查询明细 + 查询明细 @@ -72,7 +72,7 @@ :label="item.label" :value="item.value"/> - 确认入库 + 确认入库 @@ -475,3 +475,20 @@ export default { margin-bottom: 5px; } + diff --git a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue index 8ffe0043..8984137e 100644 --- a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue +++ b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue @@ -14,7 +14,7 @@ @change="pageCurrent=1;total=0;searchTable()"/> 操作者: - 查询 + 查询 diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue index 2daef2e2..57c42f58 100644 --- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue +++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue @@ -31,7 +31,7 @@ 计划总工时(小时): - 查询 + 查询 diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue index f7a8ec02..18349977 100644 --- a/src/views/ManufacturingCenter/InventoryQuery/index.vue +++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue @@ -6,7 +6,7 @@ - 查询 + 查询 diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue index f42b1569..cce8e487 100644 --- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue +++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue @@ -12,8 +12,8 @@ style="width:250px;margin-left: 5px;margin-top: 10px;margin-bottom: 10px" start-placeholder="开始日期" end-placeholder="结束日期"/> - 查询 - 导出 + 查询 + 导出 diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index 7a7fd68d..1cb6a61a 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -28,7 +28,7 @@ :label="item.label" :value="item.value"/> - 查询 + 查询 零件工艺调整 diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue index fdc5d7b2..d14edc10 100644 --- a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue @@ -29,7 +29,7 @@ 是否核准 - 保存 + 保存 折叠 展开 @@ -69,7 +69,7 @@ 长度: - 计算重量 + 计算重量 重量: @@ -84,7 +84,7 @@ 厚: - 计算重量 + 计算重量 重量: @@ -112,7 +112,7 @@ 长度: - 计算重量 + 计算重量 重量: @@ -150,21 +150,21 @@ 公差: - 计算公差 + 计算公差 - 粘贴 + 粘贴 - 原有 + 原有 - + 完艺 - 删除 + 删除 - + 复制并保存 - 保存 + 保存 记录修改备注 diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue index 282a1c6a..f50ddaa6 100644 --- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue +++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue @@ -22,9 +22,9 @@ :label="item.label" :value="item.value"/> - 全选 - 保存 - 通用件保存 + 全选 + 保存 + 通用件保存 - 查询 - 新增 + 查询 + 新增 @@ -70,7 +70,7 @@ @@ -90,8 +90,8 @@ @@ -133,7 +133,7 @@ {{ scope.row.备注 }} - + @@ -782,3 +782,20 @@ export default { + diff --git a/src/views/MarketingCenter/CRM/index.vue b/src/views/MarketingCenter/CRM/index.vue index 9aa4de6a..828e18b1 100644 --- a/src/views/MarketingCenter/CRM/index.vue +++ b/src/views/MarketingCenter/CRM/index.vue @@ -21,11 +21,11 @@ - 查询 + 查询 - 添加营销经理 - 新增客户 + 添加营销经理 + 新增客户 @@ -52,7 +52,7 @@ {{ scope.row.出生日期 }} - + @@ -672,3 +672,38 @@ export default { border: 1px solid black!important; } + + diff --git a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue index 7ba05cfa..9bb21cd0 100644 --- a/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue +++ b/src/views/MarketingCenter/ComprehensiveInquiryMS/index.vue @@ -10,7 +10,7 @@ :value="item.value"/> - 查询 + 查询 @@ -60,7 +60,7 @@ @@ -82,7 +82,7 @@ - + - + @@ -1385,9 +1386,25 @@ a{ tr.el-table__row td { background-color: #d8e5f6 !important; } - tr.el-table__row.el-table__row--striped td { background: #e9f0f9 !important; } } + diff --git a/src/views/MarketingCenter/DeliveryApplication/index.vue b/src/views/MarketingCenter/DeliveryApplication/index.vue index a1a980e1..7ff1df3d 100644 --- a/src/views/MarketingCenter/DeliveryApplication/index.vue +++ b/src/views/MarketingCenter/DeliveryApplication/index.vue @@ -3,12 +3,12 @@
- 新增 - 编辑 - 保存 - 核准 - 放弃 - 删除 + 新增 + 编辑 + 保存 + 核准 + 放弃 + 删除
- 加载 - 清空 + 加载 + 清空
@@ -1221,3 +1221,20 @@ export default { clear: both } + diff --git a/src/views/MarketingCenter/InvoiceRecord/index.vue b/src/views/MarketingCenter/InvoiceRecord/index.vue index 2b8bc71a..64e34359 100644 --- a/src/views/MarketingCenter/InvoiceRecord/index.vue +++ b/src/views/MarketingCenter/InvoiceRecord/index.vue @@ -26,9 +26,10 @@ - 查询 + 查询 新增记录 @@ -48,7 +49,8 @@ @row-click="fetchTableData2"> @@ -68,14 +70,14 @@ @@ -820,3 +822,20 @@ export default { /* }*/ /*}*/ + diff --git a/src/views/MarketingCenter/PerformanceBond/index.vue b/src/views/MarketingCenter/PerformanceBond/index.vue index 3e0b5081..df38300d 100644 --- a/src/views/MarketingCenter/PerformanceBond/index.vue +++ b/src/views/MarketingCenter/PerformanceBond/index.vue @@ -26,7 +26,7 @@ - 查询 + 查询 @@ -42,7 +42,7 @@ @row-click="fetchTableData2"> diff --git a/src/views/MarketingCenter/ProjectProgress/index.vue b/src/views/MarketingCenter/ProjectProgress/index.vue index 6b835551..0e375a39 100644 --- a/src/views/MarketingCenter/ProjectProgress/index.vue +++ b/src/views/MarketingCenter/ProjectProgress/index.vue @@ -4,14 +4,14 @@ 年营销金额图表 - 查询 + 查询
客户分布图 - 查询 + 查询
@@ -20,7 +20,7 @@ 在执行项目金额及回款 - 查询 + 查询
diff --git a/src/views/MarketingCenter/SafetyMargin/index.vue b/src/views/MarketingCenter/SafetyMargin/index.vue index a32b2c28..74010c68 100644 --- a/src/views/MarketingCenter/SafetyMargin/index.vue +++ b/src/views/MarketingCenter/SafetyMargin/index.vue @@ -27,7 +27,7 @@ - 查询 + 查询 @@ -43,7 +43,7 @@ @row-click="fetchTableData1"> diff --git a/src/views/MarketingCenter/ShippingInquiries/index.vue b/src/views/MarketingCenter/ShippingInquiries/index.vue index b31b352d..1a0378d5 100644 --- a/src/views/MarketingCenter/ShippingInquiries/index.vue +++ b/src/views/MarketingCenter/ShippingInquiries/index.vue @@ -3,7 +3,7 @@ - 查询 + 查询 @@ -76,7 +76,7 @@ diff --git a/src/views/Outsourcing/OutFactoryMaintenance/index.vue b/src/views/Outsourcing/OutFactoryMaintenance/index.vue index 6cb5b908..449dd195 100644 --- a/src/views/Outsourcing/OutFactoryMaintenance/index.vue +++ b/src/views/Outsourcing/OutFactoryMaintenance/index.vue @@ -8,7 +8,7 @@ - 新增 + 新增 @@ -419,3 +419,20 @@ export default { margin: 0px; } + diff --git a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue index 8131551c..0fce960a 100644 --- a/src/views/Outsourcing/OutsourcingPartsQuery/index.vue +++ b/src/views/Outsourcing/OutsourcingPartsQuery/index.vue @@ -14,8 +14,8 @@ :label="item.label" :value="item.value"/> - 查询 - 导出 + 查询 + 导出
diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue index 2b8d5423..4417fbd3 100644 --- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue +++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue @@ -50,7 +50,7 @@ :label="item.label" :value="item.value"/> - 查询 + 查询 @@ -202,7 +202,7 @@ :label="item.label" :value="item.value"/> - 查询 + 查询 到票 diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index ada8a541..d1eecd2b 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -3,7 +3,7 @@ 零件号: - 查询 + 查询 打回车间 --> 厂家: - 查询 - 新增 + 查询 + 新增 - + @@ -138,16 +138,16 @@ - 选入零件 - 导出任务单 + 选入零件 + 导出任务单 - 提交 + 提交 - 保存 + 保存
- +