yxh

yxh

2024-01-04 415969d7e150018536783838fcf8f36901b5a752

yxh

 src/api/project/donorcharge.js

@@ -103,4 +103,14 @@
    method: 'get',
    params: query
  })
}


//新增或修改捐献器官分配
export function saveDonorchargeorgan(data) {
  return request({
    url: '/project/donorchargeorgan/saveOrUpdateDonorchargeorgan',
    method: 'post',
    data: data
  })
}

 src/views/project/donorcharge/donorcharge/index.vue

@@ -1,7 +1,6 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">

      <el-form-item label="捐献姓名" prop="name">
        <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable size="small"
          @keyup.enter.native="handleQuery" />
@@ -208,7 +207,7 @@

<script>
import { listDonatebaseinfo } from "@/api/project/donatebaseinfo";
import { listDonorcharge, getDonorcharge, delDonorcharge, addDonorcharge, updateDonorcharge, exportDonorcharge, listDonorchargeorgan, getDonorchargeorgan, delDonorchargeorgan, addDonorchargeorgan, updateDonorchargeorgan, exportDonorchargeorgan } from "@/api/project/donorcharge";
import { listDonorcharge, getDonorcharge, delDonorcharge, addDonorcharge, updateDonorcharge, exportDonorcharge, listDonorchargeorgan, delDonorchargeorgan, addDonorchargeorgan, updateDonorchargeorgan, exportDonorchargeorgan } from "@/api/project/donorcharge";
export default {
  name: "Donorcharge",
  data() {
@@ -362,15 +361,21 @@
      }
      else {
        //获取捐献案例列表
        if (this.donorlist.length>0) { }
        if (this.donorlist.length > 0) { }
        else {
          this.loading = true;
          listDonatebaseinfo(this.donorParams).then(res => {
            this.donorinfolist = res.rows;
            this.donorinfolist.forEach(item => {
            res.rows.map(item => {
              if (item.workflow == 6) {
                this.donorinfolist.push(item);
              }
            });

            this.donorinfolist.forEach(item1 => {
              this.donorlist.push({
                donorid: item.id,
                donorname: item.name
                donorid: item1.id,
                donorname: item1.name
              });
            });
            this.loading = false;

 src/views/project/donorcharge/donorchargedetail/index.vue

@@ -103,9 +103,9 @@
                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="移植时间">
                </el-date-picker> </template>
            </el-table-column>
            <el-table-column prop="remark" align="center" label="备注">
            <el-table-column prop="organchargedesc" align="center" label="备注">
              <template slot-scope="scope">
                <el-input v-model="scope.row.remark" placeholder="备注" />
                <el-input v-model="scope.row.organchargedesc" placeholder="备注" />
              </template>
            </el-table-column>
          </el-table>
@@ -232,8 +232,8 @@
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { regionDataPlus, CodeToText } from "element-china-area-data";
import { getDonorcharge, addDonorcharge, updateDonorcharge, listDonorchargeorgan, getDonorchargeorgan, delDonorchargeorgan, addDonorchargeorgan, updateDonorchargeorgan, exportDonorchargeorgan } from "@/api/project/donorcharge";
import { listDonatebaseinfo } from "@/api/project/donatebaseinfo";
import { getDonorcharge, addDonorcharge, updateDonorcharge } from "@/api/project/donorcharge";
import { listDonorchargeorgan, delDonorchargeorgan, saveDonorchargeorgan } from "@/api/project/donorcharge";
import { listDonatecomporgan } from "@/api/project/donatecompletioninfo";
import { listOrgancharge } from "@/api/project/organcharge";
import Li_area_select from "@/components/Address";
@@ -321,6 +321,8 @@
      userprofile: {},
      // 表单参数
      form: {},
      // 列表参数
      table: {},
      reimbursementList: [],

      // 表单校验
@@ -396,7 +398,7 @@
      this.$refs["table"].doLayout();
    });
  },
  

  destroyed() {
    window.removeEventListener("beforeunload", e => this.beforeunloadFn(e));
  }, //生命周期 - 销毁完成
@@ -663,7 +665,7 @@
      this.operationType = this.$route.query.operation;
      this.curId = this.$route.query.id;
      this.curCase = this.$route.query.data;
      console.log("this.$route.query",this.$route.query);
      console.log("this.$route.query", this.$route.query);

      if (this.operationType == "add") {
        this.title = "新建案例器官费用表";
@@ -764,15 +766,17 @@
    handleUpdate() {
      this.reset();
      this.open = true;
      this.title = "修改捐献案例器官费用表";

      getDonorcharge(this.curId).then(response => {
        this.form = response.data;
        this.open = true;
        this.title = "修改捐献案例器官费用表";
        console.log("getDonorcharge", response);

        //器官费用信息
        this.organParams.donorchargeid = this.curId;
          console.log("this.organParams", this.organParams);
        listDonorchargeorgan(this.organParams).then(res => {
          console.log("listDonorchargeorgan", res);
          this.donorchargeorgans = res.rows;
          if (this.donorchargeorgans.length > 0) {
          } else {
@@ -809,19 +813,35 @@
      this.$refs["form"].validate(valid => {
        if (valid) {
          if (this.form.id != null) {
            updateDonorcharge(this.form).then(response => {
              if (response.code == 200) {
                this.$modal.msgSuccess("保存成功！");
            for (let k = 0; k < this.donorchargeorgans.length; k++) {
              this.donorchargeorgans[k].donorchargeID = this.form.id;
            }

            updateDonorcharge(this.form).then(res1 => {
              if (res1.code == 200) {
                saveDonorchargeorgan(this.donorchargeorgans).then(res2 => {
                  if (res2.code == 200) {
                    this.$modal.msgSuccess("保存成功！");
                    this.open = false;
                  }
                });
              }
              this.open = false;
            });
          } else {
            addDonorcharge(this.form).then(response => {
              if (response.code == 200) {
                console.log(response);
                this.$modal.msgSuccess("保存成功！");
                console.log("addDonorcharge", response);
                //保存前校验数据
                for (let k = 0; k < this.donorchargeorgans.length; k++) {
                  this.donorchargeorgans[k].donorchargeid = response.data.id;
                }
                saveDonorchargeorgan(this.donorchargeorgans).then(res2 => {
                  if (res2.code == 200) {
                    this.$modal.msgSuccess("保存成功！");
                    this.open = false;
                  }
                });
              }
              this.open = false;
            });
          }
        }

 src/views/project/externalperson/index.vue

@@ -73,7 +73,7 @@
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
            v-hasPermi="['project:externalperson:edit']">修改</el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
            v-hasPermi="['project:externalperson:remove']">删除</el-button>
            >删除</el-button>
        </template>
      </el-table-column>
    </el-table>

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

@@ -1200,11 +1200,8 @@
      this.reset();

      getFund(this.curId).then(response => {
        console.log(response.data, "初始");

        this.form = response.data;
        sessionStorage.removeItem("apiform");

        sessionStorage.setItem("apiform", JSON.stringify(this.form));

        // this.form.recordstate =-1;
@@ -1252,8 +1249,6 @@
      this.reset();

      getFund(this.curId).then(response => {
        console.log(response.data, "初始");

        this.form = response.data;
        sessionStorage.removeItem("apiform");
        sessionStorage.setItem("apiform", JSON.stringify(this.form));
@@ -1263,7 +1258,7 @@
        //业务明细
        getownFundDetail(this.curId).then(res => {
          this.rbDetails = res.data;
          console.log("this.feeBlocks", this.feeBlocks);
          
          for (let m = 0; m < this.rbDetails.length; m++) {
            this.rbDetails[m].itemlist = [];
            this.getRowFeeItems(m, this.rbDetails[m]);
@@ -1271,10 +1266,6 @@
            //获取费用项目的详细信息
            this.rbDetails[m].rowfeeblocks = this.feeBlocks.filter(
              r => r.itemid == this.rbDetails[m].itemid
            );
            console.log(
              "this.rbDetails[m].rowfeeblocks",
              this.rbDetails[m].rowfeeblocks
            );
          }

@@ -1300,10 +1291,8 @@
      this.reset();

      getFund(this.curId).then(response => {
        console.log(response.data, "初始");
        this.form = response.data;
        sessionStorage.removeItem("apiform");

        sessionStorage.setItem("apiform", JSON.stringify(this.form));

        //附件处理
@@ -1454,22 +1443,6 @@
              return;
            }

            /*
            if (
              tempDetail.idcardno == null &&
              this.businessType != "3" &&
              this.businessType != "4"
            ) {
              console.log(1122);
              this.$modal.msgWarning(
                "服务项目表中，第" +
                  (k + 1).toString() +
                  "行的身份证未完善，请先填写身份证后再提交保存！"
              );
              return;
            }
            */

            if (this.businessType == "1") {
              if (tempDetail.servicesscope == null) {
                this.$modal.msgWarning(
@@ -1614,8 +1587,6 @@
          sessionStorage.setItem("apiform", JSON.stringify(this.form));
          addorupdateFund(this.form)
            .then(response => {
              console.log(this.form);
              console.log(response, "保存返参");
              if (response.code === 200) {
                if (this.form.id) {
                  this.$modal.msgSuccess("申请单修改成功！");
@@ -1650,29 +1621,15 @@
      });
    }, 500),

    //审批提交
    // checksubmit() {
    //   console.log(this.checkObj.flowlevelone);
    //   if (
    //     this.form.checkstatus != 3 &&
    //     this.userprofile.nickName == "陈慕华" &&
    //     this.checkObj.flowlevelone == 1
    //   ) {
    //     this.$modal.msgError("请选确认材料状态已收到！");
    //     return;
    //   }
    //   this.Savenow();
    //   console.log("保存并审批");
    // },
    checksubmit() {
      console.log(this.checkObj.flowlevelone);
      //检查是否收到纸质材料
      if (this.checkObj.flowlevelone == 2 && !this.checkObj.flowconclusion && this.checkObj.flowconclusion.trim() != "") {
        this.$modal.msgError("请输入审核不通过的说明信息，方便经办人修改申请单！");
        return;
      if (this.checkObj.flowlevelone == 2) {
        if (!this.checkObj.flowconclusion) {
          this.$modal.msgError("请输入审核不通过的说明信息，方便经办人修改申请单！");
          return;
        }
      }
      else {

      else if (this.checkObj.flowlevelone == 2) {
        if (this.userprofile.nickName == "陈慕华") {
          //检查是否收到纸质材料
          if (this.form.checkstatus != 3 && this.checkObj.flowlevelone == 1) {
@@ -1681,17 +1638,15 @@
          }

          //检查个税计算
          // if ( (this.form.applytype == "1" || this.form.applytype == "2") && this.form.fundtaxtime == null ) {
          //   this.$modal.msgError(
          //     "提交专家费用申请单、伦理专家申请费用申请单审核，需要先完成个税计算！"
          //   );
          //   return;
          // }
          if (this.form.applytype == "1" && this.form.fundtaxtime == null) {
            this.$modal.msgError("提交专家费用申请单审核，需要先完成个税计算！");
            return;
          }
        }
      }
      else {
        this.$modal.msgError("请先选择审批结果再提交！");
        return;
      }

      this.Savenow();
@@ -1708,7 +1663,6 @@
    getUserProfile() {
      getUserProfile().then(res => {
        this.userprofile = res.data;
        console.log(this.userprofile);
        this.standardlevel = res.data.standardlevel;
        if (
          this.userprofile.userName == "admin" ||
@@ -1764,29 +1718,6 @@
            });
          }
        }

        /** 
        for (let j = 0; j < this.accountlist.length; j++) {
          //单位账号列表
          if (this.accountlist[j].usertype == "org") {
            this.feeAccountList.push({
              id: this.accountlist[j].id,
              reportNo: this.accountlist[j].userno,
              reportName: this.accountlist[j].username,
              depositbank: this.accountlist[j].depositbank,
              branchbankname: this.accountlist[j].branchbankname,
              bankcardno: this.accountlist[j].bankcardno
            });
          }
          //专家账号列表
          else if (res.rows[j].usertype == "expert") {
            this.expertAccountList.push({
              expertNo: this.accountlist[j].id,
              exportName: this.accountlist[j].username+"("+this.accountlist[j].id+")"
            });
          }
        }
        */
      });
    },

@@ -1794,7 +1725,7 @@
    getUserAccount() {
      this.accountlist.map(res => {
        if (res.username == this.form.username) {
          this.form.bankname = res.depositbank; //res.branchbankname、res.depositbank;
          this.form.bankname = res.depositbank;
          this.form.bankcardno = res.bankcardno;
          this.form.phone = res.telephone;
        }
@@ -1806,7 +1737,6 @@
      listOrganization(3).then(response => {
        for (let i = 0; i < response.rows.length; i++) {
          this.unitList.push({
            //organizationid: response.rows[i].organizationid,
            organizationid: response.rows[i].id,
            organizationname: response.rows[i].organizationname
          });
@@ -1864,8 +1794,7 @@

    //获取服务项目
    getRowFeeItems(rowindex, row) {
      let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);
      console.log(list[0]);
      let list = this.feeItemTypes.filter(r => r.itemType == row.applytype);      
      row.itemlist = list[0].itemDetails;
      this.$set(this.rbDetails, rowindex, row);
    },
@@ -1887,22 +1816,11 @@
            row.amount = 0.0;
            row.taxamount = 0.0;
            row.taxedamount = item.expense;

            //计算税前金额
            // this.calculateTax(row, "B");
          } else {
            row.amount = item.expense;
            row.taxamount = 0.0;
            row.taxedamount = 0.0;

            //计算税后金额
            // this.calculateTax(row, "A");
          }

          // this.form.serviceFunddetails = 0;
          // this.rbDetails.map(item => {
          //   this.form.serviceFunddetails += item.amount;
          // });
        }
      });
    },
@@ -1994,7 +1912,6 @@
        }
        targetValue += parseFloat(this.rbDetails[i].amount); // 假设每个对象中的特定值存储在'specificValue'属性下
      }
      console.log(targetValue, "合计");
      this.form.pretaxcost = targetValue;
    },

@@ -2246,7 +2163,6 @@
    // 手动计算
    Manualcalculationfn() {
      ManualCalculation(this.rbDetails).then(res => {
        console.log(res);
        if (res.code == 200) {
          sessionStorage.removeItem("apiform");
          sessionStorage.removeItem("apifunddetail");
@@ -2559,8 +2475,6 @@
    uploadSccess(response, file, fileList) {
      this.rbDetails;
      //获取票据信息位置
      console.log(response);
      console.log(file);
      if (this.activeName == 1) {
        if (response.code == 200) {
          // this.form.filename = file.raw.name;
@@ -2573,7 +2487,6 @@
          this.pdfimgsrcList.push(
            this.Networkheader + "/prod-api" + response.fileName
          );
          console.log(this.pdfimgsrcList);
          this.pdftitle = "共" + this.pdfimgsrcList.length + "项";
          this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
          this.rbDetails[this.atpresent].annexfilesList = this.fileListto;
@@ -2582,7 +2495,6 @@
        }
      } else {
        if (response.code == 200) {
          // this.form.filename = file.raw.name;
          this.previewpdf = true;
          this.$modal.msgSuccess(response.msg);
          this.invoicefileListto.push({
@@ -2592,15 +2504,12 @@
          this.invoicepdfimgsrcList.push(
            this.Networkheader + "/prod-api" + response.fileName
          );
          console.log(this.invoicepdfimgsrcList);
          this.pdftitle = "共" + this.invoicepdfimgsrcList.length + "项";
          this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
          this.rbDetails[
            this.atpresent
          ].invoicefilesList = this.invoicefileListto;
          console.log(this.rbDetails[this.atpresent]);
        } else {
          console.log(response.msg);
        }
      }
    },
@@ -2615,11 +2524,9 @@
      this.tableDatatop.push(row);
      this.atpresent = index;
      this.pdfVisible = true;
      console.log(this.rbDetails[index]);
      if (this.rbDetails[index].annexfilesList) {
        this.previewpdf = true;
        this.fileListto = this.rbDetails[index].annexfilesList;
        console.log(this.fileListto);
        this.pdfimg = this.Networkheader + "/prod-api" + this.fileListto[0].url;
        this.fileListto.forEach(item => {
          this.pdfimgsrcList.push(this.Networkheader + "/prod-api" + item.url);
@@ -2633,7 +2540,6 @@
      if (this.rbDetails[index].invoicefilesList) {
        this.previewpdf = true;
        this.invoicefileListto = this.rbDetails[index].invoicefilesList;
        console.log(this.invoicefileListto);
        this.invoicepdfimg =
          this.Networkheader + "/prod-api" + this.invoicefileListto[0].url;
        this.invoicefileListto.forEach(item => {
@@ -2641,8 +2547,6 @@
            this.Networkheader + "/prod-api" + item.url
          );
        });
        console.log(this.invoicepdfimgsrcList);
        console.log(this.invoicepdfimg);
      } else {
        this.invoicefileListto = [];
        this.invoicepdfimg = "";
@@ -2659,7 +2563,6 @@
    // 点击已上传文件
    downFile(item) {
      if (this.activeName == 1) {
        console.log(item, "点击文件拿item");
        this.pdftitle =
          "共" + this.pdfimgsrcList.length + "项，当前选中" + item.name;
        let name = item.name.split(".");
@@ -2680,7 +2583,6 @@
          this.previewpdf = false;
        }
      } else {
        console.log(item, "点击文件拿item");
        this.pdftitle =
          "共" + this.invoicepdfimgsrcList.length + "项，当前选中" + item.name;
        let name = item.name.split(".");
@@ -2692,8 +2594,6 @@
          this.previewpdf = true;
          if (item.url) {
            this.invoicepdfimg = this.Networkheader + "/prod-api" + item.url;
            console.log(this.invoicepdfimg, "pdfimg");
            console.log(this.invoicepdfimgsrcList, "imglist");
          } else {
            this.invoicepdfimg =
              this.Networkheader + "/prod-api" + item.response.url;
@@ -2748,8 +2648,7 @@
        this.invoicefileListto.splice(index - 1, 0, item); // 将item插入到索引位置的前一位
      }
    },
    Downloadfile(row) {
      console.log(row);
    Downloadfile(row) {      
      window.location.href = this.Networkheader + "/prod-api" + row.url;
    },

@@ -2783,7 +2682,6 @@
        this.accountselectform.expertunitname = scope.row.unitname;
        this.accountselectform.expertunitno = scope.row.unitno;
      }

      this.showselectiondialog = true;
    },

@@ -2821,7 +2719,6 @@
          } else if (this.accountfrom == "2") {
            //保存新增账号
            //获取用户编号
            // this.accountform.userno = this.accountlist[this.accountlist.length - 1].id + 1;
            getOnlyCode(this.seqnoParams).then((res) => {
              this.accountform.userno = res.data.currentvalue;
              this.accountform.id = null;
@@ -2923,7 +2820,7 @@
        }
        return;
      }
      console.log(11);
      
      if (regex.test(row.idcardno)) {
        row.error = "";
      } else {