From 18aa5deefc508dd32d06b60702cea79b20c1985e Mon Sep 17 00:00:00 2001 From: jiangfuzhuang Date: Mon, 3 Jun 2019 15:31:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=5F20190603?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QualityInspectionInformationInquiry.js | 5 +++-- .../index.vue | 22 ++++++++++++++++++- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js index 6b20a96d..4893b14b 100644 --- a/src/api/Assembly/QualityInspectionInformationInquiry.js +++ b/src/api/Assembly/QualityInspectionInformationInquiry.js @@ -35,14 +35,15 @@ export function searchgroup(num) { }) } // 组件查询 -export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, pageCurrent, pageSize) { +export function selecttable(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, pageCurrent, pageSize) { return request({ url: '', method: 'post', data: { type: '1', name: '质检管理_质量情况_查询数据', - param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4, + param: '机床流水号_check=' + check1 + '&机床流水号=' + value1 + '&组件流水号_check=' + check2 + '&组件流水号=' + value2 + '&零件名称_check=' + check3 + '&零件名称=' + value3 + + '&质检类型代码_check=' + check4 + '&质检类型代码=' + value4 + '&开始时间_check=' + check5 + '&开始时间=' + value5 + '&结束时间_check=' + check6 + '&结束时间=' + value6, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue index 10673baf..bb0d5683 100644 --- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue +++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue @@ -31,6 +31,22 @@ 零件: + 时间区间: + + ~ + 查询 @@ -130,6 +146,8 @@ export default { return { machineNumberValue: '', machineNumber: [], + startTime: '', + endTime: '', groupNumberValue: '', groupNumber: [], QualityTypeNumber: [], @@ -190,7 +208,9 @@ export default { if (this.groupNumberValue !== '' && this.groupNumberValue !== null) { this.check2 = 1 } else { this.check2 = 0 } if (this.SpareParts !== '' && this.SpareParts !== null) { this.check3 = 1 } else { this.check3 = 0 } if (this.QualityTypeValue !== '' && this.QualityTypeValue !== null) { this.check4 = 1 } else { this.check4 = 0 } - selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.pageCurrent, this.pageSize).then(response => { + if (this.startTime !== '' && this.startTime !== null) { this.check5 = 1 } else { this.check5 = 0 } + if (this.endTime !== '' && this.endTime !== null) { this.check6 = 1 } else { this.check6 = 0 } + selecttable(this.check1, this.machineNumberValue, this.check2, this.groupNumberValue, this.check3, this.SpareParts, this.check4, this.QualityTypeValue, this.check5, this.startTime, this.check6, this.endTime, this.pageCurrent, this.pageSize).then(response => { this.tableData1 = response.data.rows this.loading = false this.total = response.data.total From a513a64ab0ca6f9b591ed5812cf57defd8b85059 Mon Sep 17 00:00:00 2001 From: caoxinyu Date: Mon, 3 Jun 2019 19:07:52 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9C=BA=E5=BA=8A=E6=80=BB=E5=9B=BE?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/TechnologyCenter/QueryParts.js | 11 +++ src/utils/request.js | 6 +- .../TechnologyCenter/ImportParts/index.vue | 5 +- .../TechnologyCenter/QueryParts/index.vue | 85 ++++++++++++++++++- 4 files changed, 100 insertions(+), 7 deletions(-) diff --git a/src/api/TechnologyCenter/QueryParts.js b/src/api/TechnologyCenter/QueryParts.js index f5863d45..52e3273b 100644 --- a/src/api/TechnologyCenter/QueryParts.js +++ b/src/api/TechnologyCenter/QueryParts.js @@ -81,3 +81,14 @@ export function deletePurchaseData(num) { } }) } +export function getFileData(MachineDrawValue) { + return request({ + url: '', + method: 'post', + data: { + type: '1', + name: 'PDM_机床总图_查询数据', + param: `机床流水号=${MachineDrawValue}` + } + }) +} diff --git a/src/utils/request.js b/src/utils/request.js index c609d18e..39e0294c 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -11,14 +11,16 @@ export const name1 = `OP1000` export const readFile = `http://192.168.1.231:8411/webpage/file/` // invoice export const readImg = `http://192.168.1.231:8411/webpage/img/` // delivery/MS/performancebond export const upload = `http://192.168.1.231:8411/submit/uploadFile.ashx` // ContractInformationManagement -export const uploadFileMachine = `http://192.168.1.231:8411/submit/uploadFileMachine.ashx` // 机床总图 发布时改成0.231 export const upload2 = `http://192.168.1.231:8411/submit/upload2.ashx` // delivery export const upload3 = `http://192.168.1.231:8411/submit/upload3.ashx` // performancebond export const uploadInvoiceScan = `http://192.168.1.231:8411/submit/uploadInvoiceScan.ashx` // invoice export const uploadInvoiceScan1 = `http://192.168.1.231:8411/submit/uploadInvoiceScan1.ashx` // invoice(workshop) export const download = `http://192.168.1.231:8411/submit/downloadFile.ashx` // ContractInformationManagement -export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 +// 技术中心程序发布时要更改下面所有的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 +export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFileMachine.ashx` // 机床总图 发布时改成0.231 const service = axios.create({ baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/TechnologyCenter/ImportParts/index.vue b/src/views/TechnologyCenter/ImportParts/index.vue index 550df1b7..fac8537a 100644 --- a/src/views/TechnologyCenter/ImportParts/index.vue +++ b/src/views/TechnologyCenter/ImportParts/index.vue @@ -194,10 +194,8 @@ export default { }, // 在什么情况下需要查询上传的附件，调用this.getFileData()即可根据 getFileData(machineDrawValue) { - console.log(machineDrawValue, 88) this.hadFile = [] getFileData(machineDrawValue).then(res => { - console.log(res) if (res.data.length > 0) { res.data.map(item => { this.hadFile.push({ @@ -492,4 +490,5 @@ a{ line-height: 30px; display: inline-block; color: #999; -} +} + diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue index 7386ce0f..1064a5d0 100644 --- a/src/views/TechnologyCenter/QueryParts/index.vue +++ b/src/views/TechnologyCenter/QueryParts/index.vue @@ -30,6 +30,22 @@ 查询 + +
+
+
+
+
+
+
+
+
+
+
{{ file.name }}
 +
+
+
+