diff --git a/src/utils/request.js b/src/utils/request.js index f79d7a47..c09b5fd3 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -8,24 +8,24 @@ export const name1 = `OP1000` export const name3 = `OP2000` export const name4 = `OP9999` -export const readFile = `http://123.56.95.229:8010/webpage/file/` // invoice -export const readImg = `http://123.56.95.229:8010/webpage/img/` // delivery/MS/performancebond -export const upload = `http://123.56.95.229:8010/submit/uploadFile.ashx` // ContractInformationManagement -export const upload2 = `http://123.56.95.229:8010/submit/upload2.ashx` // delivery -export const upload3 = `http://123.56.95.229:8010/submit/upload3.ashx` // performancebond -export const uploadInvoiceScan = `http://123.56.95.229:8010/submit/uploadInvoiceScan.ashx` // invoice -export const uploadInvoiceScan1 = `http://123.56.95.229:8010/submit/uploadInvoiceScan1.ashx` // invoice(workshop) -export const download = `http://123.56.95.229:8010/submit/downloadFile.ashx` // ContractInformationManagement -export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx` -export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx` -export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESCommonBase.ashx' // 导出excel +export const readFile = `http://123.56.95.229:58010/webpage/file/` // invoice +export const readImg = `http://123.56.95.229:58010/webpage/img/` // delivery/MS/performancebond +export const upload = `http://123.56.95.229:58010/submit/uploadFile.ashx` // ContractInformationManagement +export const upload2 = `http://123.56.95.229:58010/submit/upload2.ashx` // delivery +export const upload3 = `http://123.56.95.229:58010/submit/upload3.ashx` // performancebond +export const uploadInvoiceScan = `http://123.56.95.229:58010/submit/uploadInvoiceScan.ashx` // invoice +export const uploadInvoiceScan1 = `http://123.56.95.229:58010/submit/uploadInvoiceScan1.ashx` // invoice(workshop) +export const download = `http://123.56.95.229:58010/submit/downloadFile.ashx` // ContractInformationManagement +export const uploadPerson = `http://123.56.95.229:58010/submit/uploadPerson.ashx` +export const uploadOP = `http://123.56.95.229:58010/submit/uploadOP.ashx` +export const url = `http://123.56.95.229:58010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://123.56.95.229:58010/submit/MESCommonBase.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 -export const ServerIP = `http://123.56.95.229:8010/webpage/file/` -export const uploadFileMachine = `http://123.56.95.229:8010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 -export const downloadFileMachine = `http://123.56.95.229:8010/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 -export const MESUploadFile = `http://123.56.95.229:8010/submit/MESUploadFile.ashx` -export const MESDownloadFile = `http://123.56.95.229:8010/submit/MESDownloadFile.ashx` +export const ServerIP = `http://123.56.95.229:58010/webpage/file/` +export const uploadFileMachine = `http://123.56.95.229:58010/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 +export const downloadFileMachine = `http://123.56.95.229:58010/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 +export const MESUploadFile = `http://123.56.95.229:58010/submit/MESUploadFile.ashx` +export const MESDownloadFile = `http://123.56.95.229:58010/submit/MESDownloadFile.ashx` const service = axios.create({ baseURL: `http://123.56.95.229:58010/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue index 2db35883..a7866bab 100644 --- a/src/views/Assembly/AssemblyQualityInspection/index.vue +++ b/src/views/Assembly/AssemblyQualityInspection/index.vue @@ -176,8 +176,8 @@ export default { if (this.qualityInspectionValue !== '' && this.qualityInspectionValue !== null) { this.check4 = 1 } else { this.check4 = 0 } selecttable22(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.TestValue, this.check4, this.qualityInspectionValue).then(response => { import('@/vendor/Export2Excel').then(excel => { - const tHeader = ['是否合格', '机床图号', '机床名称', '组号', '部件名称', '检测项', '检测项明细', '备注'] - const filterVal = ['合格情况', '机床图号', '机床名称', '组号', '组件名称', '检测项', '检测项明细', '备注'] + const tHeader = ['检验情况', '机床图号', '机床名称', '组号', '部件名称', '检测项', '检测项明细', '质检时间', '质检员', '备注'] + const filterVal = ['合格情况', '机床图号', '机床名称', '组号', '组件名称', '检测项', '检测项明细', '质检时间', '姓名', '备注'] const list = response.data const data = this.formatJson(filterVal, list) excel.export_json_to_excel({ diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue index 233c3946..efa7ce8a 100644 --- a/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue +++ b/src/views/ManufacturingCenter/RequestApprovalQuery1/index.vue @@ -66,6 +66,11 @@ {{ scope.row.审核情况内容 }} + + +