From ecd3de3cd507a17acbfa0db4c63db0882b108269 Mon Sep 17 00:00:00 2001 From: yanggongyan <929128837@qq.com> Date: Wed, 5 Feb 2020 10:28:50 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=B8=AC=E8=A9=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContractDetailsInquiry.js | 0 src/utils/curd.js | 24 +++ src/utils/request.js | 11 +- .../ContractDetailsInquiry/index.vue | 106 +++++++++- .../MonthEndHourAccounting/index.vue | 2 +- .../ContractInformationManagement/index.vue | 56 +++--- .../WorkshopProcurement/ExcelExport/index.vue | 186 ++++++++++++++++++ 7 files changed, 345 insertions(+), 40 deletions(-) delete mode 100644 src/api/ManufacturingCenter/ContractDetailsInquiry.js create mode 100644 src/views/WorkshopProcurement/ExcelExport/index.vue diff --git a/src/api/ManufacturingCenter/ContractDetailsInquiry.js b/src/api/ManufacturingCenter/ContractDetailsInquiry.js deleted file mode 100644 index e69de29b..00000000 diff --git a/src/utils/curd.js b/src/utils/curd.js index 664ddb7e..5bbc55eb 100644 --- a/src/utils/curd.js +++ b/src/utils/curd.js @@ -5,6 +5,30 @@ Created by hedekun import { type } from './tool' // type判断传入值的类型，比typeof更详细 export default { install(Vue) { + Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) { + var paramStr = '' + var paramarray = [] + if (data !== undefined) { + for (let i = 0; i < data.length; i++) { + paramarray.push({ + name: data[i][0], + value: data[i][1], + type: data[i][2], + output: data[i][3] + }) + } + paramStr = JSON.stringify(paramarray) + } + var obj = [] + obj[0] = {} + obj[0].type = type + obj[0].name = name + obj[0].param = paramStr + obj[0].pageSize = pageSize + obj[0].pageList = pageList + var numn = JSON.stringify(obj[0]) + return numn + } // 用于打开增加框，方法能重置表单，并使表单内容回到初始化状态。 // 传入参数 // 1）表单名称，字符串形式如'form'，必须 diff --git a/src/utils/request.js b/src/utils/request.js index 4112ffa0..c06db966 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,8 +17,8 @@ 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.5:8079/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.1.5:8079/submit/downloadFile.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 +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({ -<<<<<<< HEAD - - baseURL: `http://192.168.0.100:8074/submit/MESCommonBase.ashx`, -======= - baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, ->>>>>>> 4fb54f4d3ea13e7c327b17bde7ac4ffc21b9b821 + baseURL: `http://192.168.1.5:8079/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 }) export default service diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue index e4cccfff..2daef2e2 100644 --- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue +++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue @@ -2,7 +2,7 @@
项目名称 - + 机床名称 - + + 分组 + + + + 规格及型号 + + 加工总工时（小时）: + + 计划总工时（小时）: + + 查询 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -29,7 +123,13 @@ export default { project: [], projectValue: '', // 项目名称 machineValue: '', // 机床名称 - machine: [] + machine: [], + part: [], // 分組 + partValue: '', + specificationValue: '', // 规格型号 + totalProcessingHours: '', // 加工总工时 + totalPlannedHours: '', // 计划总工时 + tableData: [] // 详情表 } }, created() { diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue index 4a51526e..84431c84 100644 --- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue +++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue @@ -69,7 +69,7 @@ diff --git a/src/views/MarketingCenter/ContractInformationManagement/index.vue b/src/views/MarketingCenter/ContractInformationManagement/index.vue index a832a446..ecab7e45 100644 --- a/src/views/MarketingCenter/ContractInformationManagement/index.vue +++ b/src/views/MarketingCenter/ContractInformationManagement/index.vue @@ -427,7 +427,7 @@
- +