Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web

yxh

2024-04-22 3323c96f78bb09b1b2d435d863a593c9a099c269

Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web

 src/views/project/donationdetails/index.vue

@@ -2958,7 +2958,7 @@
          if (res.code == 200) {
            if (res.rows[0]) {
              this.transplantdata = res.rows;
              this.transplantdata.infoid = this.infoid;
              // this.transplantdata.infoid = this.infoid;
            } else {
              this.transplantdata = this.allocateddata;
              this.transplantdata = this.transplantdata.map(obj => {
@@ -3246,8 +3246,8 @@
                saveDonationwitnessorgan(this.procureddata).then(res => {
                  if (res == 200) {
                    this.$modal.msgSuccess("捐献器官获取信息保存成功！");
                    this.$modal.closeLoading();
                  }
                  this.$modal.closeLoading();
                });
              });
            } else {
@@ -3292,49 +3292,53 @@

            // 保存捐献器官移植信息
            // this.transplantdata.infoid = this.infoid;
            console.log(this.form);
            this.transplantdata.forEach(item => {
              listDonorchargeorgan({
                infoid: item.infoid,
                organno: item.organno
              }).then(res => {
                console.log("aaa");
                if (res.rows[0]) {
                  let objfn = res.rows[0];
                  console.log(objfn, "sass");
                  objfn.caseno = item.caseno;
                  objfn.hospitalno = item.hospitalno;
                  objfn.name = item.name;
                  objfn.receiveTime = item.transplanttime;
                  console.log(objfn, "sass");
                  updateDonorchargeorgan(objfn).then(res1 => {});
                } else {
                  item.id = null;
                  addDonorchargeorgan(item).then(res2 => {});
                }
              });
            });
            saveDonatecomporgan(this.transplantdata).then(res => {
              if (res == 200) {
                this.$modal.msgSuccess("捐献器官获取信息保存成功！");
              } else {
                this.$modal.msgSuccess(res.msg);
                return;
              }
            });
            // this.transplantdata.forEach(item => {
            //   listDonorchargeorgan({
            //     infoid: item.infoid,
            //     organno: item.organno
            //   }).then(res => {
            //     console.log("aaa");
            //     if (res.rows[0]) {
            //       let objfn = res.rows[0];
            //       console.log(objfn, "sass");
            //       objfn.caseno = item.caseno;
            //       objfn.hospitalno = item.hospitalno;
            //       objfn.name = item.name;
            //       objfn.receiveTime = item.transplanttime;
            //       console.log(objfn, "sass");
            //       updateDonorchargeorgan(objfn).then(res1 => {});
            //     } else {
            //       item.id = null;
            //       addDonorchargeorgan(item).then(res2 => {});
            //     }
            //   });
            // });

            console.log(this.accomplishform.id, "完成id");
            // 保存确认信息
            if (this.accomplishform.id) {
              updateDonatecompletioninfo(this.accomplishform).then(response => {
                this.$modal.msgSuccess("完成登记信息修改成功");
                this.$modal.closeLoading();
                saveDonatecomporgan(this.transplantdata).then(res => {
                  if (res == 200) {
                    this.$modal.msgSuccess("捐献器官登记信息保存成功！");
                  } else {
                    this.$modal.msgSuccess(res.msg);
                  }
                  this.$modal.closeLoading();
                });
              });
            } else {
              addDonatecompletioninfo(this.accomplishform).then(response => {
                this.$modal.msgSuccess("完成登记成功");
                saveDonatecomporgan(this.transplantdata).then(res => {
                  if (res.code == 200) {
                    this.$modal.msgSuccess("捐献器官登记信息保存成功！");
                  } else {
                    this.$modal.msgError(res.msg);
                  }
                  this.$modal.closeLoading();
                });
                this.istb = true;
                this.$modal.closeLoading();
                // this.$modal
                //   .confirm("案例已完成是否跳转案例费用页面进行费用单保存？")
                //   .then(() => {

 src/views/project/fund/performancedetails/index.vue

@@ -205,7 +205,7 @@
                ></el-cascader> -->
              </template>
            </el-table-column>
            <el-table-column
            <!-- <el-table-column
              prop="jxrq"
              align="center"
              label="绩效日期"
@@ -219,7 +219,7 @@
                >
                </el-date-picker>
              </template>
            </el-table-column>
            </el-table-column> -->
            <el-table-column
              prop="amount"
              align="center"
@@ -2831,19 +2831,19 @@
      var columnnames = [
        "applytype",
        "itemid",
        "jxrq",
        // "jxrq",
        "beneficiaryname",
        "idcardno",
        "depositbank",
        "bankcardno",
        "remark",
        "remark"
      ];
      columns.forEach((column, index) => {
        if (index === 0) {
          sums[index] = "合计";
          return;
        }
     

        //去除部分字段计算
        if (columnnames.indexOf(column.property) > -1) {
          return;