yxh
2023-06-15 e5e3e1a5bc8aa300c580126703bb6067221dee96
主要修改了个税计算
已修改29个文件
1385 ■■■■ 文件已修改
package.json 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/api/project/funddetail.js 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/home/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/components/fundsummary/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donateannex/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donatebaseinfo/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donateconsolationfund/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donateconsolationfundlist/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donatefinish/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donatefinishcheck/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donatereview/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donationwitness/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/externalperson/index.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/financesubject/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/expertFeeFundApply/index.vue 393 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/fundApply/index.vue 5 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/fundapplycheck/index.vue 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fund/medicalCostFundApply/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/funddetail/index.vue 331 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/fundstatistics/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/indexstatistics/index.vue 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/medicalcostfundapplycheck/index.vue 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/organization/index.vue 332 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/relativesconfirmation/index.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpenseslist/eidt.vue 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpenseslist/index.vue 191 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpenseslistrecord/index.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/system/medicalevalustion/index.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 补丁 | 查看 | 原始文档 | blame | 历史
package.json
@@ -5,8 +5,8 @@
  "author": "浙江亥尔时信息科技有限公司",
  "license": "MIT",
  "scripts": {
    "dev": "vue-cli-service serve",
    "build": "vue-cli-service build",
    "dev": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
    "build:stage": "vue-cli-service build --mode staging",
    "preview": "node build/index.js --preview",
    "lint": "eslint --ext .js,.vue src"
@@ -39,6 +39,7 @@
    "@jiaminghi/data-view": "^2.10.0",
    "@riophae/vue-treeselect": "0.4.0",
    "axios": "0.21.0",
    "build": "^0.1.4",
    "clipboard": "2.0.6",
    "core-js": "3.8.1",
    "dayjs": "^1.11.1",
src/api/project/funddetail.js
@@ -111,4 +111,49 @@
  })
}
// 根据人员编号、时间范围获取费用明细
export function getDataBybeneficiaryNo(data) {
  return request({
    url: '/project/funddetail/getDataBybeneficiaryNo',
    method: 'post',
    data: data
  })
}
// 根据人员编号、税前金额\申报时间获取个税金额
export function getTaxByBeneFiciaryNo(data) {
  return request({
    url: '/project/funddetail/getTaxByBeneFiciaryNo',
    method: 'post',
    data: data
  })
}
// 根据人员编号、时间范围获取税前金额
export function getTaxBeforeByBeneFiciaryNo(params) {
  return request({
    url: '/project/funddetail/getTaxBeforeByBeneFiciaryNo',
    method: 'post',
    data: params
  })
}
// 根据人员编号、时间范围获取个税金额
export function getTaxationByBeneFiciaryNo(data) {
  return request({
    url: '/project/funddetail/getTaxationByBeneFiciaryNo',
    method: 'post',
    data: data
  })
}
// 根据人员编号、时间范围、本次税后金额,获取本次税前金额、个税金额
export function getTaxBeforeByAfterMoney(data) {
  return request({
    url: '/project/funddetail/getTaxBeforeByAfterMoney',
    method: 'post',
    data: data
  })
}
src/views/home/index.vue
@@ -1217,7 +1217,6 @@
    let uuid;
    login(defaultAccount, defaultPassword, code, uuid)
      .then(async (res) => {
        debugger
        setToken(res.token);
        await this.getDictData();
        this.getinfos();
src/views/project/components/fundsummary/index.vue
@@ -916,7 +916,6 @@
      getDonationCost(donorno).then((res) => {
        if (res.code == 200) {
          let resList = res.data;
          debugger
          var arr = [];
          for (var i in resList) {
            arr.push(resList[i]);
src/views/project/donateannex/index.vue
@@ -1053,7 +1053,6 @@
    },
    //移除附件
    removeFile(file, fileList, attachmentFileInfo) {
      debugger;
      let fileArr = [];
      let fileUrl = "";
      for (let i = 0; i < fileList.length; i++) {
src/views/project/donatebaseinfo/index.vue
@@ -1206,7 +1206,6 @@
        });
        this.form = response.data;
        response.data.sex = parseInt(response.data.sex);
        debugger;
        this.form.id = response.data.id;
        this.form.diseasetype = this.form.diseasetype.split(",");
        this.form.infectious = this.form.infectious.split(",");
src/views/project/donateconsolationfund/index.vue
@@ -1563,7 +1563,6 @@
    //加载服务项目
    LoadItemTypeArr(value) {
      // debugger
      //console.log(value);
      getItemNames(value).then((res) => {
        this.itemArr = res.data;
src/views/project/donateconsolationfundlist/index.vue
@@ -1110,7 +1110,6 @@
        type: "warning",
      })
        .then(() => {
          debugger;
          let formData = this.form;
          let tempItemArr = rows.itemArr;
          rows.fundid = formData.id;
@@ -1272,7 +1271,6 @@
      this.personlist.map((res) => {
        if (row.beneficiaryname == res.username) {
          row.beneficiaryno = res.userno;
          debugger;
          row.beneficiaryname = res.username;
          row.bankcardno = res.bankcardno;
          row.branchbankname = res.branchbankname;
src/views/project/donatefinish/index.vue
@@ -1118,7 +1118,6 @@
      //获取捐献完成登记记录
      this.loading = true;
      this.reset();
      debugger;
      this.curCase.registerAddresss = row.registeraddresss;
      this.curCase.donorno = row.donorno;
      this.curCase.name = row.name;
@@ -1150,7 +1149,6 @@
        // this.GetDonortedList();
      });
      listnewDonatecompletioninfo(searchParam).then((response) => {
        debugger;
        if (response.code == 200 && response.rows.length == 1) {
          this.open = true;
          this.form = response.rows[0];
src/views/project/donatefinishcheck/index.vue
@@ -1294,7 +1294,6 @@
    LoadReportList() {
      listDonatebaseinfo().then((res) => {
        debugger
        let list = res.rows;
        let reportlist = [];
        reportlist.push({ reporterno: "", reportername: "全部" });
@@ -1304,7 +1303,6 @@
            reportername: element.reportername,
          });
        });
        debugger
        if (reportlist != 0) {
          reportlist = this.resetArr(reportlist);
          this.reportlist = reportlist;
src/views/project/donatereview/index.vue
@@ -1628,7 +1628,6 @@
    LoadReportList() {
      listDonatebaseinfo().then((res) => {
        debugger
        let list = res.rows;
        let reportlist = [];
        reportlist.push({ reporterno: "", reportername: "全部" });
@@ -1638,7 +1637,6 @@
            reportername: element.reportername,
          });
        });
        debugger
        if (reportlist != 0) {
          reportlist = this.resetArr(reportlist);
          this.reportlist = reportlist;
src/views/project/donationwitness/index.vue
@@ -988,7 +988,6 @@
    },
    /** 新增按钮操作 */
    handleAdd(row) {
      debugger;
      this.curCase = {
        id: row.id,
        recordstate: null,
@@ -1019,7 +1018,6 @@
      let searchParam = {
        infoid: row.id,
      };
      debugger;
      this.GetDonortedList();
      const infoid = this.form.infoid;
      getByInfoId(infoid).then((response) => {
@@ -1160,12 +1158,10 @@
        //donorno: this.form.donorno,
        infoid: this.curCase.id,
      };
      debugger;
      console.log(
        "调用器官列表接口,参数:" + JSON.stringify(oraganqueryParam)
      );
      listDonateorgan(oraganqueryParam).then((response) => {
        debugger;
        this.loading = false;
        if (response.code == 200) {
          this.organdonation = [];
src/views/project/externalperson/index.vue
@@ -118,12 +118,13 @@
              <el-select v-model="form.title" placeholder="请选择人员职称">
                <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
                  :value="dict.value"></el-option> </el-select>
            </el-form-item> </el-col></el-row><el-row><el-col :span="12"><el-form-item label="银行名称" prop="depositbank">
              <el-input v-model="form.depositbank" placeholder="请输入银行名称" /> </el-form-item></el-col><el-col
            :span="12"><el-form-item label="银行卡号" prop="bankcardno">
            </el-form-item> </el-col></el-row><el-row><el-col :span="24"><el-form-item label="开户银行" prop="depositbank">
              <el-input v-model="form.depositbank" placeholder="请输入开户银行名称" /> </el-form-item></el-col><el-col
            :span="24"><el-form-item label="银行卡号" prop="bankcardno">
              <el-input v-model="form.bankcardno" placeholder="请输入银行卡号" />
            </el-form-item></el-col></el-row><el-row><el-col :span="24"><el-form-item label="开户支行" prop="branchbankname">
              <el-input v-model="form.branchbankname" placeholder="请输入开户支行" /> </el-form-item></el-col></el-row>
            </el-form-item></el-col></el-row>
        <!--<el-row><el-col :span="24"><el-form-item label="开户支行" prop="branchbankname">
              <el-input v-model="form.branchbankname" placeholder="请输入开户支行" /> </el-form-item></el-col></el-row>-->
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
src/views/project/financesubject/index.vue
@@ -467,7 +467,6 @@
    submitForm() {
      this.$refs["form"].validate((valid) => {
        if (valid) {
          debugger
          this.form.costtypename = this.$refs.costTypeSel.selectedLabel;
          this.form.expensetypename = this.$refs.expenseTypeSel.selectedLabel;
          if (this.form.id != null) {
src/views/project/fund/expertFeeFundApply/index.vue
@@ -34,8 +34,7 @@
              </el-row>
            </el-col>
          </el-row>
          <el-table v-loading="loading" border highlight-current-row :data="donatebaseinfoList"
            @row-click="selectDonotor">
          <el-table v-loading="loading" highlight-current-row :data="donatebaseinfoList" @row-click="selectDonotor">
            <!-- <el-table-column label="捐献编号" align="center" prop="donorno" /> -->
            <el-table-column label="捐献进度" align="center" prop="recordstate">
              <template slot-scope="scope">
@@ -217,29 +216,29 @@
        <el-row style="margin-top: 5px; margin-bottom: 5px">
          <el-row style="margin-bottom: 10px">
            <el-col :span="4">
              <el-button @click.native.prevent="addAlls" type="primary" size="small">
              <el-button @click.native.prevent="addAllItems" type="primary" size="small">
                导入服务项目
              </el-button>
            </el-col>
          </el-row>
          <el-table :data="fundDetailArr" v-loading="loading" border highlight-current-row>
          <el-table :data="fundDetails" v-loading="loading" border highlight-current-row>
            <el-table-column prop="orderno" align="center" label="序号" width="65">
              <template slot-scope="scope">
                <el-input v-model="scope.row.orderno" placeholder="序号" />
              </template>
            </el-table-column>
            <el-table-column prop="applytype" align="center" label="费用类型" width="200">
            <el-table-column prop="applytype" align="center" label="服务费用类型" width="200">
              <template slot-scope="scope">
                <el-select v-model="scope.row.applytype" placeholder="费用类型" @change="LoadItemTypeArr(scope.row)">
                  <el-option v-for="dict in fundtypeArr" :key="dict.index" :label="dict.label"
                <el-select v-model="scope.row.applytype" placeholder="服务费用类型" @change="loadItemType(scope.row)">
                  <el-option v-for="dict in rowfeeItemTypes" :key="dict.index" :label="dict.label"
                    :value="dict.value"></el-option>
                </el-select>
              </template>
            </el-table-column>
            <el-table-column prop="itemtype" align="center" label="服务项目" width="260">
            <el-table-column prop="itemid" align="center" label="服务项目名称" width="260">
              <template slot-scope="scope">
                <el-select v-model="scope.row.itemid" placeholder="服务项目" filterable @change="select(scope.row)"
                  :filter-method="(val) => SearchItem(val, scope)">
                <el-select v-model="scope.row.itemid" placeholder="服务项目名称" filterable @change="verifyFeeItem(scope.row)"
                  :filter-method="(val) => searchItemType(val, scope)">
                  <el-option v-for="dict in scope.row.itemArr" :key="dict.index" :label="dict.itemName"
                    :value="dict.id"></el-option>
                </el-select>
@@ -247,25 +246,25 @@
            </el-table-column>
            <el-table-column prop="itemcode" align="center" label="项目编号" show-overflow-tooltip="" v-if="false">
            </el-table-column>
            <el-table-column prop="servicesscopename" align="center" label="费用说明" width="180">
            <el-table-column prop="servicesscope" align="center" label="费用说明" width="180">
              <template slot-scope="scope">
                <el-select v-model="scope.row.servicesscope" placeholder="费用说明" clearable allow-create filterable
                  @change="selectedRemark(scope.row)">
                  <el-option v-for="dict in scope.row.fundblock" :key="dict.servicesscope" :label="dict.expensedescribe"
                  <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.servicesscope" :label="dict.remark"
                    :value="dict.servicesscope"></el-option>
                </el-select>
              </template>
            </el-table-column>
            <el-table-column v-if="this.ismanager == true" prop="amount" align="center" label="税前金额" width="100">
            <el-table-column v-if="this.ismanager == true" prop="amount" align="center" label="税前金额" width="120">
              <template slot-scope="scope">
                <el-select v-model="scope.row.amount" placeholder="税前金额" clearable filterable allow-create
                  @change="selectamount(scope.row)">
                  <el-option v-for="dict in scope.row.fundblock" :key="dict.expensedescribe" :label="dict.expense"
                  <el-option v-for="dict in scope.row.rowfeeblocks" :key="dict.expensedescribe" :label="dict.expense"
                    :value="dict.expense"></el-option>
                </el-select>
              </template>
            </el-table-column>
            <el-table-column prop="taxedamount" align="center" label="税后金额" width="100" v-if="this.ismanager == true">
            <el-table-column prop="taxedamount" align="center" label="税后金额" width="120" v-if="this.ismanager == true">
              <!-- v-if="form.applytype != '3'"上同 -->
              <template slot-scope="scope">
                <el-input v-model="scope.row.taxedamount" placeholder="税后金额" />
@@ -335,7 +334,6 @@
                <el-input v-model="scope.row.remark" placeholder="备注" />
              </template>
            </el-table-column>
            <el-table-column prop="title" align="center" label="职称" width="120" v-if="form.applytype != '3'">
              <template slot-scope="scope">
                <el-input v-model="scope.row.title" placeholder="职称" />
@@ -360,9 +358,8 @@
            <el-table-column fixed="right" align="center" label="操作" width="180" v-if="dialogType == 'edit'">
              <template slot-scope="scope">
                <el-button type="text" size="mini" @click="addRow(scope.$index)">新增</el-button>
                <el-button @click.native.prevent="
                  deleteRows(scope.row, scope.$index, fundDetailArr)
                  deleteRows(scope.row, scope.$index, fundDetails)
                  " type="text" size="small">
                  删除
                </el-button>
@@ -413,8 +410,8 @@
        <el-row>
          <el-col :span="12">
            <el-form-item label="费用申请附件" align="left" prop="annexbankcard">
              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
                :headers="headers" :on-success="(response, file, fileList) =>
              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple
                :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
                  uploadSccess(response, file, fileList)
                  " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
                :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
@@ -512,6 +509,11 @@
  getFundType,
  getFundTypeAll,
  listcountItem,
  getDataBybeneficiaryNo,
  getTaxByBeneFiciaryNo,
  getTaxBeforeByBeneFiciaryNo,
  getTaxationByBeneFiciaryNo,
  getTaxBeforeByAfterMoney
} from "@/api/project/funddetail";
import { listFundflow } from "@/api/project/fundflow";
import {
@@ -590,6 +592,14 @@
        applytype: "1",
        createBy: null,
      },
      //计算个税参数
      taxParam: {
        beneficiaryNo: '',
        money: '0',
        startTime: '',
      },
      // 表单参数
      form: {},
      personlist: [],
@@ -622,22 +632,26 @@
      // 捐献人道慰问金表格数据
      donateconsolationfundList: [],
      fundDetailArr: [],
      //费用明细列表
      fundDetails: [],
      // 弹出层标题
      title: "",
      userlist: [],
      itemArr: [],
      reporters: [],
      //行记录的费用类型数组
      rowfeeItemTypes: [],
      //费用类型数组
      fundtypeArr: [],
      fundblock: [],
      feeItemTypes: [],
      //费用说明
      rowfeeblocks: [],
      defaultperson: {},
      //是否是专家费的OPO审批人员
      ismanager: false,
      fundtypeArrAll: [],
      unitList: [],
      dialogType: "edit",
      fundflowList: [],
@@ -681,11 +695,12 @@
      this.detailInfoDialogShow = true;
      this.detailInfoDialogShowType = showType;
    },
    ConfirmDetailDialog() {
      let tempIndex = this.funddetailForm.index;
      let tempName = this.funddetailForm.beneficiaryname;
      let tempUnitname = this.funddetailForm.unitname;
      let singleDetail = this.fundDetailArr[tempIndex];
      let singleDetail = this.fundDetails[tempIndex];
      if (this.detailInfoDialogShowType == "name") {
        this.personlist.map((res) => {
          if (tempName == res.username) {
@@ -699,11 +714,9 @@
            singleDetail.title = res.title;
            singleDetail.unitname = res.unitname;
            singleDetail.unitno = parseInt(res.unitno);
          } else {
            singleDetail.beneficiaryname = tempName;
            singleDetail.beneficiaryno = tempName;
          }
        });
      } else if (this.detailInfoDialogShowType == "unit") {
        singleDetail.unitno = this.funddetailForm.unitno;
        try {
@@ -720,9 +733,10 @@
        }
      }
      this.fundDetailArr[tempIndex] = singleDetail;
      this.fundDetails[tempIndex] = singleDetail;
      this.detailInfoDialogShow = false;
    },
    handleup(row) {
      this.$confirm("是否确认将登记记录上报?", "提示", {
        confirmButtonText: "确定",
@@ -757,29 +771,22 @@
        });
    },
    // recordstatus
    // updateFund(row).then(res=>{
    //   console.log('状态更新',res);
    // })
    // },
    //获取当前用户信息
    getUsermsg() {
      getUserProfile().then((response) => {
        this.defaultperson = response.data;
        this.standardlevel = response.data.standardlevel;
        if (
          this.defaultperson.createBy == "admin" ||
          this.defaultperson.createBy == "001" ||
          this.defaultperson.createBy == "002"
        ) {
        if (this.defaultperson.createBy == "admin" || this.defaultperson.createBy == "001" || this.defaultperson.createBy == "002") {
          this.ismanager = true;
        } else {
          this.ismanager = false;
        }
      });
    },
    //获取费用项目的备注信息
    selectedRemark(row) {
      row.fundblock.forEach((item, i) => {
      row.rowfeeblocks.forEach((item, i) => {
        if (item.servicesscope === row.servicesscope) {
          row.servicesscopename = item.expensedescribe;
          if (row.servicesscopename.includes("税后")) {
@@ -789,14 +796,17 @@
            row.amount = item.expense;
            row.taxedamount = 0.0;
          }
          this.form.serviceFunddetails = 0;
          this.fundDetailArr.map((item) => {
          this.fundDetails.map((item) => {
            this.form.serviceFunddetails += item.amount;
          });
        }
      });
    },
    select(row) {
    //校验收费项目是否重复
    verifyFeeItem(row) {
      row.itemArr.map((res) => {
        if (row.itemid === res.id) {
          row.remark = res.itemDescribe;
@@ -804,20 +814,21 @@
        }
      });
      var repeatNum = 0;
      this.fundDetailArr.map((res) => {
      this.fundDetails.map((res) => {
        if (res.applytype === row.applytype && res.itemid == row.itemid) {
          repeatNum++;
        }
      });
      if (repeatNum > 1) {
        this.$modal.msgWarning("您已经提交过服务项目");
        this.$modal.msgWarning("您已经提交过该服务项目了");
      }
      //获取费用项目的详细信息
      getdetailsByItemId(row.itemid).then((res) => {
        let fundmsg = res.data;
        let fundblock = [];
        let rowfeeblocks = [];
        fundmsg.forEach((item) => {
          fundblock.push({
          rowfeeblocks.push({
            expense: item.expense,
            expensedescribe: item.expensedescribe,
            remark: item.expensedescribe,
@@ -825,18 +836,22 @@
          });
        });
        row.fundblock = fundblock;
        row.rowfeeblocks = rowfeeblocks;
        row.servicesscope = null;
        row.servicesscopename = "";
      });
    },
    //
    selectamount(row) {
      this.fundblock.forEach((item, i) => {
      this.rowfeeblocks.forEach((item, i) => {
        if (item.expense === row.amount) {
          row.remark = item.expensedescribe;
        }
      });
    },
    /** 搜索按钮操作 */
    handleQuery() {
      this.queryParams.pageNum = 1;
@@ -902,7 +917,7 @@
        // this.form.createTime = nowdate;
        //this.open = true;
        //this.initFundApplyForm();
        this.fundDetailArr = [];
        this.fundDetails = [];
        this.addRow();
        this.dialogOpen = true;
        this.dialogType = "edit";
@@ -982,41 +997,65 @@
      this.fileList = []
    },
    addAlls() {
    //导入所有项目
    addAllItems() {
      this.loading = true;
      this.fundDetailArr = this.fundDetailArr.filter(
      this.fundDetails = this.fundDetails.filter(
        (r) => r.applytype != "" && r.applytype != null
      );
      let listAdd = [];
      //let listAdd = this.fundDetailArr;
      for (let i = 0; i < this.fundtypeArrAll.length; i++) {
        for (let j = 0; j < this.fundtypeArrAll[i].itemDetails.length; j++) {
          let list = this.fundDetailArr.filter(
      //let listAdd = this.fundDetails;
      for (let i = 0; i < this.feeItemTypes.length; i++) {
        for (let j = 0; j < this.feeItemTypes[i].itemDetails.length; j++) {
          let list = this.fundDetails.filter(
            (r) =>
              r.applytype == this.fundtypeArrAll[i].itemType &&
              r.itemid == this.fundtypeArrAll[i].itemDetails[j].id
              r.applytype == this.feeItemTypes[i].itemType &&
              r.itemid == this.feeItemTypes[i].itemDetails[j].id
          );
          if (list.length == 0) {
            let rowData = {
              id: null,
              orderno: listAdd.length + 1,
              applytype: this.fundtypeArrAll[i].itemType,
              itemid: this.fundtypeArrAll[i].itemDetails[j].id,
              itemcode: this.fundtypeArrAll[i].itemDetails[j].itemCode,
              applytype: this.feeItemTypes[i].itemType,
              itemid: this.feeItemTypes[i].itemDetails[j].id,
              itemcode: this.feeItemTypes[i].itemDetails[j].itemCode,
              recordstatus: "-1",
              beneficiaryname: "点击选择",
              unitname: "点击选择",
              itemArr: this.fundtypeArrAll[i].itemDetails,
              itemArr: this.feeItemTypes[i].itemDetails,
              rowfeeblocks: null,
              servicesscope: null,
              servicesscopename: ""
            };
            //获取收费项目的说明信息
            getdetailsByItemId(rowData.itemid).then((res) => {
              let fundmsg = res.data;
              let rowfeeblocks = [];
              fundmsg.forEach((item) => {
                rowfeeblocks.push({
                  expense: item.expense,
                  expensedescribe: item.expensedescribe,
                  remark: item.expensedescribe,
                  servicesscope: item.id,
                });
              });
              rowData.rowfeeblocks = rowfeeblocks;
              rowData.servicesscope = null;
              rowData.servicesscopename = "";
            });
            listAdd.push(rowData);
          }
        }
      }
      this.fundDetailArr = listAdd;
      this.fundDetails = listAdd;
      this.loading = false;
      // let Outerarr = this.fundDetailArr;
      // let Outerarr = this.fundDetails;
      // Outerarr.map((res) => {
      //   let onelist = this.fundtypeArr;
      //   let onelist = this.rowfeeItemTypes;
      //   onelist.map((item) => {
      //     //第一层不相等时;
      //     if (res.applytype !== item.itemType) {
@@ -1025,6 +1064,7 @@
      //   });
      // });
    },
    addAll(row, i, arr) {
      row.itemArr.map((res) => {
        if (res.id !== row.itemid) {
@@ -1036,20 +1076,21 @@
          getdetailsByItemId(arr[a].itemid).then((res) => {
            let fundmsg = res.data;
            let fundblock = [];
            let rowfeeblocks = [];
            fundmsg.forEach((item) => {
              fundblock.push({
              rowfeeblocks.push({
                expense: item.expense,
                expensedescribe: item.expensedescribe,
                remark: item.expensedescribe,
                servicesscope: item.id,
              });
            });
            row.fundblock = fundblock;
            row.rowfeeblocks = rowfeeblocks;
          });
        }
      });
    },
    //新增一行
    addRow(rowIndex) {
      let rowData = {
@@ -1093,21 +1134,21 @@
        uploadtime: null,
        itemArr: [],
        servicesscope: null,
        fundblock: [],
        rowfeeblocks: [],
      };
      if (rowIndex == undefined || rowIndex == null || rowIndex < 0) {
        this.fundDetailArr.push(rowData);
        this.fundDetails.push(rowData);
      } else {
        this.fundDetailArr.splice(rowIndex + 1, 0, rowData);
        this.fundDetails.splice(rowIndex + 1, 0, rowData);
      }
      for (let i = 0; i < this.fundDetailArr.length; i++) {
        this.fundDetailArr[i].orderno = i + 1;
      for (let i = 0; i < this.fundDetails.length; i++) {
        this.fundDetails[i].orderno = i + 1;
      }
    },
    //加载服务项目
    LoadItemTypeArr(row) {
      let list = this.fundtypeArrAll.filter((r) => r.itemType == row.applytype);
    loadItemType(row) {
      let list = this.feeItemTypes.filter((r) => r.itemType == row.applytype);
      row.itemArr = list[0].itemDetails;
      row.itemid = null;
      this.$forceUpdate();
@@ -1128,12 +1169,20 @@
          let totalPreTaxAmount = 0.0;
          let totalAfterTaxAmount = 0.0;
          let totalAmount = 0.0;
          for (let k = 0; k < this.fundDetailArr.length; k++) {
            let tempDetail = this.fundDetailArr[k];
          //保存前校验数据
          for (let k = 0; k < this.fundDetails.length; k++) {
            let tempDetail = this.fundDetails[k];
            if (tempDetail.itemid == null) {
              this.$modal.msgWarning("请选择服务项目");
              this.$modal.msgWarning("服务项目是必选项,请选择服务项目后再提交保存!");
              return;
            }
            if (tempDetail.beneficiaryno == null) {
              this.$modal.msgWarning("服务项目表中,第" + (k + 1).toString() + "行的服务人员姓名为选择,请选择人员后再提交保存!");
              return;
            }
            // //判断单位 unitSel
            // try {
            //   let unitIndex = this.unitList.findIndex(
@@ -1147,15 +1196,41 @@
            // } catch {
            //   tempDetail.unitname = tempDetail.unitno;
            // }
            if (!isNaN(parseFloat(tempDetail.amount))) {
              totalPreTaxAmount += parseFloat(tempDetail.amount);
              totalAmount += parseFloat(tempDetail.amount);
            //计算个税
            //if (isNaN(parseFloat(tempDetail.taxedamount)))
            if (tempDetail.taxedamount == undefined || tempDetail.taxedamount == null || tempDetail.taxedamount == 0 || tempDetail.taxedamount == '') {
              //获取参数
              this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
              this.taxParam.money = tempDetail.amount.toString();
              this.taxParam.startTime = this.form.createTime.substring(0, 10);
              getTaxByBeneFiciaryNo(this.taxParam).then((res) => {
                if (res.code == 200) {
                  tempDetail.taxamount = res.data;
                  tempDetail.taxedamount = tempDetail.amount - tempDetail.taxamount;
            }
            if (!isNaN(parseFloat(tempDetail.taxedamount))) {
              });
            }
            //if (isNaN(parseFloat(tempDetail.amount)))
            if (tempDetail.amount == undefined || tempDetail.amount == null || tempDetail.amount == 0 || tempDetail.amount == '') {
              //获取参数
              this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
              this.taxParam.money = tempDetail.taxedamount.toString();
              this.taxParam.startTime = this.form.createTime.substring(0, 10);
              getTaxBeforeByAfterMoney(this.taxParam).then((res) => {
                console.log("",res);
                if (res.code == 200) {
                  tempDetail.taxamount = res.data.nowTax;
                  tempDetail.amount = res.data.nowTaxBeforeMoney;
                }
              });
            }
              totalAfterTaxAmount += parseFloat(tempDetail.taxedamount);
              totalAmount += parseFloat(tempDetail.taxedamount);
            }
            this.fundDetailArr[k] = tempDetail;
            totalAmount += parseFloat(tempDetail.amount);
            this.fundDetails[k] = tempDetail;
          }
          this.loading = true;
@@ -1178,8 +1253,8 @@
              this.selectDonotor(this.curCase);
              this.$modal.msgSuccess("修改成功");
              this.loading = false;
              for (let m = 0; m < this.fundDetailArr.length; m++) {
                let tempData = this.fundDetailArr[m];
              for (let m = 0; m < this.fundDetails.length; m++) {
                let tempData = this.fundDetails[m];
                let tempItemArr = tempData.itemArr;
                tempData.fundid = formData.id;
                //获取服务项目明细
@@ -1190,6 +1265,15 @@
                  tempData.itemname = tempItemArr[itemIndex].itemName;
                  tempData.itemid = tempItemArr[itemIndex].id;
                }
                //获取applytypename
                let applytypeIndex = this.rowfeeItemTypes.findIndex(
                  (item) => tempData.applytype == item.value
                );
                if (applytypeIndex > -1) {
                  tempData.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
                }
                if (tempData.id > 0) {
                  updateFunddetail(tempData).then((response2) => { });
                } else {
@@ -1199,9 +1283,10 @@
            });
          } else {
            //保存费用申请
            for (let m = 0; m < this.fundDetailArr.length; m++) {
              let tempData = this.fundDetailArr[m];
            for (let m = 0; m < this.fundDetails.length; m++) {
              let tempData = this.fundDetails[m];
              let tempUtemArr = tempData.itemArr;
              //获取服务项目明细
              let itemIndex = tempUtemArr.findIndex(
                (item) => tempData.itemid == item.id
@@ -1210,21 +1295,24 @@
                tempData.itemname = tempUtemArr[itemIndex].itemName;
                tempData.itemid = tempUtemArr[itemIndex].id;
              }
              //获取applytypename
              let applytypeIndex = this.fundtypeArr.findIndex(
              let applytypeIndex = this.rowfeeItemTypes.findIndex(
                (item) => tempData.applytype == item.value
              );
              if (applytypeIndex > -1) {
                tempData.applytypename = this.fundtypeArr[applytypeIndex].label;
                tempData.applytypename = this.rowfeeItemTypes[applytypeIndex].label;
              }
              this.fundDetailArr[m] = tempData;
              this.fundDetails[m] = tempData;
            }
            this.form.serviceFunddetails = 0;
            this.fundDetailArr.map((item) => {
            this.fundDetails.map((item) => {
              this.form.serviceFunddetails += item.amount;
            });
            this.form.serviceFunddetails = this.fundDetailArr;
            this.form.serviceFunddetails = this.fundDetails;
            this.form.recordstatus = -1;
            batchUploadFund(this.form).then((response) => {
              if (response.code === 200) {
                this.$modal.msgSuccess("新增成功");
@@ -1240,13 +1328,16 @@
        }
      });
    },
    //获取专家列表
    getlistExternalperson() {
      listExternalperson().then((res) => {
        this.personlist = res.rows;
      });
    },
    selectReporters() {
      //专家人员列表
    selectReporters() {
      let arr = ["expert"];
      let arrreportlist = [];
      for (let i = 0; i < arr.length; i++) {
@@ -1262,6 +1353,7 @@
        });
      }
    },
    selectpersonmsg(row) {
      // if(row.beneficiaryname)
      this.personlist.map((res) => {
@@ -1281,11 +1373,13 @@
        }
      });
    },
    getlistUser() {
      listUser().then((res) => {
        this.userlist = res.data;
      });
    },
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.isopen = 0;
@@ -1305,19 +1399,32 @@
        this.form.name = this.curCase.name;
        //附件处理
        this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
        getownFundDetail(id).then((res) => {
          this.fundDetailArr = res.data;
          for (let m = 0; m < this.fundDetailArr.length; m++) {
            this.fundDetailArr[m].itemArr = [];
            this.getItemArr(m, this.fundDetailArr[m]);
            this.fundDetailArr[m].fundblock = [];
            this.fundDetailArr[m].fundblock.push({
              expense: this.fundDetailArr[m].expense,
              expensedescribe: this.fundDetailArr[m].servicesscopename,
              remark: this.fundDetailArr[m].servicesscope,
              servicesscope: this.fundDetailArr[m].servicesscope,
          this.fundDetails = res.data;
          for (let m = 0; m < this.fundDetails.length; m++) {
            this.fundDetails[m].itemArr = [];
            this.getItemArr(m, this.fundDetails[m]);
            //获取费用项目的详细信息
            this.fundDetails[m].rowfeeblocks = [];
            this.fundDetails[m].rowfeeblocks.push({
              servicesscope: this.fundDetails[m].servicesscope,
              expensedescribe: this.fundDetails[m].servicesscopename,
              expense: this.fundDetails[m].expense,
              remark: this.fundDetails[m].servicesscopename,
            });
            // getdetailsByItemId(this.fundDetails[m].itemid).then((res) => {
            //   let fundmsg = res.data;
            //   fundmsg.forEach((item) => {
            //     this.fundDetails[m].rowfeeblocks.push({
            //       servicesscope: item.id,
            //       expensedescribe: item.expensedescribe,
            //       expense: item.expense,
            //       remark: item.expensedescribe,
            //     });
            //   });
            // });
          }
        });
      });
@@ -1349,16 +1456,16 @@
          this.fundflowList = res.rows;
        });
        getownFundDetail(id).then((res) => {
          this.fundDetailArr = res.data;
          for (let m = 0; m < this.fundDetailArr.length; m++) {
            this.fundDetailArr[m].itemArr = [];
            this.getItemArr(m, this.fundDetailArr[m]);
            this.fundDetailArr[m].fundblock = [];
            this.fundDetailArr[m].fundblock.push({
              expense: this.fundDetailArr[m].expense,
              expensedescribe: this.fundDetailArr[m].servicesscopename,
              remark: this.fundDetailArr[m].servicesscope,
              servicesscope: this.fundDetailArr[m].servicesscope,
          this.fundDetails = res.data;
          for (let m = 0; m < this.fundDetails.length; m++) {
            this.fundDetails[m].itemArr = [];
            this.getItemArr(m, this.fundDetails[m]);
            this.fundDetails[m].rowfeeblocks = [];
            this.fundDetails[m].rowfeeblocks.push({
              expense: this.fundDetails[m].expense,
              expensedescribe: this.fundDetails[m].servicesscopename,
              remark: this.fundDetails[m].servicesscope,
              servicesscope: this.fundDetails[m].servicesscope,
            });
          }
        });
@@ -1403,15 +1510,15 @@
                }).then(() => {
                  this.$set(rows, rows.splice(index, 1));
                  getownFundDetail(this.form.id).then((res) => {
                    this.$set(this.fundDetailArr, res.data);
                    this.$set(this.fundDetails, res.data);
                    this.sumTotalFee();
                    // this.fundDetailArr = res.data
                    // this.fundDetails = res.data
                  });
                });
              }
              // getownFundDetail(this.form.id).then(res=>{
              // this.$set(this.fundDetailArr,res.data)
              // this.fundDetailArr = res.data
              // this.$set(this.fundDetails,res.data)
              // this.fundDetails = res.data
              // })
            });
          } else {
@@ -1424,37 +1531,40 @@
        });
    },
    //计算个税
    calculateTax() { },
    //计算总金额
    sumTotalFee(row) {
      let allSum = 0;
      if (this.form.applytype != null) {
        for (let i = 0; i < this.fundDetailArr.length; i++) {
        for (let i = 0; i < this.fundDetails.length; i++) {
          let totalFee = 0;
          let taxFee = 0;
          if (this.form.applytype == 1 || this.form.applytype == 2) {
            //计算当前报销内容费用合计
            if (!isNaN(parseFloat(this.fundDetailArr[i].amount))) {
              totalFee += parseFloat(this.fundDetailArr[i].amount);
              taxFee += parseFloat(this.fundDetailArr[i].amount);
            if (!isNaN(parseFloat(this.fundDetails[i].amount))) {
              totalFee += parseFloat(this.fundDetails[i].amount);
              taxFee += parseFloat(this.fundDetails[i].amount);
            }
            if (!isNaN(parseFloat(this.fundDetailArr[i].taxamount))) {
              totalFee -= parseFloat(this.fundDetailArr[i].taxamount);
              taxFee -= parseFloat(this.fundDetailArr[i].taxamount);
            if (!isNaN(parseFloat(this.fundDetails[i].taxamount))) {
              totalFee -= parseFloat(this.fundDetails[i].taxamount);
              taxFee -= parseFloat(this.fundDetails[i].taxamount);
            }
          } else if (this.form.applytype == 3) {
            if (
              !isNaN(parseFloat(this.fundDetailArr[i].price)) &&
              !isNaN(parseFloat(this.fundDetailArr[i].quantity))
              !isNaN(parseFloat(this.fundDetails[i].price)) &&
              !isNaN(parseFloat(this.fundDetails[i].quantity))
            ) {
              totalFee +=
                parseFloat(this.fundDetailArr[i].price) *
                parseFloat(this.fundDetailArr[i].quantity);
                parseFloat(this.fundDetails[i].price) *
                parseFloat(this.fundDetails[i].quantity);
            }
          }
          //税前、税后需要独立录入
          // if (!isNaN(parseFloat(taxFee))) {
          //   this.fundDetailArr[i].taxedamount = taxFee.toFixed(2);
          //   this.fundDetails[i].taxedamount = taxFee.toFixed(2);
          // }
          allSum += totalFee;
@@ -1468,10 +1578,10 @@
    getCurFundType() {
      getFundTypeAll(this.currentApplyType).then((res) => {
        let dataList = res.data;
        this.fundtypeArrAll = dataList;
        this.fundtypeArr = [];
        this.feeItemTypes = dataList;
        this.rowfeeItemTypes = [];
        for (let m = 0; m < dataList.length; m++) {
          this.fundtypeArr.push({
          this.rowfeeItemTypes.push({
            value: dataList[m].itemType,
            label: dataList[m].itemTypeName,
          });
@@ -1480,14 +1590,14 @@
    },
    getItemArr(rowindex, row) {
      let list = this.fundtypeArrAll.filter((r) => r.itemType == row.applytype);
      let list = this.feeItemTypes.filter((r) => r.itemType == row.applytype);
      row.itemArr = list[0].itemDetails;
      this.$set(this.fundDetailArr, rowindex, row);
      this.$set(this.fundDetails, rowindex, row);
      //this.loading = true;
      // getItemNames(row.applytype).then((res) => {
      //   this.loading = false;
      //   row.itemArr = res.data;
      //   this.$set(this.fundDetailArr, rowindex, row);
      //   this.$set(this.fundDetails, rowindex, row);
      // });
    },
@@ -1541,7 +1651,8 @@
      });
    },
    SearchItem(val, scope) {
    //筛查出对应的费用项目
    searchItemType(val, scope) {
      let result = [];
      if (val != "") {
        let tempItemArr = scope.row.itemArr;
@@ -1557,7 +1668,7 @@
      } else {
        getItemNames(scope.row.applytype).then((res) => {
          scope.row.itemArr = res.data;
          //this.$set(this.fundDetailArr, rowindex, row);
          //this.$set(this.fundDetails, rowindex, row);
        });
      }
    },
src/views/project/fund/fundApply/index.vue
@@ -369,7 +369,7 @@
        <el-row>
          <el-col :span="24">
            <el-form-item label="申请附件:" align="left" prop="annexbankcard">
              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="20"
                :headers="headers" :on-success="(response, file, fileList) =>
                  uploadSccess(response, file, fileList)
                  " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
@@ -627,14 +627,12 @@
      this.detailInfoDialogShowType = showType;
    },
    ConfirmDetailDialog() {
      debugger;
      let tempIndex = this.funddetailForm.index;
      let tempName = this.funddetailForm.beneficiaryname;
      let tempUnitname = this.funddetailForm.unitname;
      let singleDetail = this.fundDetailArr[tempIndex];
      if (this.detailInfoDialogShowType == "name") {
        this.personlist.map((res) => {
          debugger;
          if (tempName == res.username) {
            singleDetail.beneficiaryno = res.userno;
            singleDetail.beneficiaryname = res.username;
@@ -666,7 +664,6 @@
          singleDetail.unitname = singleDetail.unitno;
        }
      }
      debugger;
      this.fundDetailArr[tempIndex] = singleDetail;
      this.detailInfoDialogShow = false;
    },
src/views/project/fund/fundapplycheck/index.vue
@@ -1039,7 +1039,6 @@
    },
    saveRows(rows, rowIndex) {
      debugger;
      this.$confirm("是否确认保存?", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
@@ -1200,7 +1199,6 @@
      this.personlist.map((res) => {
        if (row.beneficiaryname == res.username) {
          row.beneficiaryno = res.userno;
          debugger;
          row.beneficiaryname = res.username;
          row.bankcardno = res.bankcardno;
          row.branchbankname = res.branchbankname;
@@ -1275,7 +1273,6 @@
        console.log("登录用户信息", response.data);
        // this.defaultperson = response.data;
        // this.standardlevel = response.data.standardlevel;
        debugger;
        if (
          response.data.userName === "001" ||
          response.data.userName === "002" ||
src/views/project/fund/medicalCostFundApply/index.vue
@@ -423,7 +423,7 @@
        <el-row>
          <el-col :span="24">
            <el-form-item label="费用申请附件:" align="left" prop="annexbankcard">
              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="20"
                :headers="headers" :on-success="(response, file, fileList) =>
                  uploadSccess(response, file, fileList)
                  " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
src/views/project/funddetail/index.vue
@@ -1,89 +1,40 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="收益人姓名 家属或专家" prop="beneficiaryname">
        <el-input
          v-model="queryParams.beneficiaryname"
          placeholder="请输入收益人姓名 家属或专家"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
      <el-form-item label="专家姓名" prop="beneficiaryname">
        <el-input v-model="queryParams.beneficiaryname" placeholder="请输入专家姓名" clearable size="small"
          @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="工作单位" prop="uintname">
        <el-input
          v-model="queryParams.uintname"
          placeholder="请输入工作单位"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
        <el-input v-model="queryParams.uintname" placeholder="请输入工作单位" clearable size="small"
          @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="费用类别 见字典sys_SubjectType" prop="applytype">
        <el-select v-model="queryParams.applytype" placeholder="请选择费用类别 见字典sys_SubjectType" clearable size="small">
      <el-form-item label="费用类别" prop="applytype">
        <el-select v-model="queryParams.applytype" placeholder="请选择费用类别" clearable size="small">
          <el-option label="请选择字典生成" value="" />
        </el-select>
      </el-form-item>
      <el-form-item label="项目名称" prop="itemname">
        <el-input
          v-model="queryParams.itemname"
          placeholder="请输入项目名称"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
        <el-input v-model="queryParams.itemname" placeholder="请输入项目名称" clearable size="small"
          @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="项目类别" prop="itemtype">
        <el-select v-model="queryParams.itemtype" placeholder="请选择项目类别" clearable size="small">
          <el-option label="请选择字典生成" value="" />
        </el-select>
      </el-form-item>
      <el-form-item label="申请金额" prop="amount">
        <el-input
          v-model="queryParams.amount"
          placeholder="请输入申请金额"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="记录状态" prop="recordstatus">
        <el-select v-model="queryParams.recordstatus" placeholder="请选择记录状态" clearable size="small">
          <el-option label="请选择字典生成" value="" />
        </el-select>
      </el-form-item>
      <el-form-item label="创建人" prop="createBy">
        <el-input
          v-model="queryParams.createBy"
          placeholder="请输入创建人"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
      <el-form-item label="经办人" prop="createBy">
        <el-input v-model="queryParams.createBy" placeholder="请输入创建人" clearable size="small"
          @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="创建日期" prop="createTime">
        <el-date-picker clearable size="small"
          v-model="queryParams.createTime"
          type="date"
          value-format="yyyy-MM-dd"
      <el-form-item label="申请日期" prop="createTime">
        <el-date-picker clearable size="small" v-model="queryParams.createTime" type="date" value-format="yyyy-MM-dd"
          placeholder="选择创建日期">
        </el-date-picker>
      </el-form-item>
      <el-form-item label="上传标志" prop="uploadflag">
        <el-input
          v-model="queryParams.uploadflag"
          placeholder="请输入上传标志"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
      </el-form-item>
      <el-form-item label="上传时间" prop="uploadtime">
        <el-date-picker clearable size="small"
          v-model="queryParams.uploadtime"
          type="date"
          value-format="yyyy-MM-dd"
          placeholder="选择上传时间">
        </el-date-picker>
      </el-form-item>
      <el-form-item>
@@ -94,216 +45,170 @@
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['project:funddetail:add']"
        >新增</el-button>
        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
          v-hasPermi="['project:funddetail:add']">新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['project:funddetail:edit']"
        >修改</el-button>
        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleUpdate"
          v-hasPermi="['project:funddetail:edit']">修改</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['project:funddetail:remove']"
        >删除</el-button>
        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
          v-hasPermi="['project:funddetail:remove']">删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          :loading="exportLoading"
          @click="handleExport"
          v-hasPermi="['project:funddetail:export']"
        >导出</el-button>
        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading" @click="handleExport"
          v-hasPermi="['project:funddetail:export']">导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-table v-loading="loading" :data="funddetailList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="主键ID" align="center" prop="id" />
      <el-table-column label="费用申请主表ID" align="center" prop="fundid" />
      <el-table-column label="收益人姓名 家属或专家" align="center" prop="beneficiaryname" />
      <el-table-column label="收益人编号" align="center" prop="beneficiaryno" />
      <el-table-column label="工作单位" align="center" prop="uintname" />
      <el-table-column label="工作单位编号" align="center" prop="uintno" />
      <el-table-column label="工作单位用户编号" align="center" prop="uintuserno" />
      <el-table-column label="证件类型 根据字典sys_IDType" align="center" prop="idcardtype" />
      <el-table-column label="证件号码" align="center" prop="idcardno" />
      <el-table-column label="性别 根据字典sys_user_sex" align="center" prop="sex" />
      <el-table-column label="与捐赠者关系 根据字典sys_FamilyRelation" align="center" prop="familyrelations" />
      <el-table-column label="联系电话" align="center" prop="phone" />
      <el-table-column label="开户银行" align="center" prop="depositbank" />
      <el-table-column label="卡号" align="center" prop="bankcardno" />
      <el-table-column label="支行名称" align="center" prop="branchbankname" />
      <el-table-column label="银行卡照片路径 多个用;分开" align="center" prop="annexbankcard" />
      <el-table-column label="登记表照片路径 多个用;分开" align="center" prop="annexregistform" />
      <el-table-column label="费用类别 见字典sys_SubjectType" align="center" prop="applytype" />
      <el-table-column label="项目ID" align="center" prop="itemid" />
      <el-table-column label="项目名称" align="center" prop="itemname" />
      <el-table-column label="专家姓名" width="120" align="center" prop="beneficiaryname" />
      <el-table-column label="费用类别" align="center" prop="applytype" />
      <el-table-column label="项目类别" align="center" prop="itemtype" />
      <el-table-column label="申请金额" align="center" prop="amount" />
      <el-table-column label="预支金额" align="center" prop="prepaidamount" />
      <el-table-column label="发票张数" align="center" prop="invoicecount" />
      <el-table-column label="附件张数" align="center" prop="attachcount" />
      <el-table-column label="备注" align="center" prop="remark" />
      <el-table-column label="记录状态" align="center" prop="recordstatus" />
      <el-table-column label="上传标志" align="center" prop="uploadflag" />
      <el-table-column label="上传时间" align="center" prop="uploadtime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.uploadtime, '{y}-{m}-{d}') }}</span>
        </template>
      </el-table-column>
      <el-table-column label="费用项目名称" align="left" prop="itemname" />
      <el-table-column label="费用金额" align="center" prop="amount" />
      <el-table-column label="扣税金额" align="center" prop="taxamount" />
      <el-table-column label="税后金额" align="center" prop="taxedamount" />
      <!--
      <el-table-column label="专家单位" align="center" prop="uintname" />
      <el-table-column label="证件号码" align="center" prop="idcardno" />
      <el-table-column label="专家电话" align="center" prop="phone" />
      <el-table-column label="状态" align="center" prop="recordstatus" />
      <el-table-column label="经办人" align="center" prop="createby" />
      <el-table-column label="申请日期" align="center" prop="createtime" />
      -->
      <el-table-column label="备注" align="left" prop="remark" />
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['project:funddetail:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['project:funddetail:remove']"
          >删除</el-button>
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
            v-hasPermi="['project:funddetail:edit']">修改</el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
            v-hasPermi="['project:funddetail:remove']">删除</el-button>
        </template>
      </el-table-column>
    </el-table>
    <pagination
      v-show="total>0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
      @pagination="getList" />
    <!-- 添加或修改费用申请明细对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
        <el-form-item label="费用申请主表ID" prop="fundid">
    <el-dialog :title="title" :visible.sync="open" width="1000px" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-row>
          <el-col :span="5"><el-form-item label="费用申请主表ID" prop="fundid">
          <el-input v-model="form.fundid" placeholder="请输入费用申请主表ID" />
        </el-form-item>
        <el-form-item label="收益人姓名 家属或专家" prop="beneficiaryname">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="收益人姓名 家属或专家" prop="beneficiaryname">
          <el-input v-model="form.beneficiaryname" placeholder="请输入收益人姓名 家属或专家" />
        </el-form-item>
        <el-form-item label="收益人编号" prop="beneficiaryno">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="收益人编号" prop="beneficiaryno">
          <el-input v-model="form.beneficiaryno" placeholder="请输入收益人编号" />
        </el-form-item>
        <el-form-item label="工作单位" prop="uintname">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="工作单位" prop="uintname">
          <el-input v-model="form.uintname" placeholder="请输入工作单位" />
        </el-form-item>
        <el-form-item label="工作单位编号" prop="uintno">
            </el-form-item></el-col>
        </el-row>
        <el-row>
          <el-col :span="5"><el-form-item label="工作单位编号" prop="uintno">
          <el-input v-model="form.uintno" placeholder="请输入工作单位编号" />
        </el-form-item>
        <el-form-item label="工作单位用户编号" prop="uintuserno">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="工作单位用户编号" prop="uintuserno">
          <el-input v-model="form.uintuserno" placeholder="请输入工作单位用户编号" />
        </el-form-item>
        <el-form-item label="证件类型 根据字典sys_IDType" prop="idcardtype">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="证件类型 根据字典sys_IDType" prop="idcardtype">
          <el-select v-model="form.idcardtype" placeholder="请选择证件类型 根据字典sys_IDType">
            <el-option label="请选择字典生成" value="" />
          </el-select>
        </el-form-item>
        <el-form-item label="证件号码" prop="idcardno">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="证件号码" prop="idcardno">
          <el-input v-model="form.idcardno" placeholder="请输入证件号码" />
        </el-form-item>
        <el-form-item label="性别 根据字典sys_user_sex" prop="sex">
            </el-form-item></el-col>
        </el-row>
        <el-row>
          <el-col :span="5"><el-form-item label="性别 根据字典sys_user_sex" prop="sex">
          <el-select v-model="form.sex" placeholder="请选择性别 根据字典sys_user_sex">
            <el-option label="请选择字典生成" value="" />
          </el-select>
        </el-form-item>
        <el-form-item label="与捐赠者关系 根据字典sys_FamilyRelation" prop="familyrelations">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="与捐赠者关系 根据字典sys_FamilyRelation" prop="familyrelations">
          <el-input v-model="form.familyrelations" placeholder="请输入与捐赠者关系 根据字典sys_FamilyRelation" />
        </el-form-item>
        <el-form-item label="联系电话" prop="phone">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="联系电话" prop="phone">
          <el-input v-model="form.phone" placeholder="请输入联系电话" />
        </el-form-item>
        <el-form-item label="开户银行" prop="depositbank">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="开户银行" prop="depositbank">
          <el-input v-model="form.depositbank" placeholder="请输入开户银行" />
        </el-form-item>
        <el-form-item label="卡号" prop="bankcardno">
            </el-form-item></el-col>
        </el-row>
        <el-row>
          <el-col :span="5"> <el-form-item label="卡号" prop="bankcardno">
          <el-input v-model="form.bankcardno" placeholder="请输入卡号" />
        </el-form-item>
        <el-form-item label="支行名称" prop="branchbankname">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="支行名称" prop="branchbankname">
          <el-input v-model="form.branchbankname" placeholder="请输入支行名称" />
        </el-form-item>
        <el-form-item label="银行卡照片路径 多个用;分开" prop="annexbankcard">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="银行卡照片路径 多个用;分开" prop="annexbankcard">
          <el-input v-model="form.annexbankcard" placeholder="请输入银行卡照片路径 多个用;分开" />
        </el-form-item>
        <el-form-item label="登记表照片路径 多个用;分开" prop="annexregistform">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="登记表照片路径 多个用;分开" prop="annexregistform">
          <el-input v-model="form.annexregistform" placeholder="请输入登记表照片路径 多个用;分开" />
        </el-form-item>
        <el-form-item label="费用类别 见字典sys_SubjectType" prop="applytype">
            </el-form-item></el-col>
        </el-row>
        <el-row>
          <el-col :span="5"><el-form-item label="费用类别 见字典sys_SubjectType" prop="applytype">
          <el-select v-model="form.applytype" placeholder="请选择费用类别 见字典sys_SubjectType">
            <el-option label="请选择字典生成" value="" />
          </el-select>
        </el-form-item>
        <el-form-item label="项目ID" prop="itemid">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="项目ID" prop="itemid">
          <el-input v-model="form.itemid" placeholder="请输入项目ID" />
        </el-form-item>
        <el-form-item label="项目名称" prop="itemname">
            </el-form-item></el-col>
          <el-col :span="5"> <el-form-item label="项目名称" prop="itemname">
          <el-input v-model="form.itemname" placeholder="请输入项目名称" />
        </el-form-item>
        <el-form-item label="项目类别" prop="itemtype">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="项目类别" prop="itemtype">
          <el-select v-model="form.itemtype" placeholder="请选择项目类别">
            <el-option label="请选择字典生成" value="" />
          </el-select>
        </el-form-item>
        <el-form-item label="申请金额" prop="amount">
            </el-form-item></el-col>
        </el-row>
        <el-row>
          <el-col :span="5"><el-form-item label="申请金额" prop="amount">
          <el-input v-model="form.amount" placeholder="请输入申请金额" />
        </el-form-item>
        <el-form-item label="预支金额" prop="prepaidamount">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="预支金额" prop="prepaidamount">
          <el-input v-model="form.prepaidamount" placeholder="请输入预支金额" />
        </el-form-item>
        <el-form-item label="发票张数" prop="invoicecount">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="发票张数" prop="invoicecount">
          <el-input v-model="form.invoicecount" placeholder="请输入发票张数" />
        </el-form-item>
        <el-form-item label="附件张数" prop="attachcount">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="附件张数" prop="attachcount">
          <el-input v-model="form.attachcount" placeholder="请输入附件张数" />
        </el-form-item>
        <el-form-item label="备注" prop="remark">
            </el-form-item></el-col>
        </el-row>
        <el-row>
          <el-col :span="5"><el-form-item label="备注" prop="remark">
          <el-input v-model="form.remark" placeholder="请输入备注" />
        </el-form-item>
        <el-form-item label="记录状态">
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="记录状态">
          <el-radio-group v-model="form.recordstatus">
            <el-radio label="1">请选择字典生成</el-radio>
          </el-radio-group>
        </el-form-item>
        <el-form-item label="上传标志" prop="uploadflag">
            </el-form-item></el-col>
          <el-col :span="5"> <el-form-item label="上传标志" prop="uploadflag">
          <el-input v-model="form.uploadflag" placeholder="请输入上传标志" />
        </el-form-item>
        <el-form-item label="上传时间" prop="uploadtime">
          <el-date-picker clearable size="small"
            v-model="form.uploadtime"
            type="date"
            value-format="yyyy-MM-dd"
            </el-form-item></el-col>
          <el-col :span="5"><el-form-item label="上传时间" prop="uploadtime">
              <el-date-picker clearable size="small" v-model="form.uploadtime" type="date" value-format="yyyy-MM-dd"
            placeholder="选择上传时间">
          </el-date-picker>
        </el-form-item>
            </el-form-item></el-col>
        </el-row>
      </el-form>
      <div slot="footer" class="dialog-footer">
        <el-button type="primary" @click="submitForm">确 定</el-button>
src/views/project/fundstatistics/index.vue
@@ -244,7 +244,6 @@
    //导出汇总表
    exportSummary(id) {
      exportFundCost(id).then((res) => {
        debugger;
        if (res.downloadUrl) {
          var fileUrl = res;
          //获取当前网址
src/views/project/indexstatistics/index.vue
@@ -858,7 +858,6 @@
        }
        this.organData = list;
      */
        debugger;
        let list = response.data;
        for (let i = 0; i < this.organData.length; i++) {
          let ii = list.findIndex(
@@ -1053,15 +1052,12 @@
      // getOrgansOfHospital
      // getOrgansOfHospitalByMonth
      getOrgansOfHospitalByMonth(param).then((response) => {
        // debugger
        if (response.code == 200) {
          let newConfig = {
            ...DEF_TABLE_CONFIG,
          };
          let arr = response.data;
          let dataList = [];
          debugger
          dataList = response.data.map((item) => {
            let li = [];
            li.push(
@@ -1095,7 +1091,6 @@
            return li;
          });
          newConfig.data = dataList;
          debugger
          this.config = newConfig;
        }
      });
@@ -1105,7 +1100,6 @@
    closeBaseInfoTab() {
      // 关闭指定页签
      // const obj = { path: "/organ/donatebaseinfo", name: "Donatebaseinfo" };
      // debugger
      // console.log(this.$tab)
      // this.$tab.closePage(obj);
    },
src/views/project/medicalcostfundapplycheck/index.vue
@@ -1379,7 +1379,6 @@
      this.personlist.map((res) => {
        if (row.beneficiaryname == res.username) {
          row.beneficiaryno = res.userno;
          debugger;
          row.beneficiaryname = res.username;
          row.bankcardno = res.bankcardno;
          row.branchbankname = res.branchbankname;
@@ -1407,7 +1406,6 @@
        console.log("登录用户信息", response.data);
        // this.defaultperson = response.data;
        // this.standardlevel = response.data.standardlevel;
        debugger;
        if (
          response.data.userName === "001" ||
          response.data.userName === "002" ||
src/views/project/organization/index.vue
@@ -1,333 +1,170 @@
<template>
  <div class="app-container">
    <el-form
      :model="queryParams"
      ref="queryForm"
      :inline="true"
      v-show="showSearch"
      label-width="68px"
    >
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="组织名称" prop="organizationname">
        <el-input
          v-model="queryParams.organizationname"
          placeholder="请输入组织名称"
          clearable
          size="small"
          @keyup.enter.native="handleQuery"
        />
        <el-input v-model="queryParams.organizationname" placeholder="请输入组织名称" clearable size="small"
          @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="机构类型" prop="organizationtype">
        <el-select
          v-model="queryParams.organizationtype"
          placeholder="请选择机构类型"
          clearable
          size="small"
        >
          <el-option
            v-for="dict in dict.type.sys_OrganizationType"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        <el-select v-model="queryParams.organizationtype" placeholder="请选择机构类型" clearable size="small">
          <el-option v-for="dict in dict.type.sys_OrganizationType" :key="dict.value" :label="dict.label"
            :value="dict.value" />
        </el-select>
      </el-form-item>
 <el-form-item label="所在地区" prop="regionallevel">
        <el-select
          v-model="queryParams.regionallevel"
          placeholder="请选择所在地区"
          clearable
          size="small"
        >
          <el-option
            v-for="dict in dict.type.sys_RegionalLevel"
            :key="dict.value"
            :label="dict.label"
            :value="dict.value"
          />
        <el-select v-model="queryParams.regionallevel" placeholder="请选择所在地区" clearable size="small">
          <el-option v-for="dict in dict.type.sys_RegionalLevel" :key="dict.value" :label="dict.label"
            :value="dict.value" />
        </el-select>
      </el-form-item>    
      <el-form-item>
        <el-button
          type="primary"
          icon="el-icon-search"
          size="mini"
          @click="handleQuery"
          >搜索</el-button
        >
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
          >重置</el-button
        >
        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-form-item>
    </el-form>
    <el-row :gutter="10" class="mb8">
      <el-col :span="1.5">
        <el-button
          type="primary"
          plain
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          >新增</el-button
        >
        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="success"
          plain
          icon="el-icon-edit"
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          >修改</el-button
        >
        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
          @click="handleUpdate">修改</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="danger"
          plain
          icon="el-icon-delete"
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          >删除</el-button
        >
        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
          @click="handleDelete">删除</el-button>
      </el-col>
      <el-col :span="1.5">
        <el-button
          type="warning"
          plain
          icon="el-icon-download"
          size="mini"
          :loading="exportLoading"
          @click="handleExport"
          >导出</el-button
        >
        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"
          @click="handleExport">导出</el-button>
      </el-col>
      <right-toolbar
        :showSearch.sync="showSearch"
        @queryTable="getList"
      ></right-toolbar>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-table
      v-loading="loading"
      :data="organizationList"
      @selection-change="handleSelectionChange"
    >
    <el-table v-loading="loading" :data="organizationList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <!-- <el-table-column label="主键自增" align="center" prop="id" /> -->
      <el-table-column label="机构类型" align="center" prop="organizationtype">
        <template slot-scope="scope">
          <dict-tag
            :options="dict.type.sys_OrganizationType"
            :value="scope.row.organizationtype"
          />
          <dict-tag :options="dict.type.sys_OrganizationType" :value="scope.row.organizationtype" />
        </template>
      </el-table-column>
      <el-table-column label="组织编号" align="left" prop="organizationid" />
      <el-table-column
        label="组织名称"
        width="260px"
        align="left"
        prop="organizationname"
      />
      <el-table-column label="组织名称" width="260px" align="left" prop="organizationname" />
      <el-table-column label="所在地区" align="left" prop="regionallevel">
        <template slot-scope="scope">
          <dict-tag
            :options="dict.type.sys_RegionalLevel"
            :value="scope.row.regionallevel"
          />
          <dict-tag :options="dict.type.sys_RegionalLevel" :value="scope.row.regionallevel" />
        </template>
      </el-table-column>
      <el-table-column
        label="地址"
        width="260px"
        align="left"
        prop="registeraddress"
      />
      <el-table-column label="地址" width="260px" align="left" prop="registeraddress" />
      <el-table-column label="联系人" align="left" prop="contactperson" />
      <el-table-column label="联系电话" align="left" prop="contactnumber" />
      <el-table-column
        label="注册时间"
        align="left"
        prop="registertime"
        width="180"
      >
      <el-table-column label="注册时间" align="left" prop="registertime" width="180">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.registertime, "{y}-{m}-{d}") }}</span>
        </template>
      </el-table-column>
      <el-table-column
        label="操作"
        align="left"
        class-name="small-padding fixed-width"
      >
      <el-table-column label="操作" align="left" class-name="small-padding fixed-width">
        <template slot-scope="scope">
          <el-button
            size="mini"
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            >修改</el-button
          >
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            >删除</el-button
          >
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">删除</el-button>
        </template>
      </el-table-column>
    </el-table>
    <pagination
      v-show="total > 0"
      :total="total"
      :page.sync="queryParams.pageNum"
      :limit.sync="queryParams.pageSize"
      @pagination="getList"
    />
    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
      @pagination="getList" />
    <!-- 添加或修改机构管理对话框 -->
    <el-dialog
      :title="title"
      :close-on-click-modal="false"
      :visible.sync="open"
      width="60%"
      append-to-body
    >
    <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="60%" append-to-body>
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-row style="overflow: hidden">
          <el-col :span="8">
            <el-form-item label="组织编号" prop="organizationid">
              <el-input
                v-model="form.organizationid"
                placeholder="请输入组织编号"
              />
          <el-col :span="5">
            <el-form-item label="所属地区" prop="regionallevel">
              <el-select v-model="form.regionallevel" placeholder="请选择地区">
                <el-option v-for="dict in dict.type.sys_RegionalLevel" :key="dict.value" :label="dict.label"
                  :value="dict.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="16">
          <el-col :span="10">
            <el-form-item label="组织名称" prop="organizationname">
              <el-input
                v-model="form.organizationname"
                placeholder="请输入组织名称"
              />
              <el-input v-model="form.organizationname" placeholder="请输入组织名称" />
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="组织编号" prop="organizationid">
              <el-input v-model="form.organizationid" placeholder="请输入组织编号" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row
          ><el-col :span="8">
        <el-row>
          <el-col :span="5">
            <el-form-item label="机构类型" prop="organizationtype">
              <el-select
                v-model="form.organizationtype"
                placeholder="请选择机构类型"
              >
                <el-option
                  v-for="dict in dict.type.sys_OrganizationType"
                  :key="dict.value"
                  :label="dict.label"
                  :value="dict.value"
                ></el-option>
              <el-select v-model="form.organizationtype" placeholder="请选择机构类型">
                <el-option v-for="dict in dict.type.sys_OrganizationType" :key="dict.value" :label="dict.label"
                  :value="dict.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
          <el-col :span="5">
            <el-form-item label="医院性质" prop="hospitalnature">
              <el-select
                v-model="form.hospitalnature"
                placeholder="请选择医院性质"
              >
                <el-option
                  v-for="dict in dict.type.sys_HospitalNature"
                  :key="dict.value"
                  :label="dict.label"
                  :value="dict.value"
                ></el-option>
              <el-select v-model="form.hospitalnature" placeholder="请选择医院性质">
                <el-option v-for="dict in dict.type.sys_HospitalNature" :key="dict.value" :label="dict.label"
                  :value="dict.value"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item
              label="医疗机构编号"
              prop="medicalcode"
            >
              <el-input
                v-model="form.medicalcode"
                placeholder="请输入医疗机构编号"
              />
          <el-col :span="5">
            <el-form-item label="医院编码" prop="medicalcode">
              <el-input v-model="form.medicalcode" placeholder="请输入医疗机构编号" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row
          ><el-col :span="8">
          <el-col :span="7">
            <el-form-item label="注册时间" prop="registertime">
              <el-date-picker
                clearable
                size="small"
                v-model="form.registertime"
                type="datetime"
                value-format="yyyy-MM-dd HH:mm:ss"
                placeholder="选择注册时间"
              >
              <el-date-picker clearable size="small" v-model="form.registertime" type="datetime"
                value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择注册时间">
              </el-date-picker>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="联系人" prop="contactperson">
              <el-input
                v-model="form.contactperson"
                placeholder="请输入联系人"
              />
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="联系电话" prop="contactnumber">
              <el-input
                v-model="form.contactnumber"
                placeholder="请输入联系电话"
              />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="8">
            <el-form-item label="所属地区" prop="regionallevel">
              <el-select v-model="form.regionallevel" placeholder="请选择地区">
                <el-option
                  v-for="dict in dict.type.sys_RegionalLevel"
                  :key="dict.value"
                  :label="dict.label"
                  :value="dict.value"
                ></el-option>
              </el-select>
          <el-col :span="10">
            <el-form-item label="注册地址" prop="registeraddress">
              <el-input v-model="form.registeraddress" placeholder="请输入注册地点详细地址" />
            </el-form-item>
          </el-col>
          <el-col :span="16">
            <el-form-item label="机构地址" prop="registeraddress">
              <el-input
                v-model="form.registeraddress"
                placeholder="请输入注册地点详细地址"
              />
          <el-col :span="5">
            <el-form-item label="联系人" prop="contactperson">
              <el-input v-model="form.contactperson" placeholder="请输入联系人" />
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="联系电话" prop="contactnumber">
              <el-input v-model="form.contactnumber" placeholder="请输入联系电话" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="10">
            <el-form-item label="银行名称" prop="bankname">
              <el-input v-model="form.bankname" placeholder="请输入银行名称" />
            </el-form-item>
          </el-col>
          <el-col :span="10">
            <el-form-item label="银行账号" prop="bankaccount">
              <el-input v-model="form.bankaccount" placeholder="请输入银行账号" />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-form-item label="介绍" prop="introduction">
            <el-input
              :rows="5"
              v-model="form.introduction"
              type="textarea"
              placeholder="请输入内容"
            />
            <el-input :rows="5" v-model="form.introduction" type="textarea" placeholder="请输入内容" />
          </el-form-item>
        </el-row>
        <el-row>
          <el-col :span="24">
            <el-form-item label="logo图片路径">
@@ -397,6 +234,9 @@
        organizationid: [
          { required: true, message: "组织编号不能为空", trigger: "blur" },
        ],
        regionallevel: [
          { required: true, message: "所属地市不能为空", trigger: "blur" },
        ],
      },
    };
  },
src/views/project/relativesconfirmation/index.vue
@@ -1267,10 +1267,7 @@
      };
      this.loading = true;
      this.curCase = row;
      debugger;
      console.log("32323232323", searchparam, row);
      listRelativesconfirmation(searchparam).then((response) => {
        console.log("wdadwadawdawd", response);
        this.loading = false;
        if (response.code == 200) {
          if (response.rows.length == 0) {
@@ -1925,7 +1922,6 @@
      const id = row.id || this.ids;
      downloadconfirmationinfo(id).then((response) => {
        debugger;
        var fileUrl = response;
        //获取当前网址
        var urlBase = process.env.VUE_APP_BASE_API;
src/views/project/travelexpenseslist/eidt.vue
@@ -24,8 +24,7 @@
                <el-col :span="7">
                    <el-form-item label="捐献者" prop="infoid">
                        <el-select v-model="form.infoid" @change="selectbaseinfo" filterable placeholder="请选择捐献者">
                            <el-option v-for="item in baselist" :key="item.index" :label="item.name"
                                :value="item.infoid">
                            <el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid">
                            </el-option>
                        </el-select>
                    </el-form-item>
@@ -34,8 +33,7 @@
            <el-row>
                <el-col :span="7">
                    <el-form-item label="出差人分类" prop="costtype">
                        <el-select v-model="form.costtype" value-key="value" placeholder="请选择出差人分类"
                            @change="getTravelers">
                        <el-select v-model="form.costtype" value-key="value" placeholder="请选择出差人分类" @change="getTravelers">
                            <el-option v-for="dict in dict.type.sys_travelexpensebelong" :key="dict.value"
                                :label="dict.label" :value="dict.value"></el-option>
                        </el-select>
@@ -138,8 +136,7 @@
                    </el-table-column>
                    <el-table-column prop="trafficexpense" label="交通费" align="center" width="100">
                        <template slot-scope="scope">
                            <el-input v-model="scope.row.trafficexpense" placeholder="交通费" @blur="
                                (val) => {
                            <el-input v-model="scope.row.trafficexpense" placeholder="交通费" @blur="(val) => {
                                    sumTotalFee();
                                }
                            " />
@@ -147,8 +144,7 @@
                    </el-table-column>
                    <el-table-column prop="cityfee" label="市内交通费" align="center" width="100">
                        <template slot-scope="scope">
                            <el-input v-model="scope.row.cityfee" placeholder="市内交通费" @blur="
                                (val) => {
                            <el-input v-model="scope.row.cityfee" placeholder="市内交通费" @blur="(val) => {
                                    sumTotalFee();
                                }
                            ">{{ Number(scope.row.cityfee).toFixed(2) }}
@@ -157,8 +153,7 @@
                    </el-table-column>
                    <el-table-column prop="hotelexpense" label="住宿费" align="center" width="100">
                        <template slot-scope="scope">
                            <el-input v-model="scope.row.hotelexpense" placeholder="住宿费" @blur="
                                (val) => {
                            <el-input v-model="scope.row.hotelexpense" placeholder="住宿费" @blur="(val) => {
                                    sumTotalFee();
                                }
                            " />
@@ -166,8 +161,7 @@
                    </el-table-column>
                    <el-table-column prop="otherexpense" label="杂费" align="center" width="100">
                        <template slot-scope="scope">
                            <el-input v-model="scope.row.otherexpense" placeholder="杂费" @blur="
                                (val) => {
                            <el-input v-model="scope.row.otherexpense" placeholder="杂费" @blur="(val) => {
                                    sumTotalFee();
                                }
                            " />
@@ -175,8 +169,7 @@
                    </el-table-column>
                    <el-table-column prop="foodexpenses" label="伙食费报销" align="center" width="100">
                        <template slot-scope="scope">
                            <el-input v-model="scope.row.foodexpenses" placeholder="伙食费报销" @blur="
                                (val) => {
                            <el-input v-model="scope.row.foodexpenses" placeholder="伙食费报销" @blur="(val) => {
                                    sumTotalFee();
                                }
                            " />
@@ -184,8 +177,7 @@
                    </el-table-column>
                    <el-table-column prop="foodallowance" label="伙食费补助" align="center" width="100">
                        <template slot-scope="scope">
                            <el-input v-model="scope.row.foodallowance" placeholder="伙食费补助" @blur="
                                (val) => {
                            <el-input v-model="scope.row.foodallowance" placeholder="伙食费补助" @blur="(val) => {
                                    sumTotalFee();
                                }
                            " />
@@ -193,8 +185,7 @@
                    </el-table-column>
                    <el-table-column prop="otherfeeamount" label="其他费用" align="center" width="100">
                        <template slot-scope="scope">
                            <el-input v-model="scope.row.otherfeeamount" placeholder="其他费用" @blur="
                                (val) => {
                            <el-input v-model="scope.row.otherfeeamount" placeholder="其他费用" @blur="(val) => {
                                    sumTotalFee();
                                }
                            " />
@@ -300,9 +291,8 @@
            </el-form-item> -->
                    <el-form-item label="文件上传" align="left" prop="annexfiles">
                        <!-- <file-upload ref="fileUpload" :fileType=fileType :limit="1" :on-success="handleUploadSuccess"></file-upload> -->
                        <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList"
                            multiple :limit="5" :headers="headers" :on-success="
                                (response, file, fileList) =>
                        <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple
                            :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
                                    uploadSccess(response, file, fileList)
                            " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
                            :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
@@ -685,7 +675,6 @@
    },
    //计算费用合计
    sumTotalFee() {
        // debugger;
        let allSum = 0;
        try {
            for (let i = 0; i < this.applicationDetailArr.length; i++) {
src/views/project/travelexpenseslist/index.vue
@@ -135,6 +135,7 @@
          <el-col :span="5">
            <el-form-item label="所属组别" prop="deptmentname">
              <el-input v-model="form.deptmentname" placeholder="所属组别" />
              <!--<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />-->
            </el-form-item>
          </el-col>
          <el-col :span="5">
@@ -323,7 +324,7 @@
                    if (scope.row.endtime) { return time.getTime() > new Date(scope.row.endtime.replace(/-/g, '/')) }
                  }
                }" clearable size="small" style="width: 100%" v-model="scope.row.starttime" type="date"
                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="开始日期" @blur="getallowance(scope.row)">
                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="开始日期" @blur="getdays(scope.row)">
                </el-date-picker>
              </template>
            </el-table-column>
@@ -334,7 +335,7 @@
                    if (scope.row.starttime) { return time.getTime() < new Date(scope.row.starttime.replace(/-/g, '/')) }
                  }
                }" clearable size="small" style="width: 100%" v-model="scope.row.endtime" type="date"
                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="结束日期" @blur="getallowance(scope.row)">
                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="结束日期" @blur="getdays(scope.row)">
                </el-date-picker>
              </template>
            </el-table-column>
@@ -343,21 +344,20 @@
                <el-input v-model="scope.row.departure" placeholder="出发地" />
              </template>
            </el-table-column>
            <el-table-column label="到达地" prop="destination2" align="center" width="140">
            <el-table-column label="到达地" prop="destination" align="center" width="140">
              <template slot-scope="scope">
                <!--  <el-input v-model="scope.row.destination" placeholder="到达地" @blur="getallowance(scope.row)" /> -->
                <el-select filterable allow-create v-model="scope.row.destination" value-key="value" placeholder="到达地"
                  @change="getallowance2(scope.row, scope.row.destination)">
                  @change="getallowance(scope.row)">
                  <el-option v-for="dict in dict.type.sys_area_name" :key="dict.value" :label="dict.label"
                    :value="dict.value"></el-option>
                    :value="dict.label"></el-option>
                </el-select>
              </template>
            </el-table-column>
            <el-table-column prop="days" label="天数" width="65" align="center">
              <template slot-scope="scope">
                <el-input v-model="scope.row.days" @blur="getStandard(scope.row)" placeholder="天数" />
                <el-input v-model="scope.row.days" @blur="getallowance(scope.row)" placeholder="天数" />
              </template>
            </el-table-column>
            <el-table-column prop="traffictype" label="出发交通工具" align="center" width="100">
@@ -379,7 +379,7 @@
            <el-table-column prop="trafficexpense" label="交通费" align="center" width="80">
              <template slot-scope="scope">
                <el-input v-model="scope.row.trafficexpense" placeholder="交通费" @blur="(val) => {
                  sumTotalFee();
                  sumRowFee(scope.row);
                }
                  " />
              </template>
@@ -389,7 +389,7 @@
              <template slot-scope="scope">
                <el-input v-model="scope.row.cityfee" placeholder="市内交通费" @blur="
                  (val) => {
                    sumTotalFee();
                    sumRowFee(scope.row);
                  }
                ">{{ Number(scope.row.cityfee).toFixed(2) }}
                </el-input>
@@ -399,7 +399,7 @@
            <el-table-column prop="hotelexpense" label="住宿费" align="center" width="80">
              <template slot-scope="scope">
                <el-input v-model="scope.row.hotelexpense" placeholder="住宿费" @blur="(val) => {
                  sumTotalFee();
                  sumRowFee(scope.row);
                }
                  " />
              </template>
@@ -408,7 +408,7 @@
            <el-table-column prop="foodexpenses" label="餐费报销" align="center" width="80">
              <template slot-scope="scope">
                <el-input v-model="scope.row.foodexpenses" placeholder="伙食费报销" @blur="(val) => {
                  sumTotalFee();
                  sumRowFee(scope.row);
                }
                  " />
              </template>
@@ -416,7 +416,7 @@
            <el-table-column prop="foodallowance" label="伙食补助" align="center" width="80">
              <template slot-scope="scope">
                <el-input v-model="scope.row.foodallowance" placeholder="伙食费补助" @blur="(val) => {
                  sumTotalFee();
                  sumRowFee(scope.row);
                }
                  " />
              </template>
@@ -424,7 +424,7 @@
            <el-table-column prop="otherexpense" label="公杂费补助" align="center" width="80">
              <template slot-scope="scope">
                <el-input v-model="scope.row.otherexpense" placeholder="杂费" @blur="(val) => {
                  sumTotalFee();
                  sumRowFee(scope.row);
                }
                  " />
              </template>
@@ -433,7 +433,7 @@
            <el-table-column prop="otherfeeamount" label="其他费用" align="center" width="90">
              <template slot-scope="scope">
                <el-input v-model="scope.row.otherfeeamount" placeholder="其他费用" @blur="(val) => {
                  sumTotalFee();
                  sumRowFee(scope.row);
                }
                  " />
              </template>
@@ -524,7 +524,7 @@
            </el-table-column><el-table-column prop="paiddate" slot="" label="打款日期" fixed align="center" width="150">
              <template slot-scope="scope">
                <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.paiddate" type="date"
                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="打款日期" :disabled="true" @blur="getallowance(scope.row)">
                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="打款日期" :disabled="true">
                </el-date-picker>
              </template>
            </el-table-column>
@@ -580,8 +580,8 @@
                                                                                              -->
            <el-form-item label="文件上传" align="left" prop="annexfiles">
              <!-- <file-upload ref="fileUpload" :fileType=fileType :limit="1" :on-success="handleUploadSuccess"></file-upload> -->
              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
                :headers="headers" :on-success="(response, file, fileList) =>
              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple
                :limit="20" :headers="headers" :on-success="(response, file, fileList) =>
                  uploadSccess(response, file, fileList)
                  " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
                :on-exceed="handleExceed" :on-remove="remove" accept="image/*,.pdf">
@@ -611,6 +611,8 @@
</template>
<script>
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import { listDonatebaseinfo } from "@/api/project/donatebaseinfo";
import { listReimbursementpayee, addReimbursementpayee, updateReimbursementpayee } from "@/api/project/reimbursementpayee";
import {
@@ -636,12 +638,14 @@
import { getInfoBytheUserNo } from "@/api/project/externalperson";
import { regionDataPlus, CodeToText } from "element-china-area-data";
import Li_area_select from "@/components/Address";
import { getUserProfile } from "@/api/system/user";
import { getUser,getUserProfile } from "@/api/system/user";
import { treeselect } from "@/api/system/dept";
import { getSubsidy } from "@/api/project/travelcity";
import { listReportname, listUser } from "@/api/project/organization";
import { getToken } from "@/utils/auth";
export default {
  components: {
    Treeselect,
    Li_area_select,
  },
  name: "Funddetail",
@@ -669,6 +673,8 @@
      personsList: [],
      //下拉可以选择人员列表  
      personsSel: [],
      // 部门树选项
      deptOptions: undefined,
      costtypeobj: {
        value: 0,
@@ -713,7 +719,7 @@
        remark: null,
        departure: null,
        endtime: null,
        destination2: null,
        destination: null,
        uploadFlag: null,
        uploadTime: null,
        // orderByColumn: "createTime",
@@ -723,6 +729,11 @@
      queryParams2: {
        persontype: null,
        arriveAddr: null,
      },
      feesParams: {
        beneficiaryNo: null,
        starttime: null,
        endtime: null,
      },
      //查询付款
      queryParamsPayee: {
@@ -806,6 +817,8 @@
    //获取登录者信息
    this.getUsermsg();
    //获取部门信息
    //this.getTreeselect();
  },
  methods: {
@@ -837,6 +850,13 @@
      getUserProfile().then((response) => {
        this.defaultperson = response.data;
        this.standardlevel = response.data.standardlevel;
      });
    },
    /** 查询部门下拉树结构 */
    getTreeselect() {
      treeselect().then(response => {
        this.deptOptions = response.data;
      });
    },
@@ -918,23 +938,25 @@
      }
    },
    //计算补助
    getallowance(row) {
      if (
        row.starttime != "" &&
        row.starttime != null &&
        row.endtime != "" &&
        row.endtime != null
      ) {
    //计算日期
    getdays(row) {
      if (row.starttime != "" && row.starttime != null && row.endtime != "" && row.endtime != null) {
        //计算天数
        row.days = (Math.floor(Math.abs(Date.parse(row.starttime) - Date.parse(row.endtime)) / (1000 * 3600 * 24)) + 1).toString()
      } else {
        row.days = '';
        row.days = 0;
      };
      //计算补助
      this.getallowance(row);
    },
    //计算补助
    getallowance(row) {
      console.log("ro",row);
      //公杂费补助:杭州桐庐,建德,淳安60,杭州其他地区0,非杭州地区80
      if (row.destination2 != "") {
        var tempStr = row.destination2;
      if (row.destination != "") {
        var tempStr = row.destination;
        //验证城市
        if (tempStr == "杭州") {
@@ -952,11 +974,10 @@
      row.foodallowance = (parseInt(row.days) * 100).toString();
      //计算合计
      this.sumTotalFee();
      this.sumRowFee(row);
    },
    getallowance2(row, val2) {
      // this.getallowance(row);
      this.arriveAddr = val2;
      this.queryParams2.arriveAddr;
      this.queryParams2.personType = row;
@@ -1001,7 +1022,7 @@
            row.hotelexpense = fee;
          })
          .finally(() => {
            this.sumTotalFee(row);
            this.sumTotalFee();
          });
      }
    },
@@ -1014,7 +1035,7 @@
        row.searchAddress.shi != "" &&
        row.searchAddress.qu != ""
      ) {
        row.destination2 =
        row.destination =
          row.searchAddress.sheng +
          row.searchAddress.shi +
          row.searchAddress.qu;
@@ -1250,17 +1271,19 @@
        getReimbursementdetaillist(ids).then((res) => {
          this.rbDetails = res.data;
          if (this.rbDetails.length == 0) { this.addDetailRow(0); }
          for (let i = 0; i < this.rbDetails.length; i++) {
            this.sumRowFee(this.rbDetails[i]);
          //解析出差地址
          /*
          for (let i = 0; i < this.rbDetails.length; i++) {
            this.rbDetails[i].index = i;
            this.rbDetails[i].searchAddress = {
              sheng: this.rbDetails[i].travelprovincename,
              shi: this.rbDetails[i].travelcityname,
              qu: this.rbDetails[i].traveltownname,
            };
              }; */
          }
          */
          //实时合计金额
          //this.sumTotalFee();
        });
@@ -1300,9 +1323,11 @@
        listFundflow(listFundflowparams).then((res) => {
          this.fundflowList = res.rows;
        });
        //报销明细
        getReimbursementdetaillist(ids).then((res) => {
          this.rbDetails = res.data;
          /*
          for (let i = 0; i < this.rbDetails.length; i++) {
            this.rbDetails[i].index = i;
            this.rbDetails[i].searchAddress = {
@@ -1311,10 +1336,13 @@
              qu: this.rbDetails[i].traveltownname,
            };
          }
          //this.sumTotalFee();
          */
        });
        //账户
        if (this.rbDetails.length > 0) this.sumTotalFee();
        //付款信息
        this.queryParamsPayee.rbid = ids;
        listReimbursementpayee(this.queryParamsPayee).then((res) => {
          this.rbPayees = res.rows;
@@ -1509,7 +1537,7 @@
        starttime: null,
        departure: null,
        endtime: null,
        destination2: null,
        destination: null,
        days: null,
        trafficexpense: 0,
        traffictype: null,
@@ -1610,11 +1638,11 @@
              this.$modal.msgSuccess("删除成功");
              rows.splice(index, 1);
              this.recountOrderNo2();
              // this.sumTotalFee();
              this.sumTotalFee();
            });
          } else {
            rows.splice(index, 1);
            //this.sumTotalFee();
            this.sumTotalFee();
            this.$modal.msgSuccess("删除成功");
            this.recountOrderNo2();
          }
@@ -1672,9 +1700,66 @@
        });
    },
    //计算一行合计
    //计算当前行报销内容费用合计
    sumRowFee(row) {
      let totalFee = 0;
      if (!isNaN(parseFloat(row.trafficexpense))) {
        totalFee += parseFloat(row.trafficexpense);
      }
      if (!isNaN(parseFloat(row.cityfee))) {
        totalFee += parseFloat(row.cityfee);
      }
      if (!isNaN(parseFloat(row.hotelexpense))) {
        totalFee += parseFloat(row.hotelexpense);
      }
      if (!isNaN(parseFloat(row.otherexpense))) {
        totalFee += parseFloat(row.otherexpense);
      }
      if (!isNaN(parseFloat(row.foodexpenses))) {
        totalFee += parseFloat(row.foodexpenses);
      }
      if (!isNaN(parseFloat(row.foodallowance))) {
        totalFee += parseFloat(row.foodallowance);
      }
      if (!isNaN(parseFloat(row.otherfeeamount))) {
        totalFee += parseFloat(row.otherfeeamount);
      }
      row.total = totalFee;
      /*
      if (!isNaN(parseFloat(this.rbDetails[rowIndex].trafficexpense))) {
        totalFee += parseFloat(this.rbDetails[rowIndex].trafficexpense);
      }
      if (!isNaN(parseFloat(this.rbDetails[rowIndex].cityfee))) {
        totalFee += parseFloat(this.rbDetails[rowIndex].cityfee);
      }
      if (!isNaN(parseFloat(this.rbDetails[rowIndex].hotelexpense))) {
        totalFee += parseFloat(this.rbDetails[rowIndex].hotelexpense);
      }
      if (!isNaN(parseFloat(this.rbDetails[rowIndex].otherexpense))) {
        totalFee += parseFloat(this.rbDetails[rowIndex].otherexpense);
      }
      if (!isNaN(parseFloat(this.rbDetails[rowIndex].foodexpenses))) {
        totalFee += parseFloat(this.rbDetails[rowIndex].foodexpenses);
      }
      if (!isNaN(parseFloat(this.rbDetails[rowIndex].foodallowance))) {
        totalFee += parseFloat(this.rbDetails[rowIndex].foodallowance);
      }
      if (!isNaN(parseFloat(this.rbDetails[rowIndex].otherfeeamount))) {
        totalFee += parseFloat(this.rbDetails[rowIndex].otherfeeamount);
      }
      this.rbDetails[rowIndex].total = parseFloat(totalFee).toFixed(2);
      this.$set(this.rbDetails, rowIndex, this.rbDetails[rowIndex]);
      */
      //重新计算整个报销单的合计
      this.sumTotalFee();
    },
    //计算费用合计
    sumTotalFee() {
      let allSum = 0;
      //捐献者家属费用
      if (!isNaN(parseFloat(this.form.donoramount))) {
        allSum += parseFloat(this.form.donoramount);
@@ -1683,10 +1768,11 @@
      //报销明细费用
      try {
        for (let i = 0; i < this.rbDetails.length; i++) {
          /*
          let totalFee = 0;
          //计算当前报销内容费用合计
          if (!isNaN(parseFloat(this.rbDetails[i].trafficexpense))) {
            totalFee += parseFloat(this.rbDetails[i].trafficexpense);
          if (!isNaN(parseFloat(this.rbDetails[i].total))) {
            totalFee += parseFloat(this.rbDetails[i].total);
          }
          if (!isNaN(parseFloat(this.rbDetails[i].cityfee))) {
            totalFee += parseFloat(this.rbDetails[i].cityfee);
@@ -1708,6 +1794,8 @@
          }
          this.rbDetails[i].total = parseFloat(totalFee).toFixed(2);
          this.$set(this.rbDetails, i, this.rbDetails[i]);
          */
          if (!isNaN(parseFloat(this.rbDetails[i].total))) {
            allSum += parseFloat(this.rbDetails[i].total);
          }
@@ -1716,21 +1804,6 @@
        this.form.amountrequested = allSum.toFixed(2);
        this.form.bigstrmoney = this.convertCurrency(this.form.amountrequested);
      } catch { }
    },
    getDetailArr(rbid) {
      getReimbursementdetaillist(rbid).then((res) => {
        this.rbDetails = res.data;
        for (let i = 0; i < this.rbDetails.length; i++) {
          this.rbDetails[i].index = i;
          this.rbDetails[i].searchAddress = {
            sheng: this.rbDetails[i].travelprovincename,
            shi: this.rbDetails[i].travelcityname,
            qu: this.rbDetails[i].traveltownname,
          };
        }
        this.sumTotalFee();
      });
    },
    //金额数字转换成大写
src/views/project/travelexpenseslistrecord/index.vue
@@ -519,7 +519,7 @@
          <el-col :span="14">
            <el-form-item label="文件上传" align="left" prop="annexfiles">
              <!-- <file-upload ref="fileUpload" :fileType=fileType :limit="1" :on-success="handleUploadSuccess"></file-upload> -->
              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="5"
              <el-upload size="mini" class="upload-demo" :action="uploadFileUrl" :file-list="fileList" multiple :limit="20"
                :headers="headers" :on-success="(response, file, fileList) =>
                  uploadSccess(response, file, fileList)
                  " :on-preview="downFile" :disabled='dialogType == "detail"' :on-error="handleUploadError"
src/views/system/medicalevalustion/index.vue
@@ -417,7 +417,6 @@
        donorno: data.donorno,
      };
      this.loading = true;
      // debugger;
      listMedicalevaluation(searchParam).then((response) => {
        this.loading = false;
        if (response.code == 200) {
vue.config.js