From 7d5b85b23908e8170a2e22210aa0a6937f181dd6 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Mon, 11 Nov 2019 14:18:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8C=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CreateInquirySheet/index.vue | 16 +++++++-------
.../OfflineContract/index.vue | 21 +++++++++----------
2 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/src/views/PurchasingCenter/CreateInquirySheet/index.vue b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
index dbac4fd1..2ebc6e61 100644
--- a/src/views/PurchasingCenter/CreateInquirySheet/index.vue
+++ b/src/views/PurchasingCenter/CreateInquirySheet/index.vue
@@ -65,7 +65,7 @@
查询
导出未询价单
-
+
询价单
编辑
删除
-
- 打印
- 导出
-
+
+ 打印
+ 导出
+
保存
- 信息维护
+
@@ -763,7 +763,7 @@
-
+
GAOJING |
@@ -1905,6 +1905,7 @@ export default {
}).then(() => {
deleteInquirySheet(this.row1.询价单流水号).then(response => {
if (response.data[0].result === '1') {
+ this.row1 = ''
this.$message.success('删除成功')
this.inquirySheetNum = ''
this.supplierName = ''
@@ -1925,7 +1926,6 @@ export default {
},
editInquirySheet() { // 编辑询价单
if (this.row1 === '') {
- console.log(this.row1)
this.$message.error('请选择询价单')
} else {
if (this.$refs['form2'] !== undefined) {
diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 08e387d1..dc5b2bab 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -289,9 +289,8 @@
-
+
-
@@ -339,29 +338,29 @@
{{ scope.row.参考价格 }}
-
+
{{ (scope.row.单价 / (1 + taxRate)).toFixed(2) }}
-
+
-
+
{{ (scope.row.未税单价 * (1 + taxRate)).toFixed(2) }}
-
+
{{ hasTax==='未税' ? scope.row.未税总额 = (Number(scope.row.数量) * Number(scope.row.未税单价)).toFixed(2) : scope.row.未税总额 = (scope.row.含税总额 / (1+taxRate)).toFixed(2) }}
-
+
{{ hasTax==='含税' ? scope.row.含税总额 = (Number(scope.row.数量) * Number(scope.row.单价)).toFixed(2) : scope.row.含税总额 = (scope.row.未税总额 * (1+taxRate)).toFixed(2) }}
-
+
{{ scope.row.备注 || '—' }}
@@ -381,7 +380,7 @@
-
+
移除
@@ -1233,7 +1232,7 @@ export default {
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '总价'
- } else if (index === 9) {
+ } else if (index === 8) {
const values = data.map(item => Number(item['未税总额']))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {
@@ -1248,7 +1247,7 @@ export default {
} else {
sums[index] = 'N/A'
}
- } else if (index === 10) {
+ } else if (index === 9) {
const values = data.map(item => Number(item['含税总额']))
if (!values.every(value => isNaN(value))) {
sums[index] = values.reduce((prev, curr) => {