From 7ca8fbef232b9aedc4f43eb733d66a13b9ce3e22 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Sat, 14 Mar 2020 20:08:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=B7=E6=AC=BE=E5=AE=A1=E6=A0=B8=E5=AE=A1?=
=?UTF-8?q?=E6=89=B9=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../RequestApprovalQuery.js | 6 +-
.../ContractApprovalQuery/index.vue | 10 +++
.../RequestApprovalQuery/index.vue | 66 +++++++++++++++++--
3 files changed, 75 insertions(+), 7 deletions(-)
diff --git a/src/api/ManufacturingCenter/RequestApprovalQuery.js b/src/api/ManufacturingCenter/RequestApprovalQuery.js
index bba12053..6e9f60f8 100644
--- a/src/api/ManufacturingCenter/RequestApprovalQuery.js
+++ b/src/api/ManufacturingCenter/RequestApprovalQuery.js
@@ -30,7 +30,7 @@ export function searchTable1(radio, check1, supplier, check2, start, end, check3
}
})
}
-// 采购合同明细查询
+// 查询离线合同请款信息明细
export function searchTable2(num) {
return request({
url: '',
@@ -39,8 +39,8 @@ export function searchTable2(num) {
UserID: state.state.user.id,
ModularID: router.currentRoute.path,
type: '1',
- name: '采购管理_采购合同内容_查询数据',
- param: '采购合同流水号=' + num
+ name: '采购管理_采购合同_请款明细_查询数据',
+ param: `采购合同请款流水号=${num}`
}
})
}
diff --git a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
index 96389547..ae856b55 100644
--- a/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
+++ b/src/views/ManufacturingCenter/ContractApprovalQuery/index.vue
@@ -74,6 +74,15 @@
{{ scope.row.审核情况内容 }}
+
+
+
+
+ 详情
+
+
+
+
{
this.returns = response.data[0].合同内容
+ this.dialogFormVisible = true
})
},
handleSizeChange1(val) {
diff --git a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
index 2d5fea93..1a4e0788 100644
--- a/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
+++ b/src/views/ManufacturingCenter/RequestApprovalQuery/index.vue
@@ -25,6 +25,7 @@
通过
未过
查询
+ 导出
@@ -58,6 +59,15 @@
{{ scope.row.审核情况内容 }}
+
+
+
+
+ 详情
+
+
+
+
+
+
+
+
+
+ {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
+
+
+
+
+ {{ parseFloat(scope.row.到货金额).toFixed(2) }}
+
+
+
+
+ {{ parseFloat(scope.row.已付金额).toFixed(2) }}
+
+
+
+
+ {{ parseFloat(scope.row.请款金额).toFixed(2) }}
+
+
+
+
@@ -92,7 +127,7 @@ export default {
tableData1: [],
loading1: false,
dialogFormVisible: false,
- returns: ''
+ gridData1: []
}
},
computed: {
@@ -132,10 +167,33 @@ export default {
this.total1 = response.data.total
})
},
+ exportTable() {
+ var check1, check2, check3
+ this.billNames ? check1 = 1 : check1 = 0
+ this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
+ this.personValue ? check3 = 1 : check3 = 0
+ var param = []
+ param[0] = ['查询全部', this.radio]
+ param[1] = ['供应商名称_check', check1]
+ param[2] = ['供应商名称', this.billNames]
+ param[3] = ['时间段_check', check2]
+ if (check2 === 0) {
+ param[4] = ['开始时间', '']
+ param[5] = ['结束时间', '']
+ } else {
+ param[4] = ['开始时间', this.dateRange[0]]
+ param[5] = ['结束时间', this.dateRange[1]]
+ }
+ param[6] = ['人员编号_check', check3]
+ param[7] = ['人员编号', this.personValue]
+ var Data = this.CreateData('2001', '报表_采购管理_情况审核查询_查询数据', param)
+ this.exportExcel_NPOI(Data)
+ },
searchTable2(row) {
- this.contractValue = parseInt(row.采购合同流水号)
- searchTable2(this.contractValue).then(response => {
- this.returns = response.data[0].合同内容
+ this.gridData1 = []
+ searchTable2(row.采购合同请款流水号).then(response => {
+ this.gridData1 = response.data
+ this.dialogFormVisible = true
})
},
handleSizeChange1(val) {