From c9a372cf482b0e76fd5407af721061a547f8e455 Mon Sep 17 00:00:00 2001 From: liushuai Date: Mon, 2 Dec 2019 12:03:33 +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/api/WorkshopProcurement/NewArrivalList.js | 8 +- .../OutsourcingMaterialsInvoice.js | 5 +- .../ManufacturingCenter/ParseQuery/index.vue | 1 + .../AccountingPrice/index.vue | 3 +- .../CreatingProcurementContracts/index.vue | 8 +- .../FundApproval2/index.vue | 116 +++++++++--------- .../InvoiceSettlementApplication1/index.vue | 2 +- .../NewArrivalList/index.vue | 86 ++++++++++--- .../OutsourcingMaterialsInvoice/index.vue | 113 +++-------------- 9 files changed, 152 insertions(+), 190 deletions(-) diff --git a/src/api/WorkshopProcurement/NewArrivalList.js b/src/api/WorkshopProcurement/NewArrivalList.js index cfca577d..3c169558 100644 --- a/src/api/WorkshopProcurement/NewArrivalList.js +++ b/src/api/WorkshopProcurement/NewArrivalList.js @@ -38,26 +38,26 @@ export function searchLxPurchaseOrder(pageCurrent, pageSize, check1, num, check2 }) } // 查询采购计划明细 -export function searchMateriel(num) { +export function searchMateriel(num, check, num1) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_采购计划明细_查询数据_未选入', - param: `供应商=${num}` + param: `供应商=${num}&零件图号_check=${check}&零件图号=${num1}` } }) } // 查询离线采购计划明细 -export function searchLxMateriel(num) { +export function searchLxMateriel(num, check, num1) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_离线采购计划明细_查询数据_未选入', - param: `供应商流水号=${num}` + param: `供应商流水号=${num}&零件图号_check=${check}&零件图号=${num1}` } }) } diff --git a/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js b/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js index 2fc72e8a..ad0fb557 100644 --- a/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js +++ b/src/api/WorkshopProcurement/OutsourcingMaterialsInvoice.js @@ -132,15 +132,14 @@ export function searchSupplier(check1, value1, check2, value2, check3, value3, c }) } // 查询到货单 -export function searchArriveOrder(num, num1, num2, num3, num5, pageCurrent, pageSize) { +export function searchArriveOrder(num, num1, num2, num3, num5) { return request({ url: '', method: 'post', data: { type: '1', name: '备料管理_到货单查询', - param: `供应商_check=${num}&供应商=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}`, - Pagination: pageCurrent + '&' + pageSize + param: `供应商_check=${num}&供应商=${num1}&开始日期_check=${num2}&开始日期=${num3}&结束日期=${num5}` } }) } diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue index 2fd1fcee..0b3206a5 100644 --- a/src/views/ManufacturingCenter/ParseQuery/index.vue +++ b/src/views/ManufacturingCenter/ParseQuery/index.vue @@ -1330,6 +1330,7 @@ diff --git a/src/views/WorkshopProcurement/AccountingPrice/index.vue b/src/views/WorkshopProcurement/AccountingPrice/index.vue index 7997c862..6337f64a 100644 --- a/src/views/WorkshopProcurement/AccountingPrice/index.vue +++ b/src/views/WorkshopProcurement/AccountingPrice/index.vue @@ -3,7 +3,7 @@ 合同号: - + {{ item.name }} - 查询 diff --git a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue index 5c5ca59f..2ad09f14 100644 --- a/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue +++ b/src/views/WorkshopProcurement/CreatingProcurementContracts/index.vue @@ -141,9 +141,9 @@ style="margin-top:10px" @click="calculateContractSum">计算合同总额 合同总额(未税): - - 合同总额(含税): + 合同总额(含税): + @@ -548,7 +548,7 @@ export default { this.tableData4.push(this.groupNum2[i]) } this.contractSum = (this.contractSum1).toFixed(2) - this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100 + this.contractSum2 = parseInt(this.contractSum * (1 - parseFloat(this.taxRate)) * 100) / 100 this.costAccount = this.contractSum if (parseInt(this.costAccount) === 0) { this.$message.error('成本核算不可为0') @@ -566,7 +566,7 @@ export default { } console.log(this.contractSum1, this.groupNum5, 898989) this.contractSum = (this.contractSum1).toFixed(2) - this.contractSum2 = parseInt(this.contractSum * (1 + parseFloat(this.taxRate)) * 100) / 100 + this.contractSum2 = parseInt(this.contractSum * (1 - parseFloat(this.taxRate)) * 100) / 100 this.costAccount = this.contractSum if (parseInt(this.costAccount) === 0) { this.$message.error('成本核算不可为0') diff --git a/src/views/WorkshopProcurement/FundApproval2/index.vue b/src/views/WorkshopProcurement/FundApproval2/index.vue index 9009e6b2..493825db 100644 --- a/src/views/WorkshopProcurement/FundApproval2/index.vue +++ b/src/views/WorkshopProcurement/FundApproval2/index.vue @@ -58,64 +58,64 @@ @current-change="handleCurrentChange"/> - -

离线合同

- - - - - - - - - - - - - - - - - -
- -
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

备料合同

diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue index ec70794f..78b9a42c 100644 --- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue +++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue @@ -254,7 +254,7 @@ 供应商： - + diff --git a/src/views/WorkshopProcurement/NewArrivalList/index.vue b/src/views/WorkshopProcurement/NewArrivalList/index.vue index cac9a7b6..082bf8b2 100644 --- a/src/views/WorkshopProcurement/NewArrivalList/index.vue +++ b/src/views/WorkshopProcurement/NewArrivalList/index.vue @@ -249,7 +249,15 @@ - + + 供应商 + + + + 到货单编号 + + + 计划类型 - - 供应商 - + + 零件图号 + - - 到货单编号 - + + 查询 -
+
@@ -302,8 +309,8 @@
- - + + - - - -
- -
关联到货单
@@ -337,9 +266,6 @@ export default { pageCurrent1: 1, pageSize1: 30, total1: 0, - pageCurrent4: 1, - pageSize4: 10, - total4: 0, tableData1: [], tableData01: [], tableData4: [], @@ -436,20 +362,10 @@ export default { console.log(this.Name) this.Name ? this.check = 1 : this.check = 0 this.dateRange ? this.check1 = 1 : (this.check1 = 0, this.dateRange = '') - searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1], this.pageCurrent4, this.pageSize4).then(response => { - this.tableData4 = response.data.rows - this.total4 = response.data.total + searchArriveOrder(this.check, this.Name, this.check1, this.dateRange[0], this.dateRange[1]).then(response => { + this.tableData4 = response.data }) }, - handleSizeChange4(val) { // 采购单列表分页 - this.pageSize4 = val - this.pageCurrent4 = 1 - this.searchTable4() - }, - handleCurrentChange4(val) { // 采购单列表分页 - this.pageCurrent4 = val - this.searchTable4() - }, searchTable02(row) { // 查看详情（发票包含的合同） this.发票流水号 = row.发票流水号 searchInvoiceDetail(this.发票流水号).then(response => { @@ -461,6 +377,7 @@ export default { this.$refs['form1'].resetFields() } this.title1 = '新增备料发票' + this.tableData4 = [] this.dialogVisible1 = true console.log(this.supplierNames) this.form1.supplierNameValue = ''