From a8f4599c8b0cfedd72cbed88ff5d6ec4eab7dcdd Mon Sep 17 00:00:00 2001 From: "liulujia@meswork.com" Date: Wed, 5 Feb 2020 08:49:01 +0800 Subject: [PATCH] =?UTF-8?q?20200204=E5=88=9B=E5=BB=BA=E5=A4=96=E8=B4=AD?= =?UTF-8?q?=E8=AE=A1=E5=88=92=EF=BC=8C=E5=A4=87=E6=96=99=E5=88=86=E9=85=8D?= =?UTF-8?q?=EF=BC=8C=E5=A4=96=E8=B4=AD=E5=A4=87=E6=96=99=E8=AF=B7=E6=AC=BE?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreatePreparationBill.js | 16 +- .../CreatingPurchasingMaterials.js | 6 +- .../OutsourcingMaterialsSearch.js | 12 + src/utils/request.js | 12 +- .../SparePartsOutStockRecord/index.vue | 54 ++-- .../ContractDetailsInquiry/index.vue | 25 +- .../CreatePreparationBill/index.vue | 92 ++++++- .../MaterialArrival/index.vue | 2 +- .../MonthEndHourAccounting/index.vue | 2 +- .../ContractInformationManagement/index.vue | 56 ++-- .../CreatingPurchasingMaterials/index.vue | 146 ++++++++--- .../NewArrivalList/index.vue | 56 +++- .../OutsourcingMaterialsInvoice/index.vue | 49 +++- .../OutsourcingMaterialsSearch/index.vue | 34 ++- .../RequestOutsourcingMaterials/index.vue | 240 ++++++++++-------- 15 files changed, 570 insertions(+), 232 deletions(-) diff --git a/src/api/ManufacturingCenter/CreatePreparationBill.js b/src/api/ManufacturingCenter/CreatePreparationBill.js index dc985372..836545fd 100644 --- a/src/api/ManufacturingCenter/CreatePreparationBill.js +++ b/src/api/ManufacturingCenter/CreatePreparationBill.js @@ -1,14 +1,14 @@ import request from '@/utils/request' // 查询零件 -export function searchtable(num1, num2, num3, num4, pageCurrent, pageSize) { +export function searchtable(num1, num2, num3, num4, pageCurrent, pageSize, ordername, order) { return request({ url: '', method: 'post', data: { type: '1', name: '车间生产管理工艺_零件工艺计划_编制工艺_备料零件查询', - param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料打印_check=' + num3 + '&备料打印=' + num4 + '&备料到货=0', + param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料打印_check=' + num3 + '&备料打印=' + num4 + '&备料到货=0' + '&排序名称=' + ordername + '&排序方式=' + order, Pagination: pageCurrent + '&' + pageSize } }) @@ -49,3 +49,15 @@ export function edit2(num1) { } }) } +export function getExport(num1, num2, num3, num4) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '车间生产管理工艺_零件工艺计划_编制工艺_备料零件查询', + param: '零件图号_check=' + num1 + '&零件图号=' + num2 + '&备料打印_check=' + num3 + '&备料打印=' + num4 + '&备料到货=0' + } + }) +} + diff --git a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js index ef771d11..86973603 100644 --- a/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js +++ b/src/api/WorkshopProcurement/CreatingPurchasingMaterials.js @@ -64,15 +64,15 @@ export function searchPurchasedMaterials(check1, name) { }) } // 查询采购单 -export function searchPurchaseOrder(pageCurrent, pageSize, check1, num, check2, name, check3, name2) { +export function searchPurchaseOrder(check1, num, check2, name, check3, name2, checktime, starttime, endtime) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_采购计划_查询数据', - param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}&供应商流水号_check=${check3}&供应商流水号=${name2}`, - Pagination: pageCurrent + '&' + pageSize + param: `采购单号_check=${check1}&采购单号=${num}&供应商名称_check=${check2}&供应商名称=${name}&供应商流水号_check=${check3}&供应商流水号=${name2}&时间_check=${checktime}&开始时间=${starttime}&结束时间=${endtime}` + // Pagination: pageCurrent + '&' + pageSize } }) } diff --git a/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js b/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js index 4f16735a..af080a0d 100644 --- a/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js +++ b/src/api/WorkshopProcurement/OutsourcingMaterialsSearch.js @@ -25,3 +25,15 @@ export function searchTable(check, supplierNameValue, check1, partNumber, check2 } }) } +// 导出 +export function searchTablesheet(check, supplierNameValue, check1, partNumber, check2, MaterialsValue, pageSize, pageCurrent) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: '备料管理_外购备料_综合查询数据', + param: '供应商流水号_check=' + check + '&供应商流水号=' + supplierNameValue + '&零件图号_check=' + check1 + '&零件图号=' + partNumber + '&备料状态_check=' + check2 + '&备料状态=' + MaterialsValue + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index 4112ffa0..0db87c1c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,8 +17,9 @@ export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoic export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement export const uploadPerson = `http://192.168.1.231:8411/submit/uploadPerson.ashx` export const uploadOP = `http://192.168.1.231:8411/submit/uploadOP.ashx` -export const url = `http://192.168.0.100:8074/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.0.100:8074/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.1.188:8045/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.1.188:8045/submit/downloadFile.ashx' // 导出excel +export const ExcelWaiGou = 'http://192.168.1.167:8045/submit/excel.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 @@ -26,12 +27,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({ -<<<<<<< HEAD - - baseURL: `http://192.168.0.100:8074/submit/MESCommonBase.ashx`, -======= - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, ->>>>>>> 4fb54f4d3ea13e7c327b17bde7ac4ffc21b9b821 + baseURL: `http://localhost:8045/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/Assembly/SparePartsOutStockRecord/index.vue b/src/views/Assembly/SparePartsOutStockRecord/index.vue index cfb78bea..19e20790 100644 --- a/src/views/Assembly/SparePartsOutStockRecord/index.vue +++ b/src/views/Assembly/SparePartsOutStockRecord/index.vue @@ -2,27 +2,27 @@
- 机床编号: - - -
{{ item.label }}
-
{{ item.name }}
- - - 组号: - - - + + + + + + + + + + + + + + + + + + + 零件图号: - + 时间区间: - - + + - + - + - + - + diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue index e4cccfff..41c6b08d 100644 --- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue +++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue @@ -2,7 +2,7 @@
项目名称 - + 机床名称 - + + 分组 + + + + 规格及型号 + + 加工总工时（小时）: + + 计划总工时（小时）: +
@@ -29,7 +43,12 @@ export default { project: [], projectValue: '', // 项目名称 machineValue: '', // 机床名称 - machine: [] + machine: [], + part: [], // 分組 + partValue: '', + specificationValue: '', // 规格型号 + totalProcessingHours: '', // 加工总工时 + totalPlannedHours: '' // 计划总工时 } }, created() { diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue index b39857da..f4c3ea68 100644 --- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue +++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue @@ -18,47 +18,63 @@ 打印自家备料单 + + 导出 + - + - + - + - + - + - + - + - + @@ -114,7 +130,7 @@