From 4f46cedca8a80f5126aca46d6369cc592b91ef58 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 10 十一月 2023 16:04:19 +0800
Subject: [PATCH] 11
---
src/views/project/donationdetails/index.vue | 7 ++++++-
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue | 13 +++++++++----
src/views/project/fundcheck/expertFeeCheck/index.vue | 37 +++++++++++++++++++++++--------------
3 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 1696702..1b94a5a 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -2352,7 +2352,7 @@
infoid: null
},
affirmform: {
- infoid: null,
+ infoid: null
},
ethicform: {
infoid: null
@@ -3034,6 +3034,11 @@
console.log(this.form.workflow);
console.log(this.actives);
if (this.form.workflow == this.actives) {
+ if (this.actives <= 6) {
+ this.actives++;
+ } else {
+ console.log("宸插埌杈炬渶澶у��");
+ }
if (this.form.workflow <= 6) {
} else {
this.form.workflow++;
diff --git a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
index aebe8e1..18fb8ab 100644
--- a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -1360,23 +1360,28 @@
if (tot == 0) {
TotalcalculationFn(bojite).then(row => {
console.log(row.msg);
- if ((row.code = 200)) {
+ if (row.code == 200) {
this.$modal.msgSuccess(row.msg);
} else {
+ console.log(123);
this.$modal.msgError(row.msg);
}
- });
+ }).catch(error => {
+ this.$modal.msgError(error);
+});
} else {
console.log(this.overallidsvalue);
const hasValue = this.overallidsvalue.every(obj => obj.istax == 1);
if (hasValue) {
TotalcalculationFn(bojite).then(row => {
- if ((row.code = 200)) {
+ if (row.code == 200) {
this.$modal.msgSuccess(row.msg);
} else {
this.$modal.msgError(row.msg);
}
- });
+ }).catch(error => {
+ this.$modal.msgError(error);
+});
} else {
this.$modal.msgError("璇烽�夋嫨绠楃◣鍚庣殑鏁版嵁杩涜鍚堝苟璁＄畻");
}
diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index 555b24f..c1215b4 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -1368,23 +1368,32 @@
isTaxAfter: tot
};
if (tot == 0) {
- TotalcalculationFn(bojite).then(row => {
- if ((row.code = 200)) {
- this.$modal.msgSuccess(row.msg);
- } else {
- this.$modal.msgError(row.msg);
- }
- });
+ TotalcalculationFn(bojite)
+ .then(row => {
+ if (row.code == 200) {
+ this.$modal.msgSuccess(row.msg);
+ } else {
+ console.log(123);
+ this.$modal.msgError(row.msg);
+ }
+ })
+ .catch(error => {
+ this.$modal.msgError(error);
+ });
} else {
const hasValue = this.overallidsvalue.every(obj => obj.istax == 1);
if (hasValue) {
- TotalcalculationFn(bojite).then(row => {
- if ((row.code = 200)) {
- this.$modal.msgSuccess(row.msg);
- } else {
- this.$modal.msgError(row.msg);
- }
- });
+ TotalcalculationFn(bojite)
+ .then(row => {
+ if (row.code == 200) {
+ this.$modal.msgSuccess(row.msg);
+ } else {
+ this.$modal.msgError(row.msg);
+ }
+ })
+ .catch(error => {
+ this.$modal.msgError(error);
+ });
} else {
this.$modal.msgError("璇烽�夋嫨绠楃◣鍚庣殑鏁版嵁杩涜鍚堝苟璁＄畻");
}
--
Gitblit v1.9.3