From 7d596b08f7a844aa2dd8a476267cbcab08538042 Mon Sep 17 00:00:00 2001 From: zhangdingyu <974548713@qq.com> Date: Fri, 18 Oct 2019 14:13:01 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E8=AF=A2=E4=BB=B7?= =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchasingCenter/CreateInquirySheet.js | 4 +- src/utils/request.js | 2 +- .../CreateInquirySheet/index.vue | 43 +++++++++++-------- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/src/api/PurchasingCenter/CreateInquirySheet.js b/src/api/PurchasingCenter/CreateInquirySheet.js index a3efe934..ab95d0a1 100644 --- a/src/api/PurchasingCenter/CreateInquirySheet.js +++ b/src/api/PurchasingCenter/CreateInquirySheet.js @@ -89,14 +89,14 @@ export function searchMaterial(pageCurrent, pageSize, num1, check1, val1, check2 }) } // 查询分配后的基本件 -export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6) { +export function searchPart(pageCurrent, pageSize, num1, check1, val1, check2, val2, check3, val3, person, check4, val4, check5, val5, check6, val6, val8, val9, val10) { return request({ url: '', method: 'post', data: { type: '1', name: '采购管理_采购部采购_查询物料_基本件_分配后', - param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}`, + param: `物料状态编号=${num1}&零件图号_check=${check1}&零件图号=${val1}&零件名称_check=${check2}&零件名称=${val2}&零件规格_check=${check3}&零件规格=${val3}&人员编号=${person}&项目流水号_check=${check4}&项目流水号=${val4}&机床流水号_check=${check5}&机床流水号=${val5}&组件流水号_check=${check6}&组件流水号=${val6}&时间_check=${val8}&开始时间=${val9}&结束时间=${val10}`, Pagination: pageCurrent + '&' + pageSize } }) diff --git a/src/utils/request.js b/src/utils/request.js index 56ffd77d..e9cf8a39 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -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.1.231:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.110:8002/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 3d1175d8..e25ae23e 100644 --- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue +++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue @@ -77,24 +77,18 @@ 物料型号: - - - 开始时间: + 时间段: - 结束时间: - + format="yyyy-MM-dd" + range-separator="～" + style="width:250px" + start-placeholder="开始日期" + end-placeholder="结束日期"/> 查询 导出未询价物料清单 @@ -296,6 +290,18 @@ 零件规格: + 时间段: + 查询 导出未询价物料清单 @@ -1515,8 +1521,8 @@ export default { this.projectValue ? check4 = 1 : check4 = 0 this.machineValue ? check5 = 1 : check5 = 0 this.groupValue ? check6 = 1 : check6 = 0 - 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.startTime ? check7 = 1 : (check7 = 0, this.startTime = '') + 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[0], this.startTime[1]).then(response => { this.tableData11 = response.data.rows this.total11 = response.data.total const remark = [] @@ -1547,14 +1553,15 @@ export default { this.searchTable11() }, searchTable12() { // 查询基本件列表 - let check1, check2, check3, check4, check5, check6 + let check1, check2, check3, check4, check5, check6, check7 this.partNum ? check1 = 1 : check1 = 0 this.partName ? check2 = 1 : check2 = 0 this.partSpec ? check3 = 1 : check3 = 0 this.projectValue ? check4 = 1 : check4 = 0 this.machineValue ? check5 = 1 : check5 = 0 this.groupValue ? check6 = 1 : check6 = 0 - searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue).then(response => { + this.endTime ? check7 = 1 : (check7 = 0, this.endTime = '') + searchPart(this.pageCurrent12, this.pageSize12, this.materialStatusValue[this.materialStatusValue.length - 1], check1, this.partNum, check2, this.partName, check3, this.partSpec, this.id, check4, this.projectValue, check5, this.machineValue, check6, this.groupValue, check7, this.endTime[0], this.endTime[1]).then(response => { this.tableData12 = response.data.rows this.total12 = response.data.total const remark = [] From 9465d88afca25a94221c7d8374b2661296f15bbf Mon Sep 17 00:00:00 2001 From: liushuai Date: Fri, 18 Oct 2019 14:16:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateWarehousePurchasing/index.vue | 53 ------------------- 1 file changed, 53 deletions(-) diff --git a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue index 3b1930b1..c3a12a48 100644 --- a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue +++ b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue @@ -19,17 +19,6 @@ :label="item.label" :value="item.value"/> -<<<<<<< HEAD -======= - 采购状态: - - - ->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe {{ scope.row.安全库存量 }} -<<<<<<< HEAD -======= ->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe
采购明细表名称: -<<<<<<< HEAD -======= - ->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe -<<<<<<< HEAD -======= ->>>>>>> 1989b23ce9441b6cb0f51500157bd7419f830ebe