From da9a5636d89307f06b129e7c0251e40888f4d1c2 Mon Sep 17 00:00:00 2001 From: liushuai Date: Tue, 29 Jan 2019 15:06:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/request.js | 2 +- .../ImportParts/specificationData.vue | 1 - .../TechnologyCenter/QueryParts/index.vue | 1 + .../DepartmentBuyerRequestFund/index.vue | 27 +++++++++++-------- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index 554b1f2b..f997ba78 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -20,7 +20,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`, timeout: 1500000 // 请求超时时间 diff --git a/src/views/TechnologyCenter/ImportParts/specificationData.vue b/src/views/TechnologyCenter/ImportParts/specificationData.vue index a62636bd..32bf7368 100644 --- a/src/views/TechnologyCenter/ImportParts/specificationData.vue +++ b/src/views/TechnologyCenter/ImportParts/specificationData.vue @@ -122,7 +122,6 @@ :data="tableData10" :cell-class-name="cell" style="width: 100%" - height="440" size="mini" highlight-current-row border> diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue index 60b377d3..5c56c35e 100644 --- a/src/views/TechnologyCenter/QueryParts/index.vue +++ b/src/views/TechnologyCenter/QueryParts/index.vue @@ -131,6 +131,7 @@ border> diff --git a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue index afa3b525..97e20d1a 100644 --- a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue +++ b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue @@ -331,17 +331,22 @@ export default { this.searchTable1() }, requestFund(row) { // 请款 - const day1 = new Date() - const day2 = day1.getFullYear() + '-' + (day1.getMonth() + 1) + '-' + day1.getDate() - requestFund(row.采购合同流水号, row.本次应请款, day2, this.id).then(response => { - if (response.data[0].result === '1') { - this.$message.success('请款成功') - this.searchTable1() - this.startRequestDate = '' - this.endRequestDate = '' - this.tableData2 = [] - } else { this.$message.error('请款失败') } - }) + console.log(row.本次应请款) + if (row.本次应请款 !== '') { + const day1 = new Date() + const day2 = day1.getFullYear() + '-' + (day1.getMonth() + 1) + '-' + day1.getDate() + requestFund(row.采购合同流水号, row.本次应请款, day2, this.id).then(response => { + if (response.data[0].result === '1') { + this.$message.success('请款成功') + this.searchTable1() + this.startRequestDate = '' + this.endRequestDate = '' + this.tableData2 = [] + } else { this.$message.error('请款失败') } + }) + } else { + this.$message.warning('请输入金额') + } }, cancelRequestFund(row) { // 取消请款 console.log(row)