diff --git a/src/utils/request.js b/src/utils/request.js index 629d2d97..558460f9 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -19,7 +19,7 @@ const service = axios.create({ // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`, // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`, - baseURL: `http://192.168.1.199:8411/submit/MESCommonBase.ashx`, + baseURL: `http://192.168.0.2: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/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index 6c5ecb89..8efdbfcb 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -203,8 +203,10 @@ icon="" style="margin-top:10px" @click="calculateContractSum">计算合同总额 - 合同总额: + 合同总额(未税): + 合同总额(含税): + @@ -364,6 +366,7 @@ export default { paramRow: '', // 参数row contractSum: 0, contractSum1: 0, + contractSum2: 0, deliveryDay: [], deliveryDay1: [], contractNumValue: '', @@ -515,6 +518,7 @@ export default { this.tableData4.push(this.groupNum2[i]) } this.contractSum = (this.contractSum + this.contractSum1).toFixed(2) + this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100 this.costAccount = this.contractSum if (parseInt(this.costAccount) === 0) { this.$message.error('成本核算不可为0') @@ -681,59 +685,6 @@ export default { }) } }, - // payMethodChange() { // 付款方式改变 - // for (let i = 0; i < this.payMethod.length; i++) { - // if (this.payMethod[i].value === this.payMethodValue) { - // this.payMethodName = this.payMethod[i].label - // } - // } - // const payTimeNum = this.payMethodName.split(':') - // switch (payTimeNum.length) { - // case 1: - // this.disable2 = true - // this.disable3 = true - // this.disable4 = true - // this.disable5 = true - // this.disable6 = true - // break - // case 2: - // this.disable2 = false - // this.disable3 = true - // this.disable4 = true - // this.disable5 = true - // this.disable6 = true - // break - // case 3: - // this.disable2 = false - // this.disable3 = false - // this.disable4 = true - // this.disable5 = true - // this.disable6 = true - // break - // case 4: - // this.disable2 = false - // this.disable3 = false - // this.disable4 = false - // this.disable5 = true - // this.disable6 = true - // break - // case 5: - // this.disable2 = false - // this.disable3 = false - // this.disable4 = false - // this.disable5 = false - // this.disable6 = true - // break - // case 6: - // this.disable2 = false - // this.disable3 = false - // this.disable4 = false - // this.disable5 = false - // this.disable6 = false - // break - // } - // this.fetchData() - // }, exportExcel() {} } } diff --git a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue index ea31c8b7..afa3b525 100644 --- a/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue +++ b/src/views/WorkshopProcurement/DepartmentBuyerRequestFund/index.vue @@ -75,7 +75,7 @@ @@ -207,7 +207,7 @@ @@ -314,6 +314,8 @@ export default { } } }) + response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100 + response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100 } this.tableData1 = response.data.rows this.total1 = response.data.total @@ -381,6 +383,8 @@ export default { } searchRequestTable(this.checkRequest, this.startRequestDate, this.endRequestDate).then(response => { for (let j = 0; j < response.data.length; j++) { + response.data[j].含税总金额 = parseInt(response.data[j].含税总金额 * 100) / 100 + response.data[j].欠款金额 = parseInt(response.data[j].欠款金额 * 100) / 100 if (response.data[j].请款时间 !== null) { response.data[j].请款时间 = response.data[j].请款时间.substring(0, response.data[j].请款时间.indexOf(' ')) } diff --git a/src/views/WorkshopProcurement/FundApproval2/index.vue b/src/views/WorkshopProcurement/FundApproval2/index.vue index e457a357..f18587cd 100644 --- a/src/views/WorkshopProcurement/FundApproval2/index.vue +++ b/src/views/WorkshopProcurement/FundApproval2/index.vue @@ -35,7 +35,7 @@ @@ -108,6 +108,10 @@ export default { }, searchTable() { initApproval1(this.pageCurrent, this.pageSize, 2).then(response => { + for (let j = 0; j < response.data.rows.length; j++) { + response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100 + response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100 + } this.tableData = response.data.rows this.total = response.data.total }) diff --git a/src/views/WorkshopProcurement/FundApproval3/index.vue b/src/views/WorkshopProcurement/FundApproval3/index.vue index 8fd7d5da..3a68d499 100644 --- a/src/views/WorkshopProcurement/FundApproval3/index.vue +++ b/src/views/WorkshopProcurement/FundApproval3/index.vue @@ -35,7 +35,7 @@ @@ -108,6 +108,10 @@ export default { }, searchTable() { initApproval1(this.pageCurrent, this.pageSize, 3).then(response => { + for (let j = 0; j < response.data.rows.length; j++) { + response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100 + response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100 + } this.tableData = response.data.rows this.total = response.data.total }) diff --git a/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue b/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue index 5fda01d6..791d6cb5 100644 --- a/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue +++ b/src/views/WorkshopProcurement/InvoiceStateSearch/index.vue @@ -182,7 +182,9 @@ export default { this.contractNum ? this.check1 = 1 : this.check1 = 0 this.supplierName ? this.check2 = 1 : this.check2 = 0 searchContractInvoice(this.pageCurrent1, this.pageSize1, this.check1, this.contractNum, this.check2, this.supplierName).then(response => { - console.log(response.data.rows) + for (let j = 0; j < response.data.rows.length; j++) { + response.data.rows[j].合同总金额 = parseInt(response.data.rows[j].合同总金额 * 100) / 100 + } this.tableData1 = response.data.rows this.total1 = response.data.total }) diff --git a/src/views/WorkshopProcurement/PayStateSearch/index.vue b/src/views/WorkshopProcurement/PayStateSearch/index.vue index 1cc8fffa..a9038ea0 100644 --- a/src/views/WorkshopProcurement/PayStateSearch/index.vue +++ b/src/views/WorkshopProcurement/PayStateSearch/index.vue @@ -56,7 +56,7 @@ @@ -66,7 +66,7 @@ @@ -74,7 +74,7 @@ @@ -141,6 +141,10 @@ export default { this.contractNumValue ? this.check1 = 1 : this.check1 = 0 this.supplierName ? this.check2 = 1 : this.check2 = 0 searchPayState(this.pageCurrent1, this.pageSize1, this.check1, this.contractNumValue, this.check2, this.supplierName).then(response => { + for (let j = 0; j < response.data.rows.length; j++) { + response.data.rows[j].含税总金额 = parseInt(response.data.rows[j].含税总金额 * 100) / 100 + response.data.rows[j].欠款金额 = parseInt(response.data.rows[j].欠款金额 * 100) / 100 + } this.tableData1 = response.data.rows this.total1 = response.data.total }) diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue index 001b77cf..9f6cdf48 100644 --- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue @@ -61,7 +61,7 @@ diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue index 387646eb..fde4c1e2 100644 --- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue +++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue @@ -70,7 +70,7 @@ diff --git a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue index 2d62fce3..e271072e 100644 --- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue +++ b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue @@ -17,7 +17,7 @@ @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询 - +