From e83f0bcd40915852b08057f6e6283c77f2fa4fec Mon Sep 17 00:00:00 2001 From: jiangfuzhuang Date: Fri, 7 Feb 2020 17:34:58 +0800 Subject: [PATCH 01/22] 88 --- src/assets/img/设备监控.psd | Bin 0 -> 27334 bytes .../EquipmentMonitoring/index.vue | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 src/assets/img/设备监控.psd diff --git a/src/assets/img/设备监控.psd b/src/assets/img/设备监控.psd new file mode 100644 index 0000000000000000000000000000000000000000..4b0d797bd53440706b76e1133f1e7c2c2b15cbfa GIT binary patch literal 27334 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 IadW% Date: Fri, 7 Feb 2020 19:48:48 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E5=88=B6=E9=80=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DiscardedPartsInquiry/index.vue | 2 +- .../InventoryQuery/index.vue | 2 +- .../SparePartsForScrap/index.vue | 5 +-- .../WorkshopEquipmentManagement/index.vue | 42 ++++++++++++++--- .../ContractInformationManagement/index.vue | 8 ++-- .../MarketingCenter/CreateProject/index.vue | 45 ++++++++++++++----- 6 files changed, 77 insertions(+), 27 deletions(-) diff --git a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue index de58c121..0b550149 100644 --- a/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue +++ b/src/views/ManufacturingCenter/DiscardedPartsInquiry/index.vue @@ -28,7 +28,7 @@ :label="item.label" :value="item.value"/> - 查询 + 查询 diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue index f7a8ec02..33790659 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/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue index f56a6752..d36cfbf7 100644 --- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue +++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue @@ -25,7 +25,7 @@ :value="item.value"/> - 查询 + 查询 @@ -131,7 +131,6 @@ element-loading-background="rgba(226,223,223,1)" height="600" border - stripe style="width: 510px"> 开始工序 - 补投重新生产零件 + 补投重新生产零件 diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue index ebb621c9..9f2e46c1 100644 --- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue +++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue @@ -3,9 +3,11 @@ 设备名称: - 查询 + + 查询 - 新增 + 新增 + 有效时间： - 设定 + + 设定 - 生成设备加工能力 + + 生成设备加工能力 @@ -74,10 +78,10 @@ {{ scope.row.设备预留工时系数 }} - + @@ -336,6 +340,13 @@ export default { } }) }, + ADD() { + this.addForm('form') + this.dialogFormVisible1 = true + this.form.contractSigningDate = getNowTime()// new Date() + this.temp = 1 + this.title = '新增项目' + }, submitEdit() { editTable(this.equipmentSerialNumber, this.form.设备名称, this.form.设备型号, this.form.设备性能指标, this.form.设备加工能力, this.form.设备工时系数, this.form.班次类型, this.form.设备加工工艺, this.form.整改工时系数, this.form.设备编号, this.form.预留工时系数).then(response => { if (response.data[0].result === '1') { @@ -423,3 +434,20 @@ export default { /* color: #ff9759;*/ /*}*/ + diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index ecab7e45..dceca54c 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -177,10 +177,10 @@ @@ -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 @@ - 选入零件 - 导出任务单 + 选入零件 + 导出任务单 - 提交 + 提交 - 保存 + 保存
- + - + - + - + - + - + - + @@ -142,8 +142,7 @@ size="mini" height="530px" highlight-current-row - border - stripe> + border>