diff --git a/SC-web/src/views/basic/dynamicModel/list/detail/Item.vue b/SC-web/src/views/basic/dynamicModel/list/detail/Item.vue
index 035dd125..d9192428 100644
--- a/SC-web/src/views/basic/dynamicModel/list/detail/Item.vue
+++ b/SC-web/src/views/basic/dynamicModel/list/detail/Item.vue
@@ -226,7 +226,7 @@ export default {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
- return prev + curr;
+ return this.jnpf.floatAdd(prev,curr);
} else {
return prev;
}
@@ -239,4 +239,4 @@ export default {
}
}
}
-
\ No newline at end of file
+
diff --git a/SC-web/src/views/extend/order/Detail.vue b/SC-web/src/views/extend/order/Detail.vue
index 578dfc80..b6eab0bb 100644
--- a/SC-web/src/views/extend/order/Detail.vue
+++ b/SC-web/src/views/extend/order/Detail.vue
@@ -283,7 +283,7 @@ export default {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
- return prev + curr;
+ return this.jnpf.floatAdd(prev,curr);
} else {
return prev;
}
@@ -313,7 +313,7 @@ export default {
table thead{border-bottom:0!important;display:none;}
.el-table__body, tr td .cell{width:100%!important}
.el-table th.gutter{display: none;}
- .el-table colgroup.gutter{display: none;}
+ .el-table colgroup.gutter{display: none;}
`;
// 表单数据
let printForm = this.$refs.print1.innerHTML;
@@ -425,4 +425,4 @@ export default {
>>> .el-upload-list__item:first-child {
margin-top: 4px;
}
-
\ No newline at end of file
+
diff --git a/SC-web/src/views/scm/basicInformation/invoices/Detail.vue b/SC-web/src/views/scm/basicInformation/invoices/Detail.vue
index 9ca1859a..298fa7c0 100644
--- a/SC-web/src/views/scm/basicInformation/invoices/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/invoices/Detail.vue
@@ -223,7 +223,7 @@
-->
-
+
@@ -234,7 +234,7 @@
-->
-
+
@@ -250,7 +250,7 @@
-
+
@@ -258,7 +258,7 @@
-
+
@@ -501,7 +501,7 @@
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
- return prev + curr;
+ return this.jnpf.floatAdd(prev,curr);
} else {
return prev;
}
@@ -526,7 +526,7 @@
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
- return prev + curr;
+ return this.jnpf.floatAdd(prev,curr);
} else {
return prev;
}
diff --git a/SC-web/src/views/scm/basicInformation/invoices/Form.vue b/SC-web/src/views/scm/basicInformation/invoices/Form.vue
index 2cb2b862..94fdc708 100644
--- a/SC-web/src/views/scm/basicInformation/invoices/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/invoices/Form.vue
@@ -326,7 +326,7 @@
@@ -345,6 +345,7 @@
props: [],
data() {
return {
+ submitDisabled: false,
importFormVisible: false,
visible: false,
loading: false,
@@ -689,6 +690,7 @@
})
},
request() {
+ this.submitDisabled = true;
var _data = this.dataList()
if (!this.dataForm.id) {
request({
@@ -701,6 +703,7 @@
type: 'success',
duration: 1000,
onClose: () => {
+ this.submitDisabled = false;
this.visible = false
this.$emit('refresh', true)
}
@@ -717,6 +720,7 @@
type: 'success',
duration: 1000,
onClose: () => {
+ this.submitDisabled = false;
this.visible = false
this.$emit('refresh', true)
}
diff --git a/SC-web/src/views/scm/basicInformation/payment/Detail.vue b/SC-web/src/views/scm/basicInformation/payment/Detail.vue
index 87fe1508..b6fcdedc 100644
--- a/SC-web/src/views/scm/basicInformation/payment/Detail.vue
+++ b/SC-web/src/views/scm/basicInformation/payment/Detail.vue
@@ -381,7 +381,7 @@
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr);
if (!isNaN(value)) {
- return prev + curr;
+ return this.jnpf.floatAdd(prev,curr);
} else {
return prev;
}
diff --git a/SC-web/src/views/scm/basicInformation/payment/Form.vue b/SC-web/src/views/scm/basicInformation/payment/Form.vue
index 0103c2f8..fd4f61b3 100644
--- a/SC-web/src/views/scm/basicInformation/payment/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/payment/Form.vue
@@ -249,7 +249,7 @@
@@ -266,6 +266,7 @@
props: [],
data() {
return {
+ submitDisabled: false,
excludeFields: [],
visible: false,
loading: false,
@@ -458,6 +459,7 @@
})
},
request() {
+ this.submitDisabled = true;
var _data = this.dataList()
if (!this.dataForm.id) {
request({
@@ -470,6 +472,7 @@
type: 'success',
duration: 1000,
onClose: () => {
+ this.submitDisabled = false;
this.visible = false
this.$emit('refresh', true)
}
@@ -486,6 +489,7 @@
type: 'success',
duration: 1000,
onClose: () => {
+ this.submitDisabled = false;
this.visible = false
this.$emit('refresh', true)
}
diff --git a/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue b/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue
index a7d282c8..d590758f 100644
--- a/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/paymentdoc/Form.vue
@@ -208,7 +208,7 @@
-
+