From 98c67d38225655eb3a8de2e4e4f093fb0fae2a01 Mon Sep 17 00:00:00 2001 From: bryan sun Date: Thu, 17 Oct 2019 19:30:46 +0800 Subject: [PATCH 1/2] 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 ea3bf600f3db602bbd3d3a874baf27763c7feaee Mon Sep 17 00:00:00 2001 From: bryan sun Date: Wed, 23 Oct 2019 19:04:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateWarehousePurchasing.js | 34 + src/api/ManufacturingCenter/StatusQuery.js | 5 +- src/utils/request.js | 2 +- .../AssemblyQualityInspection/index.vue | 12 +- .../index.vue | 32 +- .../SparePartsOutStockRecord/index.vue | 10 +- .../Inventory/CreatePickingList/index.vue | 52 +- src/views/Inventory/InventoryCheck/index.vue | 12 +- src/views/Inventory/MaterialOut/index.vue | 12 +- src/views/Inventory/OfflinePartOut/index.vue | 8 +- .../Inventory/OfflinePartsStorage/index.vue | 6 +- src/views/Inventory/OutPartSelect/index.vue | 12 +- .../Inventory/PurchaseInRecord/index.vue | 20 +- .../Inventory/PurchasePartsStorage/index.vue | 6 +- src/views/Inventory/StockInquiry/index.vue | 12 +- .../ActualTimeSupplement/index.vue | 12 +- .../CreatePreparationBill/index.vue | 6 +- .../CreateWarehousePurchasing/index.vue | 74 +- .../InitialProduction/index.vue | 9 +- .../InventoryQuery/index.vue | 10 +- .../MaterialArrivalManagement/index.vue | 8 +- .../PartAssignment/index.vue | 10 +- .../PartWorkCraftSelect_rdlc/index.vue | 10 +- .../ProcessTaskAssignment/index.vue | 4 +- .../ProductionCapacityBalance/index.vue | 4 +- .../SparePartsForScrap/index.vue | 2 - .../ManufacturingCenter/StatusQuery/index.vue | 83 +-- .../WorkshopEquipmentManagement/index.vue | 8 +- src/views/MarketingCenter/BidBond/index.vue | 6 +- src/views/MarketingCenter/CRM/index.vue | 2 +- .../ComprehensiveInquiryMS/index.vue | 8 +- .../ContractCapitalManagement/index.vue | 8 +- .../ContractInformationManagement/index.vue | 6 +- .../MarketingCenter/CreateProject/index.vue | 6 +- .../MarketingCenter/InvoiceRecord/index.vue | 4 +- .../MarketingCenter/PerformanceBond/index.vue | 8 +- .../MarketingCenter/SafetyMargin/index.vue | 8 +- .../InterBudgetaryBudgets/index.vue | 8 +- .../OutsourcingDataMaintenance/index.vue | 1 - .../index.vue | 16 +- .../Outsourcing/OutsourcingQCSearch/index.vue | 4 +- .../OutsourcingTaskExecution/index.vue | 16 +- .../OutsourcingTaskQuery/index.vue | 10 +- .../Outsourcing/PreorderAssociation/index.vue | 8 +- .../ArrivalStateSearch/index.vue | 8 +- .../BacklogGoodsAnalysis/index.vue | 16 +- .../InvoiceSettlementApplication/index.vue | 8 +- .../MaterialManagement/index.vue | 8 +- .../OfflineContract/index.vue | 700 ++++++++++++++---- .../OfflineContractRequestFund/index.vue | 6 +- .../PurchasingCenter/PayStateSearch/index.vue | 14 +- .../PurchaseContractRequestFund/index.vue | 14 +- .../PurchaseContractSearch/index.vue | 10 +- .../PurchaseSituationSearch/index.vue | 42 +- .../PurchaseTaskAllocate/index.vue | 52 +- .../PurchasingCenter/SetPayPlan/index.vue | 6 +- .../TechnologyCenter/QueryParts/index.vue | 34 +- .../CreatingPurchasingMaterials/index.vue | 24 +- .../InvoiceSettlementApplication1/index.vue | 14 +- .../NewArrivalList/index.vue | 12 +- .../OutsourcingMaterialsInvoice/index.vue | 8 +- .../PurchaseContractRequestFund1/index.vue | 6 +- .../RequestOutsourcingMaterials/index.vue | 2 +- 63 files changed, 1031 insertions(+), 547 deletions(-) diff --git a/src/api/ManufacturingCenter/CreateWarehousePurchasing.js b/src/api/ManufacturingCenter/CreateWarehousePurchasing.js index b4485499..08f2eb1d 100644 --- a/src/api/ManufacturingCenter/CreateWarehousePurchasing.js +++ b/src/api/ManufacturingCenter/CreateWarehousePurchasing.js @@ -109,3 +109,37 @@ export function updateNumber(...params) { } }) } +export function getperson(num) { + return request({ + url: '', + method: 'post', + data: { + type: '3', + name: 'select * from dbo.人事档案管理_人员名单 inner join dbo.菜单系统模块_人员与角色 ' + + 'on 人事档案管理_人员名单.人员编号=菜单系统模块_人员与角色.人员编号 ' + + 'where 角色编号=3 or 角色编号=2' + } + }) +} +export function tiaozheng(formNumber, PersonValue) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_仓库采购_表单_采购分配', + param: `表单流水号=${formNumber}&采购员编号=${PersonValue}` + } + }) +} +export function deletematerial(id) { + return request({ + url: '', + method: 'post', + data: { + type: '2', + name: '采购管理_仓库采购_表单明细_删除', + param: `id=${id}` + } + }) +} diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js index e27efdec..d7f4f7ed 100644 --- a/src/api/ManufacturingCenter/StatusQuery.js +++ b/src/api/ManufacturingCenter/StatusQuery.js @@ -44,15 +44,14 @@ export function searchgroup(num, pageCurrent, pageSize) { } }) } -export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue, pageSize, pageCurrent) { +export function searchTable(check, entryNameValue, check1, machine, check2, groupNum, check3, partNumber, check4, partStateValue, check5, partTypeValue) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_零件工艺计划_查询数据_状态_新_MESWORK', - param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int', - pagination: pageCurrent + '&' + pageSize + param: '项目流水号_check=' + check + '=int&项目流水号=' + entryNameValue + '&机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int&零件图号_check=' + check3 + '=int&零件图号=' + partNumber + '=string&考核状态_check=' + check4 + '=int&考核状态=' + partStateValue + '=int&单件是否外协_check=' + check5 + '=int&单件是否外协=' + partTypeValue + '=int' } }) } diff --git a/src/utils/request.js b/src/utils/request.js index e9cf8a39..56ffd77d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -26,7 +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`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue index 44c6d4ca..66f033bf 100644 --- a/src/views/Assembly/AssemblyQualityInspection/index.vue +++ b/src/views/Assembly/AssemblyQualityInspection/index.vue @@ -41,34 +41,34 @@ - + - + - + - + - + - + diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index 431b6412..3de576d4 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -256,27 +256,27 @@

正在加工零件列表

- + - + - + - + - + @@ -286,17 +286,17 @@ {{ scope.row.批次数量 }} - + - + - + @@ -326,27 +326,27 @@

待加工零件列表

- + - + - + - + - + @@ -356,17 +356,17 @@ {{ scope.row.批次数量 }} - + - + - + diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue index e24dca01..cfb78bea 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/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue index dc5aeb53..e161c9ec 100644 --- a/src/views/Inventory/CreatePickingList/index.vue +++ b/src/views/Inventory/CreatePickingList/index.vue @@ -37,27 +37,27 @@ - + - + - + date - + - + @@ -98,27 +98,27 @@ - + - + - + - + - + @@ -154,27 +154,27 @@ - + - + - + - + - + @@ -228,7 +228,7 @@ - + @@ -238,17 +238,17 @@ {{ scope.row.操作日期.split(' ')[0] }} - + - + - + - + - + - + @@ -62,22 +62,22 @@ - + - + - + - + diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue index 231d1dbc..e25a1121 100644 --- a/src/views/Inventory/OfflinePartOut/index.vue +++ b/src/views/Inventory/OfflinePartOut/index.vue @@ -15,22 +15,22 @@ - + - + - + - + diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue index 477fc245..1cdd00e6 100644 --- a/src/views/Inventory/OfflinePartsStorage/index.vue +++ b/src/views/Inventory/OfflinePartsStorage/index.vue @@ -22,17 +22,17 @@ - + - + - + diff --git a/src/views/Inventory/OutPartSelect/index.vue b/src/views/Inventory/OutPartSelect/index.vue index 260b174e..5d513a9f 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/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue index 5c096ba6..d9a6b969 100644 --- a/src/views/Inventory/PurchaseInRecord/index.vue +++ b/src/views/Inventory/PurchaseInRecord/index.vue @@ -50,17 +50,17 @@

采购合同入库

- + - + - + @@ -70,12 +70,12 @@ {{ scope.row.入库数量 }} - + - + @@ -94,17 +94,17 @@

离线合同入库

- + - + - + @@ -114,12 +114,12 @@ {{ scope.row.入库数量 }} - + - + diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue index 368ba7c7..a02e2cfa 100644 --- a/src/views/Inventory/PurchasePartsStorage/index.vue +++ b/src/views/Inventory/PurchasePartsStorage/index.vue @@ -30,17 +30,17 @@ - + - + - + diff --git a/src/views/Inventory/StockInquiry/index.vue b/src/views/Inventory/StockInquiry/index.vue index e0371333..b3f064ab 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 5fbbb1a3..2f0ea333 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 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 @@