From 1f336d7026d2fc4cee2d7f9037e4d20705706199 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Thu, 17 Oct 2019 16:40:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AF=A2=E4=BB=B7=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/CreateInquirySheet.js | 4 +-- src/utils/request.js | 6 ++-- .../CreateInquirySheet/index.vue | 31 ++++++++++++++++--- 3 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index 80ae3e6b..a3efe934 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -76,14 +76,14 @@ export function getExport2(num) { }) } // 查询分配后的标准件和外购件 -export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7) { +export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val7, val8, val9, val10) { return request({ url: '', method: 'post', data: { type: '1', name: 'xqs_采购管理_采购部采购_查询物料_分配后_带库存', - param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}`, + param: `物料状态编号=${num1}&物料名称_check=${check1}&物料名称=${val1}&物料规格_check=${check2}&物料规格=${val2}&物料型号_check=${check3}&物料型号=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&零件类型=${val7}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/utils/request.js b/src/utils/request.js index 7218f9b2..56ffd77d 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,8 +16,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.110:8002/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 -export const ExcelDownLoad = 'http://192.168.0.110:8002/submit/downloadFile.ashx' // 导出excel +export const url = `http://192.168.1.231:8411/submit/MESCommonBase.ashx` // 采购件入库、离线件入库 +export const ExcelDownLoad = 'http://192.168.1.231:8411/submit/downloadFile.ashx' // 导出excel // 技术中心程序发布时要更改下面所有的IP到0段 export const ServerIP = `http://192.168.1.231:8411/webpage/file/` @@ -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/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue index a13838cf..3d1175d8 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -72,11 +72,29 @@ 物料变更: - + 物料规格: 物料型号: + + + 开始时间: + + 结束时间: + 查询 导出未询价物料清单 @@ -90,7 +108,7 @@ 确定 - 调整采购任务 + 调整采购任务 @@ -291,7 +309,7 @@ 确定 - 调整采购任务 + 调整采购任务 @@ -895,6 +913,8 @@ export default { name: '', // 创建询价单 data() { return { + startTime: '', + endTime: '', 标准件和外购件流水号: [], 基本件流水号: [], visible: false, @@ -1488,14 +1508,15 @@ export default { return row['供货商'].trim() === value }, searchTable11() { // 查询外购件列表 - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3, check4, check5, check6, check7 this.materialName ? check1 = 1 : check1 = 0 this.materialSpec ? check2 = 1 : check2 = 0 this.materialModel ? check3 = 1 : check3 = 0 this.projectValue ? check4 = 1 : check4 = 0 this.machineValue ? check5 = 1 : check5 = 0 this.groupValue ? check6 = 1 : check6 = 0 - searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2).then(response => { + this.startTime && this.endTime ? check7 = 1 : check7 = 0 + searchMaterial(this.pageCurrent11, this.pageSize11, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.materialName, check2, this.materialSpec, check3, this.materialModel, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, 2, check7, this.startTime, this.endTime).then(response => { this.tableData11 = response.data.rows this.total11 = response.data.total const remark = []