From 98c67d38225655eb3a8de2e4e4f093fb0fae2a01 Mon Sep 17 00:00:00 2001 From: bryan sun Date: Thu, 17 Oct 2019 19:30:46 +0800 Subject: [PATCH 01/40] a --- .../SparePartsOutStockRecord/index.vue | 10 ++++---- src/views/Inventory/OutPartSelect/index.vue | 12 +++++----- src/views/Inventory/StockInquiry/index.vue | 12 +++++----- .../ActualTimeSupplement/index.vue | 12 +++++----- .../CreatePreparationBill/index.vue | 6 ++--- .../InitialProduction/index.vue | 12 ++++++---- .../MaterialArrivalManagement/index.vue | 8 +++---- .../PartAssignment/index.vue | 10 ++++---- .../PartWorkCraftSelect_rdlc/index.vue | 10 ++++---- .../ProcessTaskAssignment/index.vue | 4 ++-- .../ProductionCapacityBalance/index.vue | 4 ++-- .../SparePartsForScrap/index.vue | 6 +++-- .../WorkshopEquipmentManagement/index.vue | 6 ++--- .../MarketingCenter/CreateProject/index.vue | 6 ++--- .../InterBudgetaryBudgets/index.vue | 8 +++---- .../OutsourcingDataMaintenance/index.vue | 2 ++ .../index.vue | 16 ++++++------- .../OutsourcingTaskExecution/index.vue | 16 ++++++------- .../OutsourcingTaskQuery/index.vue | 10 ++++---- .../Outsourcing/PreorderAssociation/index.vue | 8 +++---- .../MaterialManagement/index.vue | 8 +++---- .../CreatingPurchasingMaterials/index.vue | 24 +++++++++---------- .../InvoiceSettlementApplication1/index.vue | 14 +++++------ .../NewArrivalList/index.vue | 12 +++++----- .../OutsourcingMaterialsInvoice/index.vue | 6 ++--- .../PurchaseContractRequestFund1/index.vue | 6 ++--- .../RequestOutsourcingMaterials/index.vue | 2 +- 27 files changed, 128 insertions(+), 122 deletions(-) diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue index afa13d52..e24dca01 100644 --- a/src/views/Assembly/SparePartsOutStockRecord/index.vue +++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue @@ -46,27 +46,27 @@ - + - + - + - + - + diff --git a/src/views/Inventory/OutPartSelect/index.vue b/src/views/Inventory/OutPartSelect/index.vue index fbc58e6b..260b174e 100644 --- a/src/views/Inventory/OutPartSelect/index.vue +++ b/src/views/Inventory/OutPartSelect/index.vue @@ -40,12 +40,12 @@ align="center" width="55" type="index"/> - + - + @@ -55,22 +55,22 @@ {{ scope.row.出库数量 }} - + - + - + - + diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue index c45fc70c..e0371333 100644 --- a/src/views/Inventory/StockInquiry/index.vue +++ b/src/views/Inventory/StockInquiry/index.vue @@ -40,12 +40,12 @@ align="center" width="55" type="index"/> - + - + @@ -55,12 +55,12 @@ {{ scope.row.入库数量 }} - + - + @@ -70,12 +70,12 @@ {{ scope.row.仓库名称 }} - + - + diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue index 01f763f2..5fbbb1a3 100644 --- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue +++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue @@ -59,12 +59,12 @@ style="width: 100%;" border> - + - + @@ -74,12 +74,12 @@ {{ scope.row.完成数量 }} - + - + @@ -115,12 +115,12 @@ {{ scope.row.修补工时 }} - + - + diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 9e30f3c8..33699390 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -27,18 +27,18 @@ type="selection" width="55" align="center"/> - + - + - + diff --git a/src/views/ManufacturingCenter/InitialProduction/index.vue b/src/views/ManufacturingCenter/InitialProduction/index.vue index 69cd60fc..2d297c2a 100644 --- a/src/views/ManufacturingCenter/InitialProduction/index.vue +++ b/src/views/ManufacturingCenter/InitialProduction/index.vue @@ -102,17 +102,17 @@ type="selection" align="center" width="35"/> - + - + - + @@ -137,7 +137,7 @@ {{ scope.row.未投产数量 }} - + @@ -219,7 +219,9 @@ + sortable + prop="零件名称" + label="零件名称" > - + - + @@ -78,12 +78,12 @@ - + - + diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue index 4fa96189..9a507aab 100644 --- a/src/views/ManufacturingCenter/PartAssignment/index.vue +++ b/src/views/ManufacturingCenter/PartAssignment/index.vue @@ -32,27 +32,27 @@ - + - + - + - + - + diff --git a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue index bc74c422..12a67f25 100644 --- a/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue +++ b/src/views/ManufacturingCenter/PartWorkCraftSelect_rdlc/index.vue @@ -53,22 +53,22 @@ type="selection" align="center" width="55"/> - + - + - + - + @@ -78,7 +78,7 @@ {{ scope.row.批次数量 }} - + diff --git a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue index a9bb6204..1fdda857 100644 --- a/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue +++ b/src/views/ManufacturingCenter/ProcessTaskAssignment/index.vue @@ -40,12 +40,12 @@ stripe @selection-change="handleSelectionChange"> - + - + diff --git a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue index 7cee2dd8..38bc30ec 100644 --- a/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue +++ b/src/views/ManufacturingCenter/ProductionCapacityBalance/index.vue @@ -65,12 +65,12 @@ type="selection" align="center" width="50"/> - + - + diff --git a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue index 65232652..82e62779 100644 --- a/src/views/ManufacturingCenter/SparePartsForScrap/index.vue +++ b/src/views/ManufacturingCenter/SparePartsForScrap/index.vue @@ -49,14 +49,16 @@ @current-change="fetchTableData2"> diff --git a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue index 6cf4fa72..eb8f0445 100644 --- a/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue +++ b/src/views/ManufacturingCenter/WorkshopEquipmentManagement/index.vue @@ -11,17 +11,17 @@ - + - + - + diff --git a/src/views/MarketingCenter/CreateProject/index.vue b/src/views/MarketingCenter/CreateProject/index.vue index f43cab92..d063cd2f 100644 --- a/src/views/MarketingCenter/CreateProject/index.vue +++ b/src/views/MarketingCenter/CreateProject/index.vue @@ -83,19 +83,19 @@ - + - + - + diff --git a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue index 7589ec6f..d83a42ec 100644 --- a/src/views/Outsourcing/InterBudgetaryBudgets/index.vue +++ b/src/views/Outsourcing/InterBudgetaryBudgets/index.vue @@ -55,22 +55,22 @@ type="index" align="center" width="50"/> - + - + - + - + diff --git a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue b/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue index dd4513cb..16905db6 100644 --- a/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue +++ b/src/views/Outsourcing/OutsourcingDataMaintenance/index.vue @@ -33,6 +33,8 @@ diff --git a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue index 22e9faf8..ad890184 100644 --- a/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue +++ b/src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue @@ -62,34 +62,34 @@ align="center" fixed="left" width="50"/> - + - + - + - + - + - + @@ -216,12 +216,12 @@ - + - + diff --git a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue index d9fc56f6..e7782b34 100644 --- a/src/views/Outsourcing/OutsourcingTaskExecution/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskExecution/index.vue @@ -30,28 +30,28 @@ - + - + - + - + - + @@ -99,17 +99,17 @@ - + - + - + diff --git a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue index ce98b5ba..481b988e 100644 --- a/src/views/Outsourcing/OutsourcingTaskQuery/index.vue +++ b/src/views/Outsourcing/OutsourcingTaskQuery/index.vue @@ -20,28 +20,28 @@ - + - + - + - + - + diff --git a/src/views/Outsourcing/PreorderAssociation/index.vue b/src/views/Outsourcing/PreorderAssociation/index.vue index ed9f9e7d..ae910cda 100644 --- a/src/views/Outsourcing/PreorderAssociation/index.vue +++ b/src/views/Outsourcing/PreorderAssociation/index.vue @@ -49,22 +49,22 @@ type="index" align="center" width="50"/> - + - + - + - + diff --git a/src/views/PurchasingCenter/MaterialManagement/index.vue b/src/views/PurchasingCenter/MaterialManagement/index.vue index f3d9717f..94d4a3fa 100644 --- a/src/views/PurchasingCenter/MaterialManagement/index.vue +++ b/src/views/PurchasingCenter/MaterialManagement/index.vue @@ -147,22 +147,22 @@ highlight-current-row border stripe> - + - + - + - + diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue index 90899c09..022aeb8b 100644 --- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue +++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue @@ -39,12 +39,12 @@ - + - + @@ -54,7 +54,7 @@ {{ scope.row.批次数量 }} - + @@ -88,7 +88,7 @@ - + - + - + - + - + - + @@ -165,7 +165,7 @@ 已结算 - + @@ -175,12 +175,12 @@ - + - + diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue index 6f3c19ae..21467716 100644 --- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue +++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue @@ -42,12 +42,12 @@ - + - + @@ -57,17 +57,17 @@ {{ scope.row.发票金额 }} - + - + - + @@ -77,7 +77,7 @@ {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }} - + @@ -87,7 +87,7 @@ {{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }} - + diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue index 715dcbaf..a0506d2c 100644 --- a/src/views/WorkshopProcurement/NewArrivalList/index.vue +++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue @@ -40,12 +40,12 @@ 未结算 - + - + @@ -99,7 +99,7 @@ size="mini" @row-click="searchTable6"> - + @@ -155,17 +155,17 @@ stripe style="margin: 3px 0" size="mini"> - + - + - + diff --git a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue index f171ca6d..a048b9a0 100644 --- a/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue +++ b/src/views/WorkshopProcurement/OutsourcingMaterialsInvoice/index.vue @@ -89,12 +89,12 @@ - + - + @@ -104,7 +104,7 @@ {{ scope.row.开票金额 }} - + diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue index dd0b9470..dc12e468 100644 --- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue +++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue @@ -33,17 +33,17 @@ - + - + - + diff --git a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue index 1e33adc4..3b6b6970 100644 --- a/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue +++ b/src/views/WorkshopProcurement/RequestOutsourcingMaterials/index.vue @@ -65,7 +65,7 @@ - + From a52f199c87e7f8f8dd7c1488d7a76a63bc60ca53 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 18 Oct 2019 14:16:31 +0800 Subject: [PATCH 02/40] =?UTF-8?q?=E5=86=B2=E7=AA=81MANUFACUR/CREAWAREHOUPU?= =?UTF-8?q?RCH?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateWarehousePurchasing/index.vue | 53 ------------------- 1 file changed, 53 deletions(-) diff --git a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue index 3b1930b1..c3a12a48 100644 --- a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue +++ b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue @@ -19,17 +19,6 @@ :label="item.label" :value="item.value"/> -<<<<<<< HEAD -======= - 采购状态: - - - ->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe {{ scope.row.安全库存量 }} -<<<<<<< HEAD -======= ->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
采购明细表名称: -<<<<<<< HEAD -======= - ->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe -<<<<<<< HEAD -======= ->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe - + - + - + diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index fe0b3ab2..2240ab0f 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -134,7 +134,7 @@ - + @@ -159,17 +159,17 @@ - + - + - + @@ -472,7 +472,7 @@ - + @@ -480,12 +480,12 @@ - + - + @@ -495,27 +495,27 @@ - + - + - + - + - + @@ -530,7 +530,7 @@ - + diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index 3f75d696..6c1f7d15 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -2,7 +2,7 @@
- 供 应  商: + - 合同编号: + - || 供 应 商: + - 合同名称: + - 是否含税: + - 交货日期: + - 开票信息: + - 支付 日期: + - 支付方式: + - 其他说明: + 快速修改价格 还原 diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue index b2b829b3..40a3ec4e 100644 --- a/src/views/PurchasingCenter/OfflineContract/index.vue +++ b/src/views/PurchasingCenter/OfflineContract/index.vue @@ -42,29 +42,29 @@ size="mini" @selection-change="handleSelectionChange1"> - + - + - + - + - + @@ -74,22 +74,22 @@ {{ scope.row.物料类别 }} - + - + - + - + @@ -296,7 +296,7 @@ 全部到货 - + @@ -306,17 +306,17 @@ {{ scope.row.离线合同名称 }} - + - + - + diff --git a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue index c5205a53..ad76fa90 100644 --- a/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue +++ b/src/views/PurchasingCenter/OfflineContractRequestFund/index.vue @@ -33,17 +33,17 @@

请款表

- + - + - + diff --git a/src/views/PurchasingCenter/PayStateSearch/index.vue b/src/views/PurchasingCenter/PayStateSearch/index.vue index 5e01d065..6132d93b 100644 --- a/src/views/PurchasingCenter/PayStateSearch/index.vue +++ b/src/views/PurchasingCenter/PayStateSearch/index.vue @@ -54,7 +54,7 @@ - + @@ -64,32 +64,32 @@ {{ scope.row.采购合同名称 }} - + - + - + - + - + - + - + @@ -120,19 +120,19 @@ {{ scope.row.采购合同名称 }} - + - + - + - + diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue index 25c1c42e..e72d35b9 100644 --- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue +++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue @@ -39,7 +39,7 @@ - + - + - + - + @@ -67,12 +67,12 @@ {{ scope.row.物料型号 }} - + - + @@ -97,7 +97,7 @@ {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }} - + @@ -127,7 +127,7 @@ - + - + - + - + @@ -155,12 +155,12 @@ {{ scope.row.物料型号 }} - + - + @@ -185,7 +185,7 @@ {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || scope.row.离线到货数量 || '—' }} - + @@ -215,7 +215,7 @@ - + - + - + - + @@ -243,7 +243,7 @@ {{ scope.row.零件图号 }} - + @@ -253,7 +253,7 @@ {{ scope.row.材料 }} - + @@ -278,7 +278,7 @@ {{ parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!=='' ? '—' : scope.row.已到货数量 || '—' }} - + diff --git a/src/views/PurchasingCenter/SetPayPlan/index.vue b/src/views/PurchasingCenter/SetPayPlan/index.vue index fbc8d73e..ec8008f8 100644 --- a/src/views/PurchasingCenter/SetPayPlan/index.vue +++ b/src/views/PurchasingCenter/SetPayPlan/index.vue @@ -70,17 +70,17 @@ - + - + - + @@ -302,18 +302,15 @@ export default { margin: 0 } .subTableHeader { - th { - background: #8ff4ea !important; - color: black; + th { + 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; - } - } - From b1be1eaee93498fe84e3d72e29e8c114eb375aa7 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Wed, 23 Oct 2019 15:50:04 +0800 Subject: [PATCH 12/40] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=83=A8=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/index.scss | 5 +- .../ArrivalStateSearch/index.vue | 2 +- .../CreateInquirySheet/index.vue | 26 +-- .../CreatePurchaseContract/index.vue | 4 +- .../InvoiceSettlementApprove/index.vue | 6 +- .../MaterialMProcure/index.vue | 208 ++++++++---------- .../OfflineContract/index.vue | 13 +- .../OfflineContractRequestFund/index.vue | 74 +++---- .../OfflineContractSearch/index.vue | 6 +- .../PurchasingCenter/PayStateSearch/index.vue | 2 +- .../PurchaseContractRequestFund/index.vue | 76 +++---- .../PurchaseContractReview/index.vue | 4 +- .../PurchaseContractSearch/index.vue | 23 +- .../PurchaseSituationSearch/index.vue | 25 +-- .../PurchaseTaskAllocate/index.vue | 6 +- .../PurchasingCenter/SetPayPlan/index.vue | 4 +- 16 files changed, 219 insertions(+), 265 deletions(-) diff --git a/src/styles/index.scss b/src/styles/index.scss index 6af05507..ae382d70 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -109,7 +109,7 @@ el-form-item__content{ //background-color: #2e296a!important; } .el-card__body{ - padding: 10px !important; + padding: 0 10px 0 10px !important; margin: 0px !important; } .app-container{ @@ -275,3 +275,6 @@ h3 { color: white; } } +.el-tabs--border-card>.el-tabs__content { + padding: 15px 15px 0px 15px!important; +} diff --git a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue index c5c81bcc..c0a5f1f5 100644 --- a/src/views/PurchasingCenter/ArrivalStateSearch/index.vue +++ b/src/views/PurchasingCenter/ArrivalStateSearch/index.vue @@ -28,7 +28,7 @@ border highlight-current-row style="width: 100%" - height="400px" + height="600px" size="mini" @row-click="searchTable2"> diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index 2240ab0f..345097fd 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -95,7 +95,7 @@ 调整采购任务 - + --> - -
- -
+
+ +
+ diff --git a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue index 6c1f7d15..222fa254 100644 --- a/src/views/PurchasingCenter/CreatePurchaseContract/index.vue +++ b/src/views/PurchasingCenter/CreatePurchaseContract/index.vue @@ -29,7 +29,7 @@ - + 预览合同 递交审批： - + 递交
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue index 8140bf86..9a67c928 100644 --- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue +++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue @@ -7,7 +7,7 @@ 查询
-

发票结算申请单

+

发票结算申请单

- + - + diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index 33699390..b39857da 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -27,18 +27,18 @@ type="selection" width="55" align="center"/> - + - + - + diff --git a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue index c3a12a48..22f7cff4 100644 --- a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue +++ b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue @@ -128,6 +128,7 @@ @click="addpurchasingDetailsForm">创建采购明细表 - + @@ -205,17 +219,17 @@ @@ -236,12 +250,13 @@ diff --git a/src/views/BasicData/ShiftManagement/index.vue b/src/views/BasicData/ShiftManagement/index.vue index f1f56607..9c4d1c72 100644 --- a/src/views/BasicData/ShiftManagement/index.vue +++ b/src/views/BasicData/ShiftManagement/index.vue @@ -1,7 +1,7 @@ -
- -
+ + + + + + + + + + @@ -327,9 +327,9 @@ export default { }, dialogFormVisible1: false, dialogFormVisible2: false, - pageCurrent: 1, - pageSize: 10, - total: 0, + // pageCurrent: 1, + // pageSize: 10, + // total: 0, rules2: { // 表单验证规则 value: [{ required: true, message: '请选择时间', trigger: 'blur' }], value2: [{ required: true, message: '请选择时间', trigger: 'blur' }], @@ -456,16 +456,16 @@ export default { this.form1 = {} this.dialogFormVisible2 = false this.form2 = {} - }, - handleSizeChange(val) { - this.pageSize = val - this.pageCurrent = 1 - this.searchTable() - }, - handleCurrentChange(val) { - this.pageCurrent = val - this.searchTable() } + // handleSizeChange(val) { + // this.pageSize = val + // this.pageCurrent = 1 + // this.searchTable() + // }, + // handleCurrentChange(val) { + // this.pageCurrent = val + // this.searchTable() + // } } } diff --git a/src/views/BasicData/SystemRrolemaintenance/index.vue b/src/views/BasicData/SystemRrolemaintenance/index.vue index 3f4c889e..595fea12 100644 --- a/src/views/BasicData/SystemRrolemaintenance/index.vue +++ b/src/views/BasicData/SystemRrolemaintenance/index.vue @@ -1,8 +1,8 @@ -
- -
+ + + + + + + + + + @@ -126,8 +127,8 @@ export default { }, methods: { fetchData() { - InitRolefunction(this.pageCurrent, this.pageSize).then(response => { // 初始化 - this.tableData = response.data.rows + InitRolefunction().then(response => { // 初始化 + this.tableData = response.data this.total = response.data.total }) }, @@ -140,15 +141,15 @@ export default { console.log(response.data) }) }, - handleSizeChange(val) { - this.pageCurrent = 1 - this.pageSize = val - this.fetchData() - }, - handleCurrentChange(val) { - this.pageCurrent = val - this.fetchData() - }, + // handleSizeChange(val) { + // this.pageCurrent = 1 + // this.pageSize = val + // this.fetchData() + // }, + // handleCurrentChange(val) { + // this.pageCurrent = val + // this.fetchData() + // }, handleEdit(row) { if (this.$refs['form2'] !== undefined) { this.$refs['form2'].resetFields() diff --git a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue index 88b60d6f..ede3a0eb 100644 --- a/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue +++ b/src/views/BasicData/WorkshopPersonnelRoleMana/index.vue @@ -3,22 +3,22 @@ - 员工姓名: - - 角色名称: - + + + + - 查询 + 查询 增加 - + -
- -
+ + + + + + + + + +
@@ -232,9 +232,9 @@ export default { staffNum: '', personnelNumber: '', personnelStream: '', - pageCurrent1: 1, - pageSize1: 10, - total1: null, + // pageCurrent1: 1, + // pageSize1: 10, + // total1: null, roleName: null, roleNames: [], rybh: '', @@ -283,9 +283,9 @@ export default { } else { this.check2 = 0 } - searchTable(this.check1, this.staffName, this.check2, this.roleName, this.pageCurrent1, this.pageSize1).then(response => { + searchTable(this.check1, this.staffName, this.check2, this.roleName).then(response => { console.log(response) - this.tableData = response.data.rows + this.tableData = response.data this.total1 = response.data.total }) }, @@ -304,15 +304,15 @@ export default { }) this.searchData() }, - handleSizeChange1(val) { - this.pageCurrent1 = 1 - this.pageSize1 = val - this.searchData() - }, - handleCurrentChange1(val) { - this.pageCurrent1 = val - this.searchData() - }, + // handleSizeChange1(val) { + // this.pageCurrent1 = 1 + // this.pageSize1 = val + // this.searchData() + // }, + // handleCurrentChange1(val) { + // this.pageCurrent1 = val + // this.searchData() + // }, submitAdd1() { this.$refs['form1'].validate((valid) => { if (valid) { diff --git a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue index 1677c574..e7ef503c 100644 --- a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue +++ b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue @@ -1,8 +1,8 @@ -
- -
+ + + + + + + + + +
@@ -214,7 +213,7 @@ export default { loading: false, tableData: [], // 表格数据 total: null, // 总条数 - pageSize: 10, // 每页显示条数 + pageSize: 1000, // 每页显示条数 pageCurrent: 1, // 后台获取页 gongzuozhebianhao: '', machinenumber: '', @@ -224,17 +223,17 @@ export default { loading2: false, tableData2: [], // 表格数据 total2: null, // 总条数 - pageSize2: 10, // 每页显示条数 + pageSize2: 1000, // 每页显示条数 pageCurrent2: 1, // 后台获取页 loading3: false, tableData3: [], // 表格数据 total3: null, // 总条数 - pageSize3: 10, // 每页显示条数 + pageSize3: 1000, // 每页显示条数 pageCurrent3: 1, // 后台获取页 loading4: false, tableData4: [], // 表格数据 total4: null, // 总条数 - pageSize4: 10, // 每页显示条数 + pageSize4: 1000, // 每页显示条数 pageCurrent4: 1 // 后台获取页 } }, @@ -414,12 +413,12 @@ export default { this.tableData4 = [] this.total3 = 0 if (this.machineNumberValue !== '' && this.machineNumberValue !== null) { this.check1 = 1 } else { this.check1 = 0 } - searchtable4(this.check1, this.machineNumberValue, this.pageCurrent, this.pageSize).then(response => { + searchtable4(this.check1, this.machineNumberValue).then(response => { if (response.data.total === 0) { this.loading3 = false } else { this.total3 = response.data.total - this.tableData3 = response.data.rows + this.tableData3 = response.data } }).then(() => { this.loading3 = false @@ -430,12 +429,12 @@ export default { this.tableData4 = [] this.pageCurrent4 = 1 this.machineNumberValue = parseInt(row.机床流水号) - searchtable5(this.machineNumberValue, this.pageCurrent4, this.pageSize4).then(response => { + searchtable5(this.machineNumberValue).then(response => { if (response.data.total === 0) { this.loading4 = false } else { this.total4 = response.data.total - this.tableData4 = response.data.rows + this.tableData4 = response.data } }).then(() => { this.loading4 = false @@ -473,26 +472,26 @@ export default { handleCurrentChange2(val) { this.pageCurrent2 = val this.searchTable3() - }, - // 分页 - handleSizeChange3(val) { - this.pageCurrent3 = 1 - this.pageSize3 = val - this.searchTable4() - }, - handleCurrentChange3(val) { - this.pageCurrent3 = val - this.searchTable4() - }, - handleSizeChange4(val) { - this.pageCurrent4 = 1 - this.pageSize4 = val - this.searchTable6() - }, - handleCurrentChange4(val) { - this.pageCurrent4 = val - this.searchTable6() } + // 分页 + // handleSizeChange3(val) { + // this.pageCurrent3 = 1 + // this.pageSize3 = val + // this.searchTable4() + // }, + // handleCurrentChange3(val) { + // this.pageCurrent3 = val + // this.searchTable4() + // }, + // handleSizeChange4(val) { + // this.pageCurrent4 = 1 + // this.pageSize4 = val + // this.searchTable6() + // }, + // handleCurrentChange4(val) { + // this.pageCurrent4 = val + // this.searchTable6() + // } } } diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue index 054cc9b6..fefbaab7 100644 --- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue +++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue @@ -1,9 +1,9 @@ -
+
- + - From a398554f264e986ea9ebc58f8af159d832225743 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 26 Oct 2019 18:23:40 +0800 Subject: [PATCH 25/40] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/icons/svg/ShopScheduling.svg | 1 + src/styles/element-ui.scss | 11 ++- .../ShopScheduling/index.vue | 99 ++++++++++--------- 3 files changed, 61 insertions(+), 50 deletions(-) create mode 100644 src/icons/svg/ShopScheduling.svg diff --git a/src/icons/svg/ShopScheduling.svg b/src/icons/svg/ShopScheduling.svg new file mode 100644 index 00000000..399e3967 --- /dev/null +++ b/src/icons/svg/ShopScheduling.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index cc10a203..b6a6d57b 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -48,11 +48,12 @@ .hover-row td{ background: RGB(236 245 255)!important; } - .el-table td, .is-leaf{ - background-color: rgb(255, 255, 255); - color: black; - font-weight:400 - } + //表格行颜色9745 + //.el-table td, .is-leaf{ + // background-color: rgb(255, 255, 255); + // color: black; + // font-weight:400 + //} .el-table--striped .el-table__body tr.el-table__row--striped td{ background-color: #d8dde6;/*修改斑马线表格背景*/ } diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index 72443dc2..3468285d 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -4,7 +4,7 @@ - + 移除--> - + - + @@ -30,7 +30,7 @@ {{ scope.row.零件名称 }} - + @@ -62,12 +62,7 @@ - - - - + @@ -77,19 +72,24 @@ {{ scope.row.零件名称 }} - + - + + + + - - + + @@ -99,17 +99,17 @@ {{ scope.row.工艺名称 }} - + - + - + @@ -169,7 +169,8 @@ export default { 零件名称: v.零件名称, 投产数量: v.投产数量, 计划开始时间: v.计划开始时间 ? v.计划开始时间.split(' ')[0] : '', - 计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '' + 计划结束时间: v.计划结束时间 ? v.计划结束时间.split(' ')[0] : '', + 状态: v.状态 }) }) this.total = response.data.total @@ -196,11 +197,14 @@ export default { this.loading3 = false }) }, - // ?? - tableRowClassName({ row, rowIndex }) { + tableData1ClassName({ row, rowIndex }) { + if (row.状态 === '1') { + return 'CJPClingjianjinxing' + } + }, + tableData3ClassName({ row, rowIndex }) { if (row.工序状态 === 4) { - console.log(row.工序状态) - return 'successsss' + return 'CJPCgongxuwancheng' } }, searchTableData2() { @@ -212,29 +216,31 @@ export default { }) }, XuanRu(row) { - XuanRu(this.PersonValue, row.工序流水号).then(response => { - if (response.data[0].result === '1') { - this.getParts() - this.loading3 = true - this.tableData3 = [] - getGongxu(this.工艺计划流水号).then(response => { - response.data.map(v => { - this.tableData3.push({ - 工序流水号: v.工序流水号, - 工序状态: v.工序状态, - 工序顺序: v.工序顺序, - 工艺名称: v.工艺名称, - 排产人员: v.排产人员, - 姓名: v.姓名, - 排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '', - 完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '' + if (row.工序状态 !== 4) { + XuanRu(this.PersonValue, row.工序流水号).then(response => { + if (response.data[0].result === '1') { + this.getParts() + this.loading3 = true + this.tableData3 = [] + getGongxu(this.工艺计划流水号).then(response => { + response.data.map(v => { + this.tableData3.push({ + 工序流水号: v.工序流水号, + 工序状态: v.工序状态, + 工序顺序: v.工序顺序, + 工艺名称: v.工艺名称, + 排产人员: v.排产人员, + 姓名: v.姓名, + 排产时间: v.排产时间 ? v.排产时间.split(' ')[0] : '', + 完成日期: v.完成日期 ? v.完成日期.split(' ')[0] : '' + }) }) + this.loading3 = false }) - this.loading3 = false - }) - this.searchTableData2() - } - }) + this.searchTableData2() + } + }) + } }, XuanChu(row) { XuanChu(row.工序流水号).then(response => { @@ -274,7 +280,10 @@ export default { From 1345515b680fd2af4e2b07f5f20c13e7646d0009 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sat, 26 Oct 2019 20:09:48 +0800 Subject: [PATCH 26/40] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/ShopScheduling/index.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index 3468285d..f6d8fa58 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -125,6 +125,7 @@ import { getPerson, getParts, getGongxu, XuanRu, XuanChu, searchTableData2 } fro export default { data() { return { + index: 0, 工艺计划流水号: '', PersonValue: '', Person: [], @@ -180,6 +181,7 @@ export default { getGongxu(row) { this.loading3 = true this.tableData3 = [] + this.index = row.index this.工艺计划流水号 = row.工艺计划流水号 getGongxu(row.工艺计划流水号).then(response => { response.data.map(v => { @@ -198,6 +200,7 @@ export default { }) }, tableData1ClassName({ row, rowIndex }) { + row.index = rowIndex if (row.状态 === '1') { return 'CJPClingjianjinxing' } @@ -219,7 +222,8 @@ export default { if (row.工序状态 !== 4) { XuanRu(this.PersonValue, row.工序流水号).then(response => { if (response.data[0].result === '1') { - this.getParts() + // this.getParts() + this.tableData1[this.index].状态 = '1' this.loading3 = true this.tableData3 = [] getGongxu(this.工艺计划流水号).then(response => { @@ -245,7 +249,8 @@ export default { XuanChu(row) { XuanChu(row.工序流水号).then(response => { if (response.data[0].result === '1') { - this.getParts() + // this.getParts() + this.tableData1[this.index].状态 = '1' this.loading3 = true this.tableData3 = [] getGongxu(this.工艺计划流水号).then(response => { @@ -268,10 +273,12 @@ export default { }) }, handleSizeChange(val) { + this.tableData3 = [] this.pageSize = val this.getParts() }, handleCurrentChange(val) { + this.tableData3 = [] this.pageCurrent = val this.getParts() } From ee8518bce34cd76d98c63827d01cc3d52bbcbe13 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Sun, 27 Oct 2019 15:13:29 +0800 Subject: [PATCH 27/40] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E6=8E=92=E4=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/ManufacturingCenter/ShopScheduling.js | 24 +++++++++- .../ShopScheduling/index.vue | 46 +++++++++++-------- 2 files changed, 51 insertions(+), 19 deletions(-) diff --git a/src/api/ManufacturingCenter/ShopScheduling.js b/src/api/ManufacturingCenter/ShopScheduling.js index 779c6245..5cadceb2 100644 --- a/src/api/ManufacturingCenter/ShopScheduling.js +++ b/src/api/ManufacturingCenter/ShopScheduling.js @@ -38,7 +38,7 @@ export function searchTableData2(num) { method: 'post', data: { type: '3', - name: `select 姓名,零件图号,零件名称,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 排产人员=${num} order by 工序顺序` + name: `select 工艺计划流水号,姓名,零件图号,零件名称,工序流水号,工艺名称,投产数量,完成日期,工序顺序,工序间是否外协,加工完成状态,工序状态 from dbo.车间生产管理工艺_插件排产查询_视图 where 排产人员=${num} and 工序状态<>4 order by 工序顺序` } }) } @@ -62,3 +62,25 @@ export function XuanChu(num) { } }) } +export function panDuan(num) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: ` select 状态,工艺计划流水号 from + ( + select 工艺计划流水号,零件名称,投产数量,机床图号,组号,(零件图号+' '+规格) as 图号及规格 + ,计划开始时间,计划结束时间,排产人员,排产时间, + (case when SUM(CASE WHEN 排产人员 IS NULL THEN 1 ELSE 0 END) = 0 then 2 else + case when COUNT(*) > SUM(CASE WHEN 排产人员 IS NULL THEN 1 ELSE 0 END) then 1 else 0 end end) as 状态 + from dbo.车间生产管理工艺_插件排产查询_视图 + where 工艺编号 is not null and 工艺编号<>0 and 工艺计划流水号 is not null and 考核状态 =6 + group by 工艺计划流水号,零件名称,投产数量,机床图号,组号,零件图号,规格,计划开始时间,计划结束时间,排产人员,排产时间 + ) as a + where 工艺计划流水号=${num} + order by 图号及规格 + ` + } + }) +} diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index f6d8fa58..d19a136d 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -11,8 +11,6 @@ :label="item.label" :value="item.value"/> - - + + + diff --git a/src/views/ManufacturingCenter/ShopScheduling/index.vue b/src/views/ManufacturingCenter/ShopScheduling/index.vue index d19a136d..78b7a2aa 100644 --- a/src/views/ManufacturingCenter/ShopScheduling/index.vue +++ b/src/views/ManufacturingCenter/ShopScheduling/index.vue @@ -59,7 +59,7 @@ - + - + + + From 80c11ee65dfb515a0a5d0caa0b374add4e8e858d Mon Sep 17 00:00:00 2001 From: bryan sun Date: Mon, 28 Oct 2019 14:12:51 +0800 Subject: [PATCH 33/40] aa --- src/api/ManufacturingCenter/ProcessingStatusNew.js | 13 +------------ .../ProcessingStatusNew/index.vue | 12 +++++++----- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/src/api/ManufacturingCenter/ProcessingStatusNew.js b/src/api/ManufacturingCenter/ProcessingStatusNew.js index bf8c32e2..4f33aa89 100644 --- a/src/api/ManufacturingCenter/ProcessingStatusNew.js +++ b/src/api/ManufacturingCenter/ProcessingStatusNew.js @@ -48,15 +48,4 @@ export function gettabledata1(num) { } }) } -// 编辑完成时间 -export function editdata(processSerialNumber) { - return request({ - url: '', - method: 'post', - data: { - type: '1', - name: '车间生产管理工艺_加工进度查询_查询', - param: '工艺计划流水号=' + processSerialNumber + '=int' - } - }) -} + diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue index 5f5435ee..490c044a 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -27,6 +27,7 @@ From 8e0826b50e2b22264a5aebab2d5ef579a795003b Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Mon, 28 Oct 2019 15:35:33 +0800 Subject: [PATCH 34/40] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E5=B1=95=E5=BC=80?= =?UTF-8?q?=E6=8A=98=E5=8F=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/icons/svg/ProcessPlanningNew.svg | 1 + src/icons/svg/ProcessingStatusNew.svg | 7 +++++++ src/views/ManufacturingCenter/ProcessPlanningNew/index.vue | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 src/icons/svg/ProcessPlanningNew.svg create mode 100644 src/icons/svg/ProcessingStatusNew.svg diff --git a/src/icons/svg/ProcessPlanningNew.svg b/src/icons/svg/ProcessPlanningNew.svg new file mode 100644 index 00000000..f8bdb9e0 --- /dev/null +++ b/src/icons/svg/ProcessPlanningNew.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/icons/svg/ProcessingStatusNew.svg b/src/icons/svg/ProcessingStatusNew.svg new file mode 100644 index 00000000..5c5be1e0 --- /dev/null +++ b/src/icons/svg/ProcessingStatusNew.svg @@ -0,0 +1,7 @@ + + + + + Svg Vector Icons : http://www.sfont.cn + + \ No newline at end of file diff --git a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue index 6ebafa71..5d5720e0 100644 --- a/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessPlanningNew/index.vue @@ -30,7 +30,7 @@ 是否核准 保存 - 关闭 + 折叠 展开 From 399c198d737b57f575f2f0567a0d7be7de8780c0 Mon Sep 17 00:00:00 2001 From: bryan sun Date: Tue, 29 Oct 2019 11:23:04 +0800 Subject: [PATCH 35/40] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=98=8E=E7=BB=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScheduleCompletionDetails.js | 28 +++ src/utils/request.js | 3 +- src/utils/tool.js | 1 - .../ProcessingStatusNew/index.vue | 4 +- .../ScheduleCompletionDetails/index.vue | 223 ++++++++++++++++++ 5 files changed, 255 insertions(+), 4 deletions(-) create mode 100644 src/api/ManufacturingCenter/ScheduleCompletionDetails.js create mode 100644 src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue diff --git a/src/api/ManufacturingCenter/ScheduleCompletionDetails.js b/src/api/ManufacturingCenter/ScheduleCompletionDetails.js new file mode 100644 index 00000000..c06d4713 --- /dev/null +++ b/src/api/ManufacturingCenter/ScheduleCompletionDetails.js @@ -0,0 +1,28 @@ +import request from '@/utils/request' + +// 查询人员总工工时 +export function searchtable(num2, num3, num4, num5, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计_查询数据2_新', + param: '操作者_check=0&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5, + Pagination: pageCurrent + '&' + pageSize + } + }) +} +// 查询人员具体工序 +export function searchtable2(num1, num2, num3, num4, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计按人员查询_查询数据2_新', + param: '工作者编号=' + num1 + '&时间_check=' + num2 + '&开始时间=' + num3 + '&结束时间=' + num4, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 7218f9b2..596cc146 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,7 +26,8 @@ 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.110:8002/submit/MESCommonBase.ashx`, + // baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/utils/tool.js b/src/utils/tool.js index ba0f89ff..d6bb50a1 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -52,7 +52,6 @@ export function getNowTime() { const time = date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second return time } - // 判断类型 export function type(target) { const ret = typeof (target) diff --git a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue index 490c044a..7fb8cb49 100644 --- a/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue +++ b/src/views/ManufacturingCenter/ProcessingStatusNew/index.vue @@ -50,7 +50,7 @@ {{ scope.row.不合格数量 }} - + @@ -292,7 +292,7 @@ export default { this.tableData1.push({ 工艺名称: response.data[i].工艺名称, 序间质检: response.data[i].质检结果, - 排产日期: response.data[i].计划日期 ? response.data[i].计划日期.split(' ')[0] : '', + 排产日期: response.data[i].排产时间 ? response.data[i].排产时间.split(' ')[0] : '', // 排产日期: response.data[i].计划日期, 完成日期: response.data[i].工序完成日期 ? response.data[i].工序完成日期.split(' ')[0] : '', 操作者: response.data[i].操作者, diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue new file mode 100644 index 00000000..d864b901 --- /dev/null +++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue @@ -0,0 +1,223 @@ + + + + + From 907ff3cb933b35132b94a84d4b70aa3544b90097 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 29 Oct 2019 12:00:09 +0800 Subject: [PATCH 36/40] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=B7=A5=E8=89=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/ManHourStatistics.js | 25 ++ .../ActualTimeSupplement/index.vue | 2 +- .../ManHourStatistics/index.vue | 218 ++++++++++++++++++ 3 files changed, 244 insertions(+), 1 deletion(-) create mode 100644 src/api/ManufacturingCenter/ManHourStatistics.js create mode 100644 src/views/ManufacturingCenter/ManHourStatistics/index.vue diff --git a/src/api/ManufacturingCenter/ManHourStatistics.js b/src/api/ManufacturingCenter/ManHourStatistics.js new file mode 100644 index 00000000..2655363b --- /dev/null +++ b/src/api/ManufacturingCenter/ManHourStatistics.js @@ -0,0 +1,25 @@ +import request from '@/utils/request' + +// 查询人员总工工时 +export function searchtable(num1, num2, num3, num4, num5) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计_查询数据2', + param: '操作者_check=' + num1 + '&姓名=' + num2 + '&时间_check=' + num3 + '&开始时间=' + num4 + '&结束时间=' + num5 + } + }) +} +export function searchTable2(pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: 'SELECT 零件图号,零件名称,工序顺序,工艺名称,单件定额工时,准结定额工时 FROM 车间生产管理工艺_零件工序_视图 where 工艺编号 is not null and 工艺计划流水号 = 1235', + pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue index 2f0ea333..73e02633 100644 --- a/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue +++ b/src/views/ManufacturingCenter/ActualTimeSupplement/index.vue @@ -319,7 +319,7 @@ export default { submitAdd() { this.$refs['form'].validate((valid) => { if (valid) { - submitAdd(this.form.technology, this.form.timeNumber, this.form.number, this.id).then(res => { + submitAdd(this.form.technology, this.form.timeNumber, this.form.number, this.id, this.form.opNum).then(res => { if (res.data[0].result === '1') { this.dialogFormVisible = false this.$message.success('操作成功') diff --git a/src/views/ManufacturingCenter/ManHourStatistics/index.vue b/src/views/ManufacturingCenter/ManHourStatistics/index.vue new file mode 100644 index 00000000..48b3e2b7 --- /dev/null +++ b/src/views/ManufacturingCenter/ManHourStatistics/index.vue @@ -0,0 +1,218 @@ + + + + From ba8dda5caa5da874f435262706bc3c83e11f9afa Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 29 Oct 2019 14:30:47 +0800 Subject: [PATCH 37/40] =?UTF-8?q?=E5=AE=9E=E9=99=85=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManufacturingCenter/ActualWorkQuery.js | 14 ++ src/utils/request.js | 3 +- src/utils/tool.js | 10 +- .../ActualWorkQuery/index.vue | 174 ++++++++++++++++++ 4 files changed, 198 insertions(+), 3 deletions(-) create mode 100644 src/api/ManufacturingCenter/ActualWorkQuery.js create mode 100644 src/views/ManufacturingCenter/ActualWorkQuery/index.vue diff --git a/src/api/ManufacturingCenter/ActualWorkQuery.js b/src/api/ManufacturingCenter/ActualWorkQuery.js new file mode 100644 index 00000000..dd40a1b1 --- /dev/null +++ b/src/api/ManufacturingCenter/ActualWorkQuery.js @@ -0,0 +1,14 @@ +import request from '@/utils/request' +// 查询加工工时统计表 +export function searchTable(num1, num2, num3, num4, pageCurrent, pageSize) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_工时统计_当日过程工时查询', + param: `加工开始时间_check=${num1}&加工开始时间=${num2}&工作者姓名_check=${num3}&工作者姓名=${num4}`, + Pagination: pageCurrent + '&' + pageSize + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 596cc146..7218f9b2 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,8 +26,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.110:8002/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.110:8002/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/utils/tool.js b/src/utils/tool.js index d6bb50a1..08823c69 100644 --- a/src/utils/tool.js +++ b/src/utils/tool.js @@ -41,7 +41,7 @@ function zeroFill(i) { return i } } -// 获取当前时间 +// 获取当前时间(yyyy-mm-dd hh:mm:ss) export function getNowTime() { const date = new Date() const month = zeroFill(date.getMonth() + 1) @@ -52,6 +52,14 @@ export function getNowTime() { const time = date.getFullYear() + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second return time } +// 获取当前时间(yyyy-mm-dd) +export function getNowShotTime() { + const date = new Date() + const month = zeroFill(date.getMonth() + 1) + const day = zeroFill(date.getDate()) + const time = date.getFullYear() + '-' + month + '-' + day + return time +} // 判断类型 export function type(target) { const ret = typeof (target) diff --git a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue new file mode 100644 index 00000000..27a87767 --- /dev/null +++ b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue @@ -0,0 +1,174 @@ + + + + + From 3bb1d98800b5b08e77b31e549387b29a7e8cb910 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 29 Oct 2019 14:32:22 +0800 Subject: [PATCH 38/40] =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/icons/svg/ActualWorkQuery.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/icons/svg/ActualWorkQuery.svg diff --git a/src/icons/svg/ActualWorkQuery.svg b/src/icons/svg/ActualWorkQuery.svg new file mode 100644 index 00000000..232d82de --- /dev/null +++ b/src/icons/svg/ActualWorkQuery.svg @@ -0,0 +1 @@ + \ No newline at end of file From 632240d90ec5b282fdd0caf59c05b7ba95b43be4 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 29 Oct 2019 14:39:10 +0800 Subject: [PATCH 39/40] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/icons/svg/ManHourStatistics.svg | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/icons/svg/ManHourStatistics.svg diff --git a/src/icons/svg/ManHourStatistics.svg b/src/icons/svg/ManHourStatistics.svg new file mode 100644 index 00000000..70b918bf --- /dev/null +++ b/src/icons/svg/ManHourStatistics.svg @@ -0,0 +1 @@ + \ No newline at end of file From e35b2215d39ee8fe7b544dfb5c6e7e791d2e86ce Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Tue, 29 Oct 2019 15:03:21 +0800 Subject: [PATCH 40/40] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E7=BB=9F=E8=AE=A1(?= =?UTF-8?q?=E5=B7=A5=E8=89=BA)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManHourStatistics/Export2Excel.js | 224 ++++++++++++++++++ .../ManHourStatistics/index.vue | 221 +++++++++-------- 2 files changed, 341 insertions(+), 104 deletions(-) create mode 100644 src/views/ManufacturingCenter/ManHourStatistics/Export2Excel.js diff --git a/src/views/ManufacturingCenter/ManHourStatistics/Export2Excel.js b/src/views/ManufacturingCenter/ManHourStatistics/Export2Excel.js new file mode 100644 index 00000000..a4a80fd7 --- /dev/null +++ b/src/views/ManufacturingCenter/ManHourStatistics/Export2Excel.js @@ -0,0 +1,224 @@ +/* eslint-disable */ +require('script-loader!file-saver'); +// import XLSX from 'xlsx' +import XLSX from 'xlsx-style' +function generateArray(table) { + var out = []; + var rows = table.querySelectorAll('tr'); + var ranges = []; + for (var R = 0; R < rows.length; ++R) { + var outRow = []; + var row = rows[R]; + var columns = row.querySelectorAll('td'); + for (var C = 0; C < columns.length; ++C) { + var cell = columns[C]; + var colspan = cell.getAttribute('colspan'); + var rowspan = cell.getAttribute('rowspan'); + var cellValue = cell.innerText; + if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue; + + //Skip ranges + ranges.forEach(function (range) { + if (R >= range.s.r && R <= range.e.r && outRow.length >= range.s.c && outRow.length <= range.e.c) { + for (var i = 0; i <= range.e.c - range.s.c; ++i) outRow.push(null); + } + }); + + //Handle Row Span + if (rowspan || colspan) { + rowspan = rowspan || 1; + colspan = colspan || 1; + ranges.push({ + s: { + r: R, + c: outRow.length + }, + e: { + r: R + rowspan - 1, + c: outRow.length + colspan - 1 + } + }); + }; + + //Handle Value + outRow.push(cellValue !== "" ? cellValue : null); + + //Handle Colspan + if (colspan) + for (var k = 0; k < colspan - 1; ++k) outRow.push(null); + } + out.push(outRow); + } + return [out, ranges]; +}; + +function datenum(v, date1904) { + if (date1904) v += 1462; + var epoch = Date.parse(v); + return (epoch - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000); +} + +function sheet_from_array_of_arrays(data, opts) { + var ws = {}; + var range = { + s: { + c: 10000000, + r: 10000000 + }, + e: { + c: 0, + r: 0 + } + }; + for (var R = 0; R != data.length; ++R) { + for (var C = 0; C != data[R].length; ++C) { + if (range.s.r > R) range.s.r = R; + if (range.s.c > C) range.s.c = C; + if (range.e.r < R) range.e.r = R; + if (range.e.c < C) range.e.c = C; + var cell = { + v: data[R][C] + }; + if (cell.v == null) continue; + var cell_ref = XLSX.utils.encode_cell({ + c: C, + r: R + }); + + if (typeof cell.v === 'number') cell.t = 'n'; + else if (typeof cell.v === 'boolean') cell.t = 'b'; + else if (cell.v instanceof Date) { + cell.t = 'n'; + cell.z = XLSX.SSF._table[14]; + cell.v = datenum(cell.v); + } else cell.t = 's'; + + ws[cell_ref] = cell; + } + } + if (range.s.c < 10000000) ws['!ref'] = XLSX.utils.encode_range(range); + return ws; +} + +function Workbook() { + if (!(this instanceof Workbook)) return new Workbook(); + this.SheetNames = []; + this.Sheets = {}; +} + +function s2ab(s) { + var buf = new ArrayBuffer(s.length); + var view = new Uint8Array(buf); + for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF; + return buf; +} + +export function export_table_to_excel(id) { + var theTable = document.getElementById(id); + var oo = generateArray(theTable); + var ranges = oo[1]; + + /* original data */ + var data = oo[0]; + var ws_name = "SheetJS"; + + var wb = new Workbook(), + ws = sheet_from_array_of_arrays(data); + + /* add ranges to worksheet */ + // ws['!cols'] = ['apple', 'banan']; + ws['!merges'] = ranges; + + /* add worksheet to workbook */ + wb.SheetNames.push(ws_name); + wb.Sheets[ws_name] = ws; + + var wbout = XLSX.write(wb, { + bookType: 'xlsx', + bookSST: false, + type: 'binary' + }); + + saveAs(new Blob([s2ab(wbout)], { + type: "application/octet-stream" + }), "test.xlsx") +} + +export function export_json_to_excel({ + headerGroup, + dataGroup, + sheetGroup, + filename, + autoWidth = true, + bookType= 'xlsx' +} = {}) { + var wb = new Workbook() + for (let i = 0; i < dataGroup.length; i++) { + /* original data */ + let data = dataGroup[i] + filename = filename || 'excel-list' + data = [...data] + data.unshift(headerGroup[i]); + var ws_name = sheetGroup[i]; + var ws = sheet_from_array_of_arrays(data); + + if (autoWidth) { + /*设置worksheet每列的最大宽度*/ + const colWidth = data.map(row => row.map(val => { + /*先判断是否为null/undefined*/ + if (val == null) { + return { + 'wch': 10 + }; + } + /*再判断是否为中文*/ + else if (val.toString().charCodeAt(0) > 255) { + return { + 'wch': val.toString().length * 2 + }; + } else { + return { + 'wch': val.toString().length + }; + } + })) + /*以第一行为初始值*/ + let result = colWidth[0]; + for (let i = 1; i < colWidth.length; i++) { + for (let j = 0; j < colWidth[i].length; j++) { + if (result[j]['wch'] < colWidth[i][j]['wch']) { + result[j]['wch'] = colWidth[i][j]['wch']; + } + } + } + ws['!cols'] = result; + } + let R = 0; + data.map(item => { + let C = 0; + item.map(itm => { + var cell_ref = XLSX.utils.encode_cell({c:C,r:R}); + var cell = {v: itm } + cell.s= { + alignment: { + horizontal: "center" + } + } + ws[cell_ref] = cell; + C++; + }) + R++; + }) + /* add worksheet to workbook */ + wb.SheetNames.push(ws_name); + wb.Sheets[ws_name] = ws; + } + var wbout = XLSX.write(wb, { + bookType: bookType, + bookSST: false, + type: 'binary' + }); + saveAs(new Blob([s2ab(wbout)], { + type: "application/octet-stream" + }), `${filename}.${bookType}`); +} diff --git a/src/views/ManufacturingCenter/ManHourStatistics/index.vue b/src/views/ManufacturingCenter/ManHourStatistics/index.vue index 48b3e2b7..0f39d45d 100644 --- a/src/views/ManufacturingCenter/ManHourStatistics/index.vue +++ b/src/views/ManufacturingCenter/ManHourStatistics/index.vue @@ -17,9 +17,12 @@ type="date" placeholder="选择结束日期"/> 查询 + + 导出 + - +