From 1db4944493cda0eb2b054dc97e42d1e20ee6b0b5 Mon Sep 17 00:00:00 2001 From: Vergil <974548713@qq.com> Date: Wed, 12 Feb 2020 16:31:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E9=83=A8button111?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/index.scss | 12 +- .../Assembly/DeliveryConfirmation/index.vue | 2 +- src/views/Assembly/MakeAssemblyPlan/index.vue | 19 +- src/views/Assembly/MakeColdWorkPlan/index.vue | 2 +- .../Assembly/MakeElectricalAssembly/index.vue | 2 +- src/views/Assembly/MakePaintPlan/index.vue | 2 +- src/views/BasicData/MenuManagement/index.vue | 22 +- .../BasicData/PersonnelManagement/index.vue | 22 +- src/views/BasicData/ShiftManagement/index.vue | 20 +- .../SystemRrolemaintenance/index.vue | 20 +- .../WorkshopPersonnelRoleMana/index.vue | 20 +- .../WorkshopProcessMaintenance/index.vue | 20 +- .../Inventory/CreatePickingList/index.vue | 2 +- src/views/Inventory/InventoryCheck/index.vue | 20 +- .../Inventory/InventoryManagement/index.vue | 22 +- src/views/Inventory/MaterialOut/index.vue | 21 +- .../Inventory/OfflinePartsStorage/index.vue | 20 +- .../Inventory/PurchasePartsStorage/index.vue | 20 +- .../CreatePreparationBill/index.vue | 19 +- .../WorkshopEquipmentManagement/index.vue | 20 +- .../maintainInformation/index.vue | 6 +- src/views/MarketingCenter/BidBond/index.vue | 20 +- src/views/MarketingCenter/CRM/index.vue | 4 +- .../ContractInformationManagement/index.vue | 35 +--- .../MarketingCenter/CreateProject/index.vue | 4 +- .../DeliveryApplication/index.vue | 20 +- .../MarketingCenter/InvoiceRecord/index.vue | 193 +----------------- .../OutFactoryMaintenance/index.vue | 20 +- .../index.vue | 22 +- .../MaterialManagement/index.vue | 24 +-- .../CreatePackingList/index.vue | 25 +-- .../TechnologyCenter/ImportParts/index.vue | 19 +- .../TechnologyCenter/QueryParts/index.vue | 20 +- .../CreatingProcurementContracts/index.vue | 21 +- .../CreatingPurchasingMaterials/index.vue | 19 +- .../InvoiceSettlementApplication1/index.vue | 21 +- .../NewArrivalList/index.vue | 19 +- .../OfflineProcurement/index.vue | 17 -- .../OutsourcingMaterialsInvoice/index.vue | 20 +- .../PurchaseContractRequestFund1/index.vue | 20 +- .../RequestOutsourcingMaterials/index.vue | 20 +- .../manufacturingPurchaseArrival/index.vue | 20 +- 42 files changed, 83 insertions(+), 813 deletions(-) diff --git a/src/styles/index.scss b/src/styles/index.scss index c6be7d0f..9cce3129 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -237,12 +237,12 @@ el-card{ background: #8ff4ea !important; color: black; } - tr.el-table__row td { - background-color: #d8e5f6 !important; - } - tr.el-table__row.el-table__row--striped td { - background: #e9f0f9 !important; - } + //tr.el-table__row td { + // background-color: #d8e5f6 !important; + //} + //tr.el-table__row.el-table__row--striped td { + // background: #e9f0f9 !important; + //} } h3 { diff --git a/src/views/Assembly/DeliveryConfirmation/index.vue b/src/views/Assembly/DeliveryConfirmation/index.vue index dbcc5c3b..9d686a44 100644 --- a/src/views/Assembly/DeliveryConfirmation/index.vue +++ b/src/views/Assembly/DeliveryConfirmation/index.vue @@ -133,7 +133,7 @@ type="datetime" placeholder="结束日期"/> 查询 - 清空 + 清空 diff --git a/src/views/Assembly/MakeAssemblyPlan/index.vue b/src/views/Assembly/MakeAssemblyPlan/index.vue index b2961110..a777d34b 100644 --- a/src/views/Assembly/MakeAssemblyPlan/index.vue +++ b/src/views/Assembly/MakeAssemblyPlan/index.vue @@ -13,7 +13,7 @@
{{ item.name }}
- 增加装配计划 + 增加装配计划 删除 @@ -288,21 +288,4 @@ export default { - diff --git a/src/views/Assembly/MakeColdWorkPlan/index.vue b/src/views/Assembly/MakeColdWorkPlan/index.vue index 3caf25c4..25e9cba5 100644 --- a/src/views/Assembly/MakeColdWorkPlan/index.vue +++ b/src/views/Assembly/MakeColdWorkPlan/index.vue @@ -13,7 +13,7 @@
{{ item.name }}
- 增加装配计划 + 增加装配计划 删除 diff --git a/src/views/Assembly/MakeElectricalAssembly/index.vue b/src/views/Assembly/MakeElectricalAssembly/index.vue index 41da2ca9..c44c260f 100644 --- a/src/views/Assembly/MakeElectricalAssembly/index.vue +++ b/src/views/Assembly/MakeElectricalAssembly/index.vue @@ -13,7 +13,7 @@
{{ item.name }}
- 增加装配计划 + 增加装配计划 删除 diff --git a/src/views/Assembly/MakePaintPlan/index.vue b/src/views/Assembly/MakePaintPlan/index.vue index 6e37b7cc..4d7a05d1 100644 --- a/src/views/Assembly/MakePaintPlan/index.vue +++ b/src/views/Assembly/MakePaintPlan/index.vue @@ -13,7 +13,7 @@
{{ item.name }}
- 增加装配计划 + 增加装配计划 删除 diff --git a/src/views/BasicData/MenuManagement/index.vue b/src/views/BasicData/MenuManagement/index.vue index d2f56526..68cde375 100644 --- a/src/views/BasicData/MenuManagement/index.vue +++ b/src/views/BasicData/MenuManagement/index.vue @@ -3,7 +3,7 @@ - 创建一级菜单 + 创建一级菜单
@@ -83,7 +83,7 @@ - 创建二级菜单 + 创建二级菜单
@@ -394,20 +394,4 @@ export default { padding-right: 8px; } - + diff --git a/src/views/BasicData/PersonnelManagement/index.vue b/src/views/BasicData/PersonnelManagement/index.vue index e27e0da0..6592ddc5 100644 --- a/src/views/BasicData/PersonnelManagement/index.vue +++ b/src/views/BasicData/PersonnelManagement/index.vue @@ -3,7 +3,7 @@ - 新增 + 新增 编辑 删除 @@ -14,7 +14,7 @@ - 新增 + 新增 离职 离职名单 移动 @@ -912,20 +912,4 @@ export default { - + diff --git a/src/views/BasicData/ShiftManagement/index.vue b/src/views/BasicData/ShiftManagement/index.vue index 99082e4c..8fadabe3 100644 --- a/src/views/BasicData/ShiftManagement/index.vue +++ b/src/views/BasicData/ShiftManagement/index.vue @@ -10,7 +10,7 @@ :value="item.value"/> 查询 - 新增 + 新增 班次类型工作时间 @@ -475,20 +475,4 @@ export default { margin: 0px; } - + diff --git a/src/views/BasicData/SystemRrolemaintenance/index.vue b/src/views/BasicData/SystemRrolemaintenance/index.vue index ad0c1740..3a0b31bd 100644 --- a/src/views/BasicData/SystemRrolemaintenance/index.vue +++ b/src/views/BasicData/SystemRrolemaintenance/index.vue @@ -4,7 +4,7 @@ 查询 - 增加 + 增加 - + diff --git a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue index 60ffc6be..867a25fd 100644 --- a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue +++ b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue @@ -14,7 +14,7 @@ :value="item.value"/> 查询 - 增加 + 增加 @@ -403,20 +403,4 @@ export default { margin: 0px; } - + diff --git a/src/views/BasicData/WorkshopProcessMaintenance/index.vue b/src/views/BasicData/WorkshopProcessMaintenance/index.vue index e4be7325..051f23e5 100644 --- a/src/views/BasicData/WorkshopProcessMaintenance/index.vue +++ b/src/views/BasicData/WorkshopProcessMaintenance/index.vue @@ -7,7 +7,7 @@ 工艺分类: - 新增 + 新增 编辑 删除 @@ -611,20 +611,4 @@ export default { } } - + diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index 76601d4a..df6dad6e 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -264,7 +264,7 @@ end-placeholder="结束日期"/> 查询 - 创建领料单 + 创建领料单 选入物料 diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue index 72c1130a..2ea4c7cf 100644 --- a/src/views/Inventory/InventoryCheck/index.vue +++ b/src/views/Inventory/InventoryCheck/index.vue @@ -21,7 +21,7 @@ :value="item.value"/> 查询 - 新增 + 新增
@@ -384,20 +384,4 @@ export default { width:165px } - + diff --git a/src/views/Inventory/InventoryManagement/index.vue b/src/views/Inventory/InventoryManagement/index.vue index cf46232e..56aa1a18 100644 --- a/src/views/Inventory/InventoryManagement/index.vue +++ b/src/views/Inventory/InventoryManagement/index.vue @@ -2,7 +2,7 @@
- 新建仓库 + 新建仓库
@@ -49,7 +49,7 @@ plain icon="el-icon-delete" @click="handleDelete(scope.row)">删除 - 增加货位 + 增加货位 @@ -605,20 +605,4 @@ export default { margin: 10px 0 10px 10px; } - + diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue index 303e2e83..6eddb914 100644 --- a/src/views/Inventory/MaterialOut/index.vue +++ b/src/views/Inventory/MaterialOut/index.vue @@ -5,8 +5,7 @@ 领料单编号: 查询 - - 领料确认 + 领料确认
@@ -680,20 +679,4 @@ export default { background: #E9F0F9 !important; } - + diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue index 58873d1c..e7accc2b 100644 --- a/src/views/Inventory/OfflinePartsStorage/index.vue +++ b/src/views/Inventory/OfflinePartsStorage/index.vue @@ -68,7 +68,7 @@ :label="item.label" :value="item.value"/> - 确认入库 + 确认入库
@@ -351,20 +351,4 @@ export default { - + diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue index 31ce6d78..d827e1c2 100644 --- a/src/views/Inventory/PurchasePartsStorage/index.vue +++ b/src/views/Inventory/PurchasePartsStorage/index.vue @@ -72,7 +72,7 @@ :label="item.label" :value="item.value"/> - 确认入库 + 确认入库
@@ -475,20 +475,4 @@ export default { margin-bottom: 5px; } - + diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 0162d6c9..5cb0b46b 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -16,7 +16,7 @@ 分配自家备料 - 打印自家备料单 + 打印自家备料单 导出 @@ -327,21 +327,4 @@ export default { - diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue index 8f194d1d..34374b36 100644 --- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue +++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue @@ -6,7 +6,7 @@ 查询 - 新增 + 新增 有效时间: @@ -435,20 +435,4 @@ export default { /* color: #ff9759;*/ /*}*/ - + diff --git a/src/views/ManufacturingCenter/maintainInformation/index.vue b/src/views/ManufacturingCenter/maintainInformation/index.vue index 2299edd2..423ce63d 100644 --- a/src/views/ManufacturingCenter/maintainInformation/index.vue +++ b/src/views/ManufacturingCenter/maintainInformation/index.vue @@ -62,7 +62,7 @@