11

WXL

2023-11-10 4f46cedca8a80f5126aca46d6369cc592b91ef58

11

 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++;

 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("请选择算税后的数据进行合并计算");
        }

 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("请选择算税后的数据进行合并计算");
        }