From 51fb51efb43c29a6def7e32d541b552943af93b3 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Tue, 12 Nov 2019 17:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AF=B7=E6=AC=BE=E5=AE=A1?=
=?UTF-8?q?=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/PurchasingCenter/FundApproval.js | 6 +-
.../PurchasingCenter/FundApproval1/index.vue | 83 +++----------------
.../PurchaseContractRequestFund/index.vue | 1 -
3 files changed, 16 insertions(+), 74 deletions(-)
diff --git a/src/api/PurchasingCenter/FundApproval.js b/src/api/PurchasingCenter/FundApproval.js
index 5a696614..d334f78d 100644
--- a/src/api/PurchasingCenter/FundApproval.js
+++ b/src/api/PurchasingCenter/FundApproval.js
@@ -75,14 +75,14 @@ export function execApprovalOffline(num1, num2, reason, person, state) {
})
}
// 采购合同内容查询
-export function searchContactDetail(num) {
+export function searchContactDetail(check, num1, num2) {
return request({
url: '',
method: 'post',
data: {
type: '1',
- name: '采购管理_采购合同内容_查询数据',
- param: '采购合同流水号=' + num
+ name: '采购管理_采购合同内容_查询数据_合并后',
+ param: `check=${check}&采购合同流水号=${num1}&离线合同流水号=${num2}`
}
})
}
diff --git a/src/views/PurchasingCenter/FundApproval1/index.vue b/src/views/PurchasingCenter/FundApproval1/index.vue
index 9a3528c7..6327fb22 100644
--- a/src/views/PurchasingCenter/FundApproval1/index.vue
+++ b/src/views/PurchasingCenter/FundApproval1/index.vue
@@ -30,7 +30,7 @@
- {{ scope.row.采购合同编号 }}
+ {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
@@ -58,72 +58,11 @@
@current-change="handleCurrentChange1"/>
-
-
- 离线合同
-
-
-
- {{ scope.row.供应商名称 }}
-
-
-
-
- {{ scope.row.请款时间 }}
-
-
-
-
- {{ scope.row.姓名 }}
-
-
-
-
- {{ scope.row.请款金额 }}
-
-
-
-
-
-
-
-
-
- {{ scope.row.离线合同编号 }}
-
-
-
-
- {{ scope.row.请款金额 }}
-
-
-
- 查看详情
-
- 通过
- 不通过
-
-
-
-
-
-
-
- 采购合同
-
- 离线合同
+ 合同明细
-
+
- {{ scope.row.离线合同编号 }}
+ {{ scope.row.合同类型 === 1 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
@@ -131,7 +70,7 @@
{{ scope.row.物料名称 }}
-
+
{{ scope.row.物料规格 }}
@@ -158,7 +97,7 @@
- {{ scope.row.交货期要求 }}
+ {{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
@@ -205,8 +144,11 @@ export default {
},
methods: {
searchContactDetail(row) {
- searchContactDetail(row.采购合同流水号).then(response => {
- this.contractDetail1 = response.data[0].合同内容
+ var check
+ row.采购合同流水号 ? check = 1 : check = 2
+ searchContactDetail(check, row.采购合同流水号, row.离线合同流水号).then(response => {
+ this.contractDetail2 = response.data
+ // this.contractDetail1 = response.data[0].合同内容
})
},
searchOfflineContactDetail(row) { // 查询离线合同明细
@@ -241,7 +183,7 @@ export default {
},
fetchData() {
this.searchTable1()
- this.searchTable2()
+ // this.searchTable2()
},
searchTable1() {
initApproval(this.pageCurrent1, this.pageSize1, 0).then(response => {
@@ -310,6 +252,7 @@ export default {
execApproval(row.采购合同请款流水号, 2, value, this.id, 0).then(response => {
if (response.data[0].result === '1') {
this.$message.success('执行成功')
+ this.tableData2 = []
this.searchTable1()
} else { this.$message.error('执行失败') }
})
diff --git a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
index b6373f37..bb9dcd53 100644
--- a/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractRequestFund/index.vue
@@ -418,7 +418,6 @@ export default {
v.请款金额 = v.合同总额 - v.已付金额 - v.申请中金额
return v
})
- console.log(this.tableData01)
})
}
},