1

yxh

2023-07-20 42deb933c04571578b8bf408ada9ca1dcc8d3dd8

1

 package.json

@@ -54,7 +54,6 @@
    "jsencrypt": "3.0.0-rc.1",
    "moment": "^2.29.3",
    "nprogress": "0.2.0",
    "pdfjs-dist": "^3.8.162",
    "prettier": "^1.8.1",
    "quill": "1.3.7",
    "screenfull": "5.0.2",

 public/favicon.ico

 src/views/project/donatebaseinfo/index.vue

@@ -167,15 +167,7 @@
          <el-row>
            <el-col :span="6">
              <el-form-item align="left" label="姓名" prop="name">
                <el-input v-model="form.name" placeholder="请输入姓名" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="性别" prop="sex">
                <el-select v-model="form.sex" placeholder="请选择性别">
                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.label" :label="dict.label"
                    :value="parseInt(dict.value)"></el-option>
                </el-select>
                <el-input v-model="form.name" placeholder="必填项" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
@@ -191,8 +183,12 @@
                <el-input v-model="form.nativeplace" placeholder="请输入国籍" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="国籍" prop="nationality">
                <el-input v-model="form.nationality" placeholder="请输入国籍" />
              </el-form-item>
            </el-col>
          </el-row>

          <el-row>
            <el-col :span="6">
              <el-form-item label="证件类型" prop="idcardtype">
@@ -206,9 +202,27 @@
              <el-form-item label="证件号码" prop="idcardno">
                <el-input style="width: 174px" ref="updateBSvalue" class="sfzcode" v-model="form.idcardno"
                  placeholder="请输入证件号码" @blur="updateMessage" />
              </el-form-item> </el-col><el-col :span="6">
              <el-form-item label="国籍" prop="nationality">
                <el-input v-model="form.nationality" placeholder="请输入国籍" />
              </el-form-item> </el-col>
            <el-col :span="6">
              <el-form-item label="性别" prop="sex">
                <el-select v-model="form.sex" placeholder="请输入性别">
                  <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.label" :label="dict.label"
                    :value="parseInt(dict.value)"></el-option>
                </el-select>
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="年龄" prop="age">
                <el-input v-model="form.age" placeholder="请输入年龄" />
              </el-form-item>
            </el-col>
          </el-row>
          <el-row>            
            <el-col :span="6">
              <el-form-item label="出生日期" prop="birthday">
                <el-date-picker clearable size="small" v-model="form.birthday" type="date" style="width: 174px"
                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择出生日期">
                </el-date-picker>
              </el-form-item>
            </el-col>
            <el-col :span="6">
@@ -219,20 +233,7 @@
                </el-select>
              </el-form-item>
            </el-col>
          </el-row>

          <el-row>
            <el-col :span="6">
              <el-form-item label="年龄" prop="age">
                <el-input v-model="form.age" placeholder="请输入年龄" />
              </el-form-item>
            </el-col>
            <el-col :span="6">
              <el-form-item label="出生日期" prop="birthday">
                <el-date-picker clearable size="small" v-model="form.birthday" type="date" style="width: 174px"
                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择出生日期">
                </el-date-picker>
              </el-form-item> </el-col><el-col :span="6">
              <el-form-item label="学历" prop="education">
                <el-select v-model="form.education" placeholder="请选择学历">
                  <el-option v-for="dict in dict.type.sys_education" :key="dict.value" :label="dict.label"
@@ -241,7 +242,6 @@
              </el-form-item>
            </el-col>
          </el-row>

          <el-row>
            <el-col :span="12">
              <el-form-item label="住址" prop="residenceaddress">

 src/views/project/donateconsolationfundlist/index.vue

@@ -60,8 +60,8 @@
            </template>
          </el-table-column>
          <el-table-column label="捐献者" align="center" prop="donorname" width="120px" />
          <el-table-column label="捐献编号" align="center" prop="donorno" />
          <!--<el-table-column label="财务审核" align="center" prop="financechecher" width="140" />-->
          <!--<el-table-column label="捐献编号" align="center" prop="donorno" />
          <el-table-column label="财务审核" align="center" prop="financechecher" width="140" />-->
          <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" width="160px">
            <template slot-scope="scope">
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"

 src/views/project/externalperson/index.vue

@@ -1,16 +1,16 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
      <el-form-item label="人员编号" prop="userno">
        <el-input v-model="queryParams.userno" placeholder="请输入人员编号" clearable size="small"
      <el-form-item label="账号编号" prop="userno">
        <el-input v-model="queryParams.userno" placeholder="请输入账号编号" clearable size="small"
          @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="人员名称" prop="username">
        <el-input v-model="queryParams.username" placeholder="请输入人员名称" clearable size="small"
      <el-form-item label="账号名称" prop="username">
        <el-input v-model="queryParams.username" placeholder="请输入账号名称" clearable size="small"
          @keyup.enter.native="handleQuery" />
      </el-form-item>
      <el-form-item label="人员类别" prop="usertype">
        <el-select v-model="queryParams.usertype" placeholder="请选择人员类别" clearable size="small">
      <el-form-item label="账号类别" prop="usertype">
        <el-select v-model="queryParams.usertype" placeholder="请选择账号类别" clearable size="small">
          <el-option v-for="dict in dict.type.sys_UserType" :key="dict.value" :label="dict.label" :value="dict.value" />
        </el-select>
      </el-form-item>
@@ -42,26 +42,32 @@

    <el-table v-loading="loading" :data="externalpersonList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="人员编号" align="center" prop="userno" />
      <el-table-column label="人员姓名" align="center" prop="username" />
      <el-table-column label="身份证号" width="200" align="center" prop="idcardno" />
      <el-table-column label="性别" align="center" prop="sex">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" /> </template></el-table-column>
      <el-table-column label="职称" align="center" prop="title">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_professionaltitle" :value="scope.row.title" /> </template></el-table-column>
      <el-table-column label="单位名称" width="200" align="center" prop="unitname" />
      <el-table-column label="单位工作编号" align="center" prop="personnelunitno" />
      <el-table-column label="联系电话" width="200" align="center" prop="telephone" />
      <el-table-column label="联系地址" width="250" align="center" prop="address" />
      <el-table-column label="人员类别" align="center" prop="usertype">
      <el-table-column label="账号类别" align="center" prop="usertype">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_UserType" :value="scope.row.usertype" />
        </template>
      </el-table-column>
      <el-table-column label="在职状态" align="center" prop="userstatus"><template slot-scope="scope">
          <dict-tag :options="dict.type.sys_0_1" :value="scope.row.userstatus" /> </template></el-table-column>
      <el-table-column label="账号编号" align="center" prop="userno" />
      <el-table-column label="账号名称" align="center" prop="username" />
      <el-table-column label="身份证号" width="200" align="center" prop="idcardno" />
      <el-table-column label="职称" align="center" prop="title">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_professionaltitle" :value="scope.row.title" /> </template></el-table-column>
      <el-table-column label="单位名称" width="250" align="center" prop="unitname" />
      <!--
      <el-table-column label="性别" align="center" prop="sex">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_user_sex" :value="scope.row.sex" />
        </template>
      </el-table-column>
      <el-table-column label="单位工作编号" align="center" prop="personnelunitno" />
      <el-table-column label="在职状态" align="center" prop="userstatus">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_0_1" :value="scope.row.userstatus" />
        </template>
      </el-table-column>
      <el-table-column label="联系电话" width="200" align="center" prop="telephone" />
      <el-table-column label="联系地址" width="250" align="center" prop="address" />-->x
      <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)"
@@ -76,53 +82,51 @@
      @pagination="getList" />

    <!-- 添加或修改外围单位人员对话框 -->
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body :close-on-click-modal="false">
      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
        <el-row><el-col :span="12">
            <el-form-item label="人员编号" prop="userno">
              <el-input v-model="form.userno" placeholder="请输入人员编号" /> </el-form-item></el-col><el-col
            :span="12"><el-form-item label="人员类别" prop="usertype">
              <el-select v-model="form.usertype" placeholder="请选择人员类别">
        <el-row><el-col :span="12"><el-form-item label="账号类别" prop="usertype">
              <el-select v-model="form.usertype" placeholder="请选择账号类别">
                <el-option v-for="dict in dict.type.sys_UserType" :key="dict.value" :label="dict.label"
                  :value="dict.value"></el-option>
              </el-select> </el-form-item></el-col></el-row><el-row>
              </el-select> </el-form-item></el-col><el-col :span="12">
            <el-form-item label="账号编号" prop="userno">
              <el-input v-model="form.userno" placeholder="请输入账号编号" /> </el-form-item></el-col></el-row><el-row>
          <el-col :span="12">
            <el-form-item label="人员姓名" prop="username">
              <el-input v-model="form.username" placeholder="请输入人员姓名" /> </el-form-item></el-col>
          <el-col :span="12">
            <el-form-item label="账号名称" prop="username">
              <el-input v-model="form.username" placeholder="请输入账号名称" /> </el-form-item></el-col><el-col :span="12">
            <el-form-item label="联系电话" prop="telephone">
              <el-input v-model="form.telephone" placeholder="请输入联系电话" /> </el-form-item></el-col>
        </el-row><el-row v-if="form.usertype != 'org'"><el-col :span="24">
            <el-form-item label="身份证号" prop="idcardno">
              <el-input v-model="form.idcardno" placeholder="请输入身份证号" /> </el-form-item></el-col></el-row><el-row
          v-if="form.usertype != 'org'"><el-col :span="12">
            <el-form-item label="性别" prop="sex">
              <el-select v-model="form.sex" placeholder="请选择性别">
                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
                  :value="dict.value"></el-option> </el-select></el-form-item></el-col><el-col :span="12"><el-form-item
              label="职称" prop="title">
              <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 v-if="form.usertype != 'org'"><el-col :span="24">
            <el-form-item label="所在单位" prop="unitname">
              <el-input v-model="form.unitname" placeholder="请输入单位名称" /> </el-form-item></el-col></el-row><el-row
          v-if="form.usertype != 'org'"><el-col :span="12">
            <el-form-item label="单位人员编号" prop="personnelunitno">
              <el-input v-model="form.personnelunitno" placeholder="请输入单位人员编号" />
            </el-form-item></el-col><el-col :span="12">
            <el-form-item label="在职状态" prop="userstatus">
              <el-radio-group v-model="form.userstatus">
                <el-radio v-for="dict in dict.type.sys_0_1" :key="dict.value" :label="parseInt(dict.value)">{{ dict.label
                }}</el-radio>
              </el-radio-group>
            </el-form-item></el-col></el-row><el-row><el-col :span="24">
            <el-form-item label="身份证号" prop="idcardno">
              <el-input v-model="form.idcardno" placeholder="请输入身份证号" /> </el-form-item></el-col></el-row><el-row><el-col
            :span="12">
            <el-form-item label="性    别" prop="sex">
              <el-select v-model="form.sex" placeholder="请选择性别">
                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
                  :value="dict.value"></el-option> </el-select></el-form-item></el-col><el-col :span="12">
            <el-form-item label="联系电话" prop="telephone">
              <el-input v-model="form.telephone" placeholder="请输入联系电话" /> </el-form-item></el-col></el-row><el-row><el-col
            :span="24">
            <el-form-item label="联系地址" prop="address">
              <el-input v-model="form.address" placeholder="请输入联系地址" /> </el-form-item></el-col></el-row><el-row><el-col
            :span="24">
            <el-form-item label="单位名称" prop="unitname">
              <el-input v-model="form.unitname" placeholder="请输入单位名称" /> </el-form-item></el-col></el-row><el-row><el-col
            :span="12">
            <el-form-item label="单位人员编号" prop="personnelunitno">
              <el-input v-model="form.personnelunitno" placeholder="请输入单位人员编号" /> </el-form-item></el-col><el-col
            :span="12"><el-form-item label="职    称" prop="title">
              <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="24"><el-form-item label="开户银行" prop="depositbank">
            </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-form-item></el-col></el-row><el-row><el-col :span="24">
            <el-form-item label="联系地址" prop="address">
              <el-input v-model="form.address" 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>
@@ -191,7 +195,6 @@
    getList() {
      this.loading = true;
      listExternalperson(this.queryParams).then((response) => {
        console.log("listExternalperson", response.rows);
        this.externalpersonList = response.rows;
        this.total = response.total;
        this.loading = false;
@@ -265,6 +268,7 @@
            });
          } else {
            addExternalperson(this.form).then((response) => {
              console.log("addExternalperson", response);
              this.$modal.msgSuccess("新增成功");
              this.open = false;
              this.getList();

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

@@ -9,7 +9,6 @@
              @keyup.enter.native="handleQuery" />
          </el-form-item>
        </el-col>

        <el-col :span="6">
          <el-form-item label="捐献进度" prop="recordstate">
            <el-select v-model="queryParams.recordstate" placeholder="请选择记录状态" clearable size="small">
@@ -87,14 +86,11 @@
                </el-table-column>
                <el-table-column label="所属组别" align="center" prop="deptmentname" width="220px" />
                <el-table-column label="组长" align="center" prop="managername" width="150px" />
                <!-- <el-table-column
                  label="申请金额"
                  align="center"
                  prop="amountrequested"
                  width="120px"
                                      />    
                <!-- 
                <el-table-column label="申请金额" align="center" prop="amountrequested" width="120px" />    
                <el-table-column label="联系电话" align="center" prop="phone" width="150px" />
                <el-table-column label="工作单位" align="center" prop="unitname" width="220px" /> -->
                <el-table-column label="工作单位" align="center" prop="unitname" width="220px" /> 
                -->
                <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width"
                  width="280px">
                  <template slot-scope="scope">
@@ -284,7 +280,7 @@
                  placeholder="请选择"
                >
                  <el-option
                    v-for="item in arrr3"
                    v-for="item in expertlist"
                    :key="item.reportNo"
                    :label="item.reportName"
                    :value="item.reportName"
@@ -439,21 +435,29 @@
      </div>
    </el-dialog>

    <el-dialog :visible.sync="detailInfoDialogShow" :close-on-click-modal="false" :title="'信息修改'" width="500px"
    <el-dialog :visible.sync="showDetailInfoDialog" :close-on-click-modal="false" :title="'导入信息'" width="500px"
      style="text-align: center" v-loading="loading">
      <el-form ref="funddetailForm" :model="funddetailForm">
        <el-row>
          <el-col :span="24" v-if="detailInfoDialogShowType == 'name'">
          <el-col :span="24" v-if="showDetailInfoDialogType == 'name'">
            <el-form-item label="请选择专家信息：" prop="expertfrom">
              <el-radio-group v-model="expertfrom" style="margin-bottom: 0">
                <el-radio label="1">专家库</el-radio>
                <el-radio label="2">新增专家</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
          <el-col :span="24" v-if="showDetailInfoDialogType == 'name' && expertfrom == '1'">
            <el-form-item label="专家姓名" prop="beneficiaryname" label-width="80px">
              <el-select filterable allow-create ref="beneficiaryname" default-first-option
                v-model="funddetailForm.beneficiaryname" placeholder="请选择" style="width: 100%">
                <el-option v-for="item in arrr3" :key="item.reportNo" :label="item.reportName" :value="item.reportName">
                <el-option v-for="item in expertlist" :key="item.reportNo" :label="item.reportName"
                  :value="item.reportName">
                </el-option>
              </el-select>
            </el-form-item>
          </el-col>

          <el-col :span="24" v-if="detailInfoDialogShowType == 'unit'">
          <el-col :span="24" v-if="showDetailInfoDialogType == 'unit'">
            <el-form-item label="单位名称" prop="unitno" label-width="80px">
              <el-select v-model="funddetailForm.unitno" placeholder="单位名称" clearable filterable allow-create
                style="width: 100%">
@@ -463,9 +467,65 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="12" v-if="expertfrom == '2'">
            <el-form-item label="专家姓名" prop="expertname" label-width="80px">
              <el-input v-model="funddetailForm.expertname" placeholder="必填项" />
            </el-form-item>
          </el-col>
          <el-col :span="12" v-if="expertfrom == '2'">
            <el-form-item label="职    称" prop="experttitle" label-width="80px">
              <el-select v-model="funddetailForm.experttitle" placeholder="必填项">
                <el-option v-for="dict in dict.type.sys_professionaltitle" :key="dict.value" :label="dict.label"
                  :value="dict.label"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="24" v-if="expertfrom == '2'">
            <el-form-item label="身份证号" prop="expertidcardno" label-width="80px">
              <el-input v-model="funddetailForm.expertidcardno" placeholder="必填项" />
            </el-form-item>
          </el-col>
        </el-row>
        <!--
        <el-row>
          <el-col :span="12" v-if="expertfrom == '2'">
            <el-form-item label="人员类别" prop="usertype" label-width="80px">
              <el-select v-model="funddetailForm.usertype" placeholder="必填项">
                <el-option v-for="dict in dict.type.sys_UserType" :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="24" v-if="expertfrom == '2'">
            <el-form-item label="单位名称" prop="expertunitno" label-width="80px">
              <el-select v-model="funddetailForm.expertunitno" placeholder="单位名称" clearable filterable allow-create
                style="width: 100%">
                <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
                  :value="spec.organizationid"></el-option>
              </el-select>
            </el-form-item></el-col>
        </el-row>
        <el-row>
          <el-col :span="24" v-if="expertfrom == '2'">
            <el-form-item label="开户银行" prop="expertdepositbank" label-width="80px">
              <el-input v-model="funddetailForm.expertdepositbank" placeholder="必填项" />
            </el-form-item>
          </el-col>
          <el-col :span="24" v-if="expertfrom == '2'">
            <el-form-item label="银行卡号" prop="expertbankcardno" label-width="80px">
              <el-input v-model="funddetailForm.expertbankcardno" placeholder="必填项" />
            </el-form-item>
          </el-col>
        </el-row>
      </el-form>
      <span slot="footer" class="dialog-footer">
        <el-button @click="detailInfoDialogShow = false">取 消</el-button>
        <el-button @click="showDetailInfoDialog = false">取 消</el-button>
        <el-button type="primary" @click="ConfirmDetailDialog()">确 定</el-button>
      </span>
    </el-dialog>
@@ -477,7 +537,7 @@
//例如：import 《组件名称》 from '《组件路径》';
import {
  listDonatebaseinfo,
  getDonatebaseinfo,
  getDonatebaseinfo
} from "@/api/project/donatebaseinfo";
import {
  onelistFund,
@@ -493,7 +553,7 @@
  getdownloadYX,
  getdownloadBX,
  batchUploadFund,
  getdetailsByItemId,
  getdetailsByItemId
} from "@/api/project/fund";
import {
  onelistFunds,
@@ -520,7 +580,7 @@
  listOrganization,
  getOrganization,
  listReportname,
  listUser,
  listUser
} from "@/api/project/organization";
import {
  listExternalperson,
@@ -529,7 +589,7 @@
  delExternalperson,
  addExternalperson,
  updateExternalperson,
  exportExternalperson,
  exportExternalperson
} from "@/api/project/externalperson";
import { getUserProfile } from "@/api/system/user";
import Li_area_select from "@/components/Address";
@@ -545,25 +605,24 @@
  },
  name: "fundApply",
  dicts: [
    "sys_consolationfundlevel",
    "sys_OrganizationType",
    //"sys_consolationfundlevel",
    //"sys_OrganizationType",
    "sys_DonationStatus",
    "sys_depositbank",
    "sys_FamilyRelation",
    "sys_IDType",
    "sys_ConsolationType",
    "sys_fund_type",
    "sys_finsubject",
    "sys_financeitemtype",
    "sys_expensetype",
    //"sys_depositbank",
    //"sys_FamilyRelation",
    //"sys_IDType",
    //"sys_ConsolationType",
    //"sys_fund_type",
    //"sys_finsubject",
    //"sys_financeitemtype",
    //"sys_expensetype",
    "sys_recordstatus",
    "sys_professionaltitle"
  ],
  data() {
    //这里存放数据
    return {
      arrr2: [],
      arrr3: [],
      currentApplyType: "1",

      // 遮罩层
      loading: true,
      // 导出遮罩层
@@ -592,17 +651,29 @@
        applytype: "1",
        createBy: null,
      },

      // 表单参数
      form: {},
      //所有人员表
      personlist: [],
      expertQueryParam: {
        pageNum: 1,
        pageSize: 10000,
        userno: null,
        username: null,
        usertype: null,
      },
      //申请单类型
      currentApplyType: "1",
      //专家列表
      expertlist: [],
      //专家费选择：1是专家库，2是新增
      expertfrom: "1",
      //计算个税参数
      taxParam: {
        beneficiaryNo: '',
        money: '0',
        startTime: '',
      },

      // 表单参数
      form: {},
      personlist: [],
      // 表单校验
      rules: {
        username: [
@@ -652,18 +723,54 @@
      //是否是专家费的OPO审批人员
      ismanager: false,



      unitList: [],
      dialogType: "edit",
      fundflowList: [],

      detailInfoDialogShow: false,
      detailInfoDialogShowType: "",
      showDetailInfoDialog: false,
      showDetailInfoDialogType: "",
      funddetailForm: {
        index: null,
        beneficiaryname: null,
        beneficiaryno: null,
        unitno: null,
        unitname: null,
        index: null,
        expertname: null,
        expertidcardno: null,
        expertunitno: null,
        expertunitname: null,
        experttitle: null,
        expertdepositbank: null,
        expertbankcardno: null,
      },
      expertform: {
        id: null,
        address: null,
        bankcardno: null,
        branchbankname: null,
        createBy: null,
        createTime: null,
        del_flag: null,
        depositbank: null,
        idcardno: null,
        personnelunitno: null,
        pym: null,
        remark: null,
        searchValue: null,
        sex: null,
        telephone: null,
        title: null,
        unitname: null,
        unitno: null,
        updateBy: null,
        updateTime: null,
        username: null,
        userno: null,
        userstatus: 1,
        usertype: null,
        wbm: null,
      },

      //附件列表
@@ -687,13 +794,22 @@
  //方法集合
  methods: {
    ShowDetailDialog(spoce, showType) {
      this.expertfrom = "1";
      this.funddetailForm.index = spoce.$index;
      this.funddetailForm.beneficiaryname = spoce.row.beneficiaryname;
      this.funddetailForm.beneficiaryno = spoce.row.beneficiaryno;
      this.funddetailForm.unitno = spoce.row.unitno;
      this.funddetailForm.unitname = spoce.row.unitname;
      this.detailInfoDialogShow = true;
      this.detailInfoDialogShowType = showType;
      this.funddetailForm.expertname = "";
      this.funddetailForm.expertidcardno = "";
      this.funddetailForm.expertunitno = "";
      this.funddetailForm.expertunitname = "";
      this.funddetailForm.experttitle = "";
      this.funddetailForm.expertdepositbank = "";
      this.funddetailForm.expertbankcardno = "";

      this.showDetailInfoDialog = true;
      this.showDetailInfoDialogType = showType;
    },

    ConfirmDetailDialog() {
@@ -701,23 +817,90 @@
      let tempName = this.funddetailForm.beneficiaryname;
      let tempUnitname = this.funddetailForm.unitname;
      let singleDetail = this.fundDetails[tempIndex];
      if (this.detailInfoDialogShowType == "name") {
        this.personlist.map((res) => {
          if (tempName == res.username) {
            singleDetail.beneficiaryno = res.userno;
            singleDetail.beneficiaryname = res.username;
            singleDetail.bankcardno = res.bankcardno;
            singleDetail.branchbankname = res.branchbankname;
            singleDetail.depositbank = res.depositbank;
            singleDetail.idcardno = res.idcardno;
            singleDetail.phone = res.telephone;
            singleDetail.title = res.title;
            singleDetail.unitname = res.unitname;
            singleDetail.unitno = parseInt(res.unitno);
          }
        });

      } else if (this.detailInfoDialogShowType == "unit") {
      if (this.showDetailInfoDialogType == "name") {

        if (this.expertfrom == "1") {
          //从专家列表获取信息
          this.personlist.map((res) => {
            if (tempName == res.username) {
              console.log("选择专家", res);
              singleDetail.beneficiaryno = res.userno;
              singleDetail.beneficiaryname = res.username;
              singleDetail.bankcardno = res.bankcardno;
              singleDetail.branchbankname = res.branchbankname;
              singleDetail.depositbank = res.depositbank;
              singleDetail.idcardno = res.idcardno;
              singleDetail.phone = res.telephone;
              singleDetail.title = res.title;
              singleDetail.unitname = res.unitname;
              singleDetail.unitno = parseInt(res.unitno);
            }
          });
        } else {
          //保存新增专家
          this.expertform.id = null;
          this.expertform.userno = this.personlist[this.personlist.length - 1].id + 1;
          this.expertform.usertype = "expert";
          this.expertform.username = this.funddetailForm.expertname;
          this.expertform.idcardno = this.funddetailForm.expertidcardno;
          this.expertform.sex = null;
          this.expertform.telephone = null;
          this.expertform.address = null;
          this.expertform.wbm = null;
          this.expertform.pym = null;

          this.expertform.unitno = this.funddetailForm.expertunitno;
          try {
            let unitIndex = this.unitList.findIndex(
              (item) => this.expertform.unitno == item.organizationid
            );
            if (unitIndex > -1) {
              this.expertform.unitname = this.unitList[unitIndex].organizationname;
            } else {
              this.expertform.unitname = this.expertform.unitno;
            }
          } catch {
            this.expertform.unitname = this.expertform.unitno;
          }
          this.expertform.title = this.funddetailForm.experttitle;
          this.expertform.personnelunitno = null;

          this.expertform.depositbank = this.funddetailForm.expertdepositbank;
          this.expertform.bankcardno = this.funddetailForm.expertbankcardno;
          this.expertform.branchbankname = null;
          this.expertform.remark = null;
          this.expertform.del_flag = "0";

          addExternalperson(this.expertform).then((response) => {
            if (response.code == 200) {
              this.$modal.msgSuccess("新增专家信息成功！");
              
              listExternalperson().then((res) => {
                this.personlist = res.rows;
                console.log("new personlist", this.personlist);
                //从专家列表获取信息
                this.personlist.map((res) => {
                  if (res.username == this.funddetailForm.expertname) {
                    console.log("新增专家", res);
                    singleDetail.beneficiaryno = res.userno;
                    singleDetail.beneficiaryname = res.username;
                    singleDetail.bankcardno = res.bankcardno;
                    singleDetail.branchbankname = res.branchbankname;
                    singleDetail.depositbank = res.depositbank;
                    singleDetail.idcardno = res.idcardno;
                    singleDetail.phone = res.telephone;
                    singleDetail.title = res.title;
                    singleDetail.unitname = res.unitname;
                    singleDetail.unitno = parseInt(res.unitno);
                  }
                });
              });
            }
          });
        }

      } else if (this.showDetailInfoDialogType == "unit") {
        singleDetail.unitno = this.funddetailForm.unitno;
        try {
          let unitIndex = this.unitList.findIndex(
@@ -734,7 +917,7 @@
      }

      this.fundDetails[tempIndex] = singleDetail;
      this.detailInfoDialogShow = false;
      this.showDetailInfoDialog = false;
    },

    handleup(row) {
@@ -1174,7 +1357,12 @@
          for (let k = 0; k < this.fundDetails.length; k++) {
            let tempDetail = this.fundDetails[k];
            if (tempDetail.itemid == null) {
              this.$modal.msgWarning("服务项目是必选项，请选择服务项目后再提交保存！");
              this.$modal.msgWarning("服务项目表中，第" + (k + 1).toString() + "行的服务项目未选择，请先选择服务项目后再提交保存！");
              return;
            }

            if (tempDetail.servicesscope == null) {
              this.$modal.msgWarning("服务项目表中，第" + (k + 1).toString() + "行的费用说明未选择,请选择费用说明后再提交保存！");
              return;
            }

@@ -1203,7 +1391,7 @@
              //获取参数
              this.taxParam.beneficiaryNo = tempDetail.beneficiaryno;
              this.taxParam.money = tempDetail.amount.toString();
              this.taxParam.startTime = this.form.createTime.substring(0, 10); 
              this.taxParam.startTime = this.form.createTime.substring(0, 10);
              getTaxByBeneFiciaryNo(this.taxParam).then((res) => {
                if (res.code == 200) {
                  tempDetail.taxamount = res.data;
@@ -1220,7 +1408,6 @@
              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;
@@ -1338,18 +1525,18 @@

    //专家人员列表
    selectReporters() {
      let arr = ["expert"];
      let arrreportlist = [];
      for (let i = 0; i < arr.length; i++) {
        this.arrr2 = [];
        listReportname(arr[i]).then((res) => {
      let types = ["expert"];
      let templist = [];
      for (let i = 0; i < types.length; i++) {
        templist = [];
        listReportname(types[i]).then((res) => {
          for (let j = 0; j < res.data.length; j++) {
            this.arrr2.push({
            templist.push({
              reportName: res.data[j].reportName,
              reportNo: res.data[j].reportNo,
            });
          }
          this.arrr3 = this.arrr3.concat(this.arrr2);
          this.expertlist = this.expertlist.concat(templist);
        });
      }
    },
@@ -1426,6 +1613,10 @@
            //   });
            // });
          }

          if (this.fundDetails.length == 0) {
            this.addRow();
          }
        });
      });
    },
@@ -1468,6 +1659,10 @@
              servicesscope: this.fundDetails[m].servicesscope,
            });
          }

          if (this.fundDetails.length == 0) {
            this.addRow();
          }
        });
      });
    },

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

@@ -55,6 +55,7 @@
                <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
                  v-hasPermi="['project:medicalfund:add']">医学成本申请</el-button>
              </el-col>

              <el-col :span="9">
                <el-form-item label="捐献编号">
                  <el-input v-model="curCase.donorno" :disabled="true"></el-input>
@@ -167,7 +168,7 @@
            <el-form-item label="申请金额" prop="amountrequested">
              <el-input v-model="form.amountrequested" placeholder="申请金额" :disabled="true" />
            </el-form-item>
          </el-col> <el-col :span="5">
          </el-col> <!--<el-col :span="5">
            <el-form-item label="税前金额" prop="pretaxcost">
              <el-input v-model="form.pretaxcost" placeholder="税前金额合计" :disabled="true" />
            </el-form-item>
@@ -179,13 +180,13 @@
          </el-col>
          <el-col :span="5">
            <el-form-item label="审核状态" prop="recordstatus">
              <!--<el-input v-if="0" v-model="form.recordstatus" placeholder="审核意见"/>-->
              <el-input v-if="0" v-model="form.recordstatus" placeholder="审核意见"/>
              <el-select v-model="form.recordstatus" placeholder="请选择审核状态" clearable size="small" :disabled="true">
                <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
                  :value="dict.value" />
              </el-select>
            </el-form-item>
          </el-col>
          </el-col>-->
          <!--
          <el-col :span="5">
            <el-form-item label="联系电话" prop="phone">
@@ -318,7 +319,7 @@
                  " />
              </template>
            </el-table-column>
            <el-table-column prop="unitno" align="center" label="单位" width="220">
            <el-table-column prop="unitno" align="center" label="费用单位名称" width="220">
              <template slot-scope="scope">
                <el-button type="primary" plain @click="ShowDetailDialog(scope, 'unit')">{{ scope.row.unitname
                }}</el-button>
@@ -423,11 +424,11 @@
        <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="20"
                :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">
                :on-exceed="handleExceed" :on-remove="handleremove" accept="image/*,.pdf">
                <el-button :disabled='dialogType == "detail"' size="small" type="primary">上传</el-button>
              </el-upload>
            </el-form-item>
@@ -452,7 +453,7 @@
      </div>
    </el-dialog>

    <el-dialog :visible.sync="detailInfoDialogShow" :close-on-click-modal="false" :title="'信息修改'"
    <el-dialog :visible.sync="detailInfoDialogShow" :close-on-click-modal="false" :title="'费用单位选择'"
      style="text-align: center" v-loading="loading" width="500px">
      <el-form ref="funddetailForm" :model="funddetailForm" label-width="120px">
        <el-row>
@@ -466,11 +467,11 @@
            </el-form-item>
          </el-col>
          <el-col :span="24" v-if="detailInfoDialogShowType == 'unit'">
            <el-form-item align="left" label="单位" prop="unitno" label-width="80px">
              <el-select v-model="funddetailForm.unitno" placeholder="单位" clearable filterable allow-create
            <el-form-item align="left" label="单位名称" prop="unitno" label-width="80px">
              <el-select v-model="funddetailForm.unitno" placeholder="请选择单位" clearable filterable allow-create
                style="width: 100%">
                <el-option v-for="(spec, index) in unitList" :key="index" :label="spec.organizationname"
                  :value="spec.organizationid"></el-option>
                <el-option v-for="(item, index) in bankaccountlist" :key="index" :label="item.reportName"
                  :value="item.reportNo"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
@@ -588,6 +589,7 @@
        reportername: null,
        reporttime: null,
      },

      fundQueryParam: {
        pageNum: 1,
        pageSize: 100,
@@ -631,15 +633,18 @@

      // 弹出层标题
      title: "",
      userlist: [],
      itemArr: [],
      reporters: [],
      //用户
      userlist: [],
      //银行账号
      bankaccountlist: [],
      //机构单位
      unitList: [],
      //费用类型数组
      fundtypeArr: [],
      defaultperson: {},
      fundblock: [],
      fundtypeArrAll: [],
      unitList: [],
      dialogType: "edit",

      detailInfoDialogShow: false,
@@ -656,10 +661,10 @@
      fileList: [],
      //上传附件路径
      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",

      headers: {
        Authorization: "Bearer " + getToken(),
      },

    };
  },
  //监听属性 类似于data概念
@@ -677,6 +682,7 @@
      this.detailInfoDialogShow = true;
      this.detailInfoDialogShowType = showType;
    },

    ConfirmDetailDialog() {
      let tempIndex = this.funddetailForm.index;
      let tempName = this.funddetailForm.beneficiaryname;
@@ -694,7 +700,7 @@
            singleDetail.phone = res.telephone;
            singleDetail.title = res.title;
            singleDetail.unitname = res.unitname;
            singleDetail.unitno = parseInt(res.unitno);
            singleDetail.unitno = res.unitno;
          } else {
            singleDetail.beneficiaryname = tempName;
            singleDetail.beneficiaryno = tempName;
@@ -702,13 +708,17 @@
        });
      } else if (this.detailInfoDialogShowType == "unit") {
        singleDetail.unitno = this.funddetailForm.unitno;
        console.log("this.funddetailForm", this.funddetailForm);
        try {
          let unitIndex = this.unitList.findIndex(
            (item) => singleDetail.unitno == item.organizationid
          let unitIndex = this.bankaccountlist.findIndex(
            (item) => singleDetail.unitno == item.reportNo
          );

          console.log("this.bankaccountlist[unitIndex]", this.bankaccountlist[unitIndex]);
          if (unitIndex > -1) {
            singleDetail.unitno = this.unitList[unitIndex].organizationid;
            singleDetail.unitname = this.unitList[unitIndex].organizationname;
            singleDetail.unitname = this.bankaccountlist[unitIndex].reportName;
            singleDetail.depositbank = this.bankaccountlist[unitIndex].depositbank;
            singleDetail.bankcardno = this.bankaccountlist[unitIndex].bankcardno;
          } else {
            singleDetail.unitname = singleDetail.unitno;
          }
@@ -716,6 +726,7 @@
          singleDetail.unitname = singleDetail.unitno;
        }
      }
      console.log("singleDetail",singleDetail);
      this.fundDetailArr[tempIndex] = singleDetail;
      this.detailInfoDialogShow = false;
    },
@@ -1032,11 +1043,11 @@
            //判断单位 unitSel
            // try {
            //   //获取服务项目明细
            //   let unitIndex = this.unitList.findIndex(
            //     (item) => tempDetail.unitno == item.organizationid
            //   let unitIndex = this.bankaccountlist.findIndex(
            //     (item) => tempDetail.unitno == item.reportNo
            //   );
            //   if (unitIndex > -1) {
            //     tempDetail.unitname = this.unitList[unitIndex].organizationname;
            //     tempDetail.unitname = this.bankaccountlist[unitIndex].reportName;
            //   } else {
            //     tempDetail.unitname = tempDetail.unitno;
            //   }
@@ -1129,10 +1140,11 @@
      });
    },

    selectReporters() {
    getBankAccount() {
      //专家人员列表
      listReportname("gdc").then((res) => {
        this.reporters = res.data;
      listReportname("org").then((res) => {
        this.bankaccountlist = res.data;
        console.log("this.bankaccountlist", this.bankaccountlist);
      });
    },

@@ -1378,11 +1390,14 @@
    },

    getUnitList() {
      listOrganization(3).then((response) => {
        for (let i = 0; i < response.rows.length; i++) {
      listOrganization(3).then((res) => {
        console.log("listOrganization", res);
        for (let i = 0; i < res.rows.length; i++) {
          this.unitList.push({
            organizationid: response.rows[i].organizationid,
            organizationname: response.rows[i].organizationname,
            organizationid: res.rows[i].organizationid,
            organizationname: res.rows[i].organizationname,
            bankname: res.rows[i].bankname,
            bankaccount: res.rows[i].bankaccount,
          });
        }
      });
@@ -1461,7 +1476,7 @@

    //文件上传
    handleUploadError() { },
    remove(file) {
    handleremove(file) {
      this.fileList.splice(this.fileList.indexOf(file), 1)
    },
    handleExceed() {
@@ -1469,6 +1484,9 @@
    },
    //文件上传成功回调
    uploadSccess(response, file, fileList) {
      console.log("response", response);
      console.log("file", file);
      console.log("fileList", fileList);
      //获取附件信息位置
      if (response.code == 200) {
        this.form.filename = file.raw.name;
@@ -1491,15 +1509,16 @@

  //生命周期 - 创建完成（可以访问当前this实例）
  created() {
    this.getUnitList();
    this.getList();
    this.getBaseInfoList();
    this.getlistUser();

    this.getCurFundType();
    this.getlistUser();
    // this.getUnitList();
  },
  //生命周期 - 挂载完成（可以访问DOM元素）
  mounted() {
    this.selectReporters();
    this.getBankAccount();
    this.getUsermsg();
  },
  beforeCreate() { }, //生命周期 - 创建之前

 src/views/project/medicalcostfundapplycheck/index.vue

@@ -48,7 +48,7 @@
          <el-table-column label="所属组别" align="center" prop="deptmentname" width="140px" />
          <el-table-column label="组长" align="center" prop="managername" width="120px" />
          <el-table-column label="捐献者" align="center" prop="donorname" width="120px" />
          <el-table-column label="捐献编号" align="center" prop="donorno" />
          <!--<el-table-column label="捐献编号" align="center" prop="donorno" />-->
          <el-table-column label="申请金额" align="center" prop="amountrequested" width="120px" />
          <el-table-column label="预支费用" align="center" prop="prepaidamount" width="120px" />
          <!--<el-table-column label="工作单位" align="center" prop="unitname" width="230px" />
@@ -131,7 +131,7 @@
              <el-radio-group v-model="form.applytype" @change="LoadItemTypeArr">
                <!--<el-radio v-for="dict in dict.type.sys_financeitemtype" :key="dict.value" :label="dict.value"
                  :disabled="form.id != null">{{ dict.label }}</el-radio>-->
                <el-radio v-model="form.applytype" label="3">伦理审查专家费申请</el-radio>
                <el-radio v-model="form.applytype" label="3">医学成本费用申请</el-radio>
              </el-radio-group>
            </el-form-item>
          </el-col>
@@ -168,7 +168,7 @@
            <el-form-item label="合计金额" prop="amountrequested">
              <el-input v-model="form.amountrequested" placeholder="申请金额" :disabled="true" />
            </el-form-item>
          </el-col>
          </el-col><!--
          <el-col :span="5">
            <el-form-item label="税前金额" prop="amountrequested">
              <el-input v-model="form.pretaxcost" placeholder="税前金额合计" :disabled="true" />
@@ -181,13 +181,12 @@
          </el-col>
          <el-col :span="5">
            <el-form-item label="申请状态" prop="recordstatus">
              <!-- <el-input v-model="form.recordstatus" placeholder="审核意见"/> -->
              <el-select v-model="form.recordstatus" placeholder="请选择审核状态" clearable size="small" :disabled="true">
                <el-option v-for="dict in dict.type.sys_recordstatus" :key="dict.value" :label="dict.label"
                  :value="dict.value" />
              </el-select>
            </el-form-item>
          </el-col>
          </el-col>-->
        </el-row>
        <el-row>
          <el-col :span="4">
@@ -333,6 +332,21 @@
            </el-table-column>
          </el-table>
        </el-row>

        <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="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">
                <el-button :disabled='dialogType == "detail"' size="small" type="primary">上传</el-button>
              </el-upload>
            </el-form-item>
          </el-col>
        </el-row>

        <el-row style="margin-top: 5px; margin-bottom: 5px">
          <el-table :data="fundflowList" border>
            <el-table-column label="审核人" align="center" prop="checkusername" />
@@ -433,6 +447,7 @@
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
import { getUserProfile } from "@/api/system/user";
import { getToken } from "@/utils/auth";

export default {
  components: {
@@ -602,6 +617,15 @@
      approveLevel: 5,
      fundtypeArrAll: [],
      dialogType: "edit",

      //附件列表
      fileList: [],
      //上传附件路径
      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
      headers: {
        Authorization: "Bearer " + getToken(),
      },

    };
  },
  watch: {},
@@ -618,7 +642,6 @@
  },
  methods: {
    selectapplication() {
      console.log("时间", this.createTime);
      this.queryParams.APPLICATIONBEGTIME = this.createTime[0];
      this.queryParams.APPLICATIONENDTIME = this.createTime[1];
    },
@@ -626,8 +649,6 @@
      this.loading = true;
      // this.queryParams.params = {};
      listbypower(this.queryParams).then((res) => {
        //console.log("根据权限显示列表", res);
        console.log("根据权限显示列表", res);
        this.loading = false;
        let list = res.rows;
        let arr = [];
@@ -638,7 +659,6 @@
    dundcheck() {
      // this.$em
      this.dialogOpen = false;
      console.log("1234567", this.newobj, this.form.flowconclusion);
      let checkfundobj = {
        flowconclusion: this.newobj.flowlevelone,
        flowcontent: this.newobj.flowconclusion,
@@ -646,8 +666,6 @@
      };
      checkfund(checkfundobj).then((res) => {
        this.reset();
        this.$modal.msgSuccess("审核完成!");
        console.log("审核费用", res);
        this.$modal.msgSuccess("审核完成!");
        this.getlistbypower();
      });
@@ -782,12 +800,9 @@
    change(scope) { },
    autodonorno() {
      listDonatebaseinfo().then((res) => {
        // console.log("所有捐献者列表：",res);
        res.rows.forEach((data) => {
          // console.log("data:",data);
          if (this.form.doname === data.name) {
            this.form.donorno = data.donorno;
            console.log(this.form.donorno);
          } else {
            // this.$modal.alertWarning("对不起，无该捐献人");
          }
@@ -847,6 +862,9 @@
        applytype: "3",
      };
      this.resetForm("form");

      //清空附件
      this.fileList = []
    },

    /** 搜索按钮操作 */
@@ -868,7 +886,6 @@
    },
    /** 新增按钮操作 */
    handleAdd() {
      console.log("222", this.curCase);
      if (this.curCase.id) {
        this.istrue += 2;
        this.reset();
@@ -908,6 +925,8 @@
      getFund(id).then((response) => {
        this.form = response.data;
        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.loading = false;
@@ -916,7 +935,6 @@
            this.fundDetailArr[m].itemArr = [];
            this.getItemArr(m, this.fundDetailArr[m]);
          }
          console.log("fundDetailArr:" + JSON.stringify(this.fundDetailArr));
        });
      });
    },
@@ -942,6 +960,9 @@
      getFund(row.id).then((response) => {
        this.form = response.data;
        this.form.name = this.curCase.name;
        //附件处理
        this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []

        getownFundDetail(row.id).then((res) => {
          this.fundDetailArr = res.data;
          for (let m = 0; m < this.fundDetailArr.length; m++) {
@@ -953,7 +974,6 @@
    },

    select(row) {
      console.log("测试开始", row.itemid, row.itemArr);
      row.itemArr.map((res) => {
        if (row.itemid === res.id) {
          row.remark = res.itemdescribe;
@@ -965,7 +985,6 @@
        }
      });
      listcountItem(this.form.infoid, row.itemid).then((res) => {
        console.log("resresresres", res);
        if (res.data > 0) {
          this.$modal.msgWarning("您已经提交过该服务项目");
        }
@@ -981,7 +1000,7 @@
            servivesscope: item.id,
          });
        });
        console.log("组装后的数据", fundblock);

        this.fundblock = fundblock;
      });
    },
@@ -1086,7 +1105,6 @@
    },

    saverow(row, index, rows) {
      console.log("dwadw", index, rows, row);
      let totallist = this.fundDetailArr;
      if (this.form.id) {
        if (!row.id) {
@@ -1151,14 +1169,12 @@
                    this.$set(this.fundDetailArr, res.data);
                    this.sumTotalFee();
                    // this.fundDetailArr = res.data
                    // console.log('删除后',this.fundDetailArr)
                  });
                });
              }
              // getownFundDetail(this.form.id).then(res=>{
              // this.$set(this.fundDetailArr,res.data)
              // this.fundDetailArr = res.data
              // console.log('删除后',this.fundDetailArr)
              // })
            });
          } else {
@@ -1244,7 +1260,6 @@
      })
        .then(() => {
          updateFunddetail(this.fundDetailArr).then((res) => {
            console.log("牛丸牛啊", res);
          });
        })
        .catch(() => {
@@ -1257,10 +1272,8 @@
      //判断数据明细数据是否正确
      let detailDataCorrect = true;
      for (let i = 0; i < this.applicationDetailArr.length; i++) {
        // console.log('qqq',this.applicationDetailArr[i]);
        let tempData = this.applicationDetailArr[i];
        Object.keys(tempData).forEach(function (key) {
          // console.log('iii',key, tempData[key]);
          if (
            tempData[key] == null ||
            tempData[key] == undefined ||
@@ -1336,7 +1349,6 @@
    //获取费用类型
    getCurFundType() {
      getFundTypeAll(3).then((res) => {
        console.log("费用类型", res.data);
        let dataList = res.data;
        this.fundtypeArrAll = dataList;
        this.fundtypeArr = [];
@@ -1370,7 +1382,6 @@
        listReportname(arr[i]).then((res) => {
          this.arrr2 = res.data;
          this.arrr3 = this.arrr3.concat(this.arrr2);
          console.log("adadadadasdsad", this.arrr3, this.userlist);
        });
      }
    },
@@ -1403,7 +1414,6 @@

    getUsermsg() {
      getUserProfile().then((response) => {
        console.log("登录用户信息", response.data);
        // this.defaultperson = response.data;
        // this.standardlevel = response.data.standardlevel;
        if (
@@ -1415,7 +1425,6 @@
        } else {
          this.show = 3;
        }
        console.log("where", this.show);
      });
    },

@@ -1449,7 +1458,6 @@
    dayin() {
      if (this.form.id) {
        const id = this.form.id;
        console.log(id);
        getdownloadLW(id).then((res) => {
          if (res.downloadUrl) {
            var fileUrl = res;
@@ -1565,7 +1573,6 @@
    dayin4() {
      const id = this.form.id;
      // getdownloadLL(id).then(res=>{
      //   console.log('劳务下载',res);
      // })
    },
    // 捐献者家属交通食宿打印
@@ -1589,7 +1596,6 @@
              type: "success",
            });
          }
          console.log("家属伙食交通费", res);
        });
      } else {
        this.$alert("请确认您要下载的专家劳务表", "提醒", {
@@ -1598,6 +1604,36 @@
        });
      }
    },

    //文件上传
    handleUploadError() { },
    remove(file) {
      this.fileList.splice(this.fileList.indexOf(file), 1)
    },
    handleExceed() {
      this.$message.error(`上传文件数量不能超过 ${5} 个!`);
    },
    //文件上传成功回调
    uploadSccess(response, file, fileList) {
      //获取附件信息位置
      if (response.code == 200) {
        this.form.filename = file.raw.name;
        this.$modal.msgSuccess(response.msg);
        this.fileList.push({ name: response.fileName, url: response.fileName });
      } else {
        this.$modal.msgError(response.msg);
      }
    },
    // 下载文件
    downFile(item) {
      const url = process.env.VUE_APP_BASE_API + item.url
      var a = document.createElement('a');
      var event = new MouseEvent('click');
      a.download = item.name;
      a.href = url;
      a.dispatchEvent(event);
    },

  },
};
</script>

 src/views/project/organallocation/index.vue

@@ -83,7 +83,7 @@
        </el-card>
      </el-col>
      <el-col :span="16">
      <!-- <div class="grid-content bg-purple-dark" style="width:100%;height:800px;background-color:purple">
        <!-- <div class="grid-content bg-purple-dark" style="width:100%;height:800px;background-color:purple">
                                         </div> -->
        <el-card shadow="never">
          <el-form ref="infoForm" :model="organalForm" label-width="80px">
@@ -105,7 +105,7 @@
            <el-form-item label="选择器官">
              <el-checkbox-group v-model="organalForm.organname">
                <el-checkbox v-for="dict in dict.type.sys_Organ" :key="dict.value" :label="dict.value"
                  @click="changeorganState(dict.value)" @change="changeorganState(dict.value)">
                  @change="changeorganState(dict.value)">
                  {{ dict.label }}
                </el-checkbox>
              </el-checkbox-group>
@@ -688,7 +688,6 @@
            //更新捐献器官表
            this.form.allocationstatus = this.form.organstate;
            updateOrganallocation(this.form).then((response) => {
              this.$modal.msgSuccess("修改成功");
            });
            //获取器官信息
            getDonateorgan(this.form.organid).then((response2) => {
@@ -699,13 +698,9 @@

              organData.transplanthospitalno = this.form.transplanthospitalno;
              try {
                organData.transplanthospitalname =
                  this.$refs.tranHosSelect.getOptionByValue(
                    organData.transplanthospitalno
                  ).organizationname;
                organData.transplanthospitalname = this.$refs.tranHosSelect.getOptionByValue(organData.transplanthospitalno).organizationname;
              } catch {
                organData.transplanthospitalname =
                  organData.transplanthospitalno;
                organData.transplanthospitalname = organData.transplanthospitalno;
              }
              //更新捐献器官表
              updateDonateorgan(organData).then((response3) => {
@@ -731,15 +726,10 @@
              transplantdoct: this.form.transplantdoct,
            };
            try {
              organaManageForm.transplanthospitalname =
                this.$refs.tranHosSelect.getOptionByValue(
                  organaManageForm.transplanthospitalno
                ).organizationname;
              organaManageForm.transplanthospitalname = this.$refs.tranHosSelect.getOptionByValue(organaManageForm.transplanthospitalno).organizationname;
            } catch {
              organaManageForm.transplanthospitalname =
                organaManageForm.transplanthospitalno;
              organaManageForm.transplanthospitalname = organaManageForm.transplanthospitalno;
            }


            addDonateorgan(organaManageForm).then((response) => {
              this.loading = false;
@@ -747,36 +737,29 @@
                //查询获取新增的器官表id
                let organSearchParam = {
                  infoid: this.curInfoid,
                  donorno: this.curdonorno,
                  // donorno: this.curdonorno,
                  organno: this.form.organnumber,
                  //donorname: this.curdonorname,
                  //organname: this.$refs.organNameSelect.label,
                };
                this.loading = false;

                listDonateorgan(organSearchParam).then((response2) => {
                  this.showDistributionForm = false;
                  if (response2.code == 200 && response2.rows.length > 0) {
                    for (let i = 0; i < response2.rows.length; i++) {
                      console.log('1', this.form)
                      if (response2.rows[i].organstate == '2') {
                        this.form.organid = response2.rows[i].id;
                        this.form.residenceprovincename = this.defultAddress.sheng;
                        this.form.residencecityname = this.defultAddress.shi;
                        this.form.residencetownname = this.defultAddress.qu;
                        // this.form.residenceprovincename = this.defultAddress.sheng;
                        // this.form.residencecityname = this.defultAddress.shi;
                        // this.form.residencetownname = this.defultAddress.qu;

                        console.log('2', this.form)
                        addOrganallocation(this.form).then((response) => {

                          console.log('3', response)
                          //this.$modal.msgSuccess("新增成功");
                          this.loading = false;
                          this.GetDonortedList();
                          this.showDistributionForm = false;
                          this.$modal.msgSuccess("捐献器官分配信息保存成功！");
                        });
                      }
                    }
                  }
                  this.GetDonortedList();
                  this.showDistributionForm = false;
                });
              }
            });

 src/views/project/organization/index.vue

@@ -58,6 +58,7 @@
        </template>
      </el-table-column>
      <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">
@@ -65,7 +66,7 @@
          <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">
        <template slot-scope="scope">
          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
@@ -158,7 +159,7 @@
              <el-input v-model="form.bankaccount" placeholder="请输入银行账号" />
            </el-form-item>
          </el-col>
          

        </el-row>
        <el-row>
          <el-form-item label="介绍" prop="introduction">

 src/views/project/travelexpenseslist/Modifydetails/index.vue

@@ -632,7 +632,7 @@
                  type="text"
                  size="small"
                >
                附件
                  文件
                </el-button>
              </template>
            </el-table-column>
@@ -1198,20 +1198,7 @@
      this.pdftitle = item.name;
      let name = item.name.split(".");
      if (name[1] == "pdf") {
        this.$confirm("当前文件暂不支持预览是否下载", {
          confirmButtonText: "确定",
          cancelButtonText: "取消",
          type: "warning"
        })
          .then(() => {
            window.location.href = item.url;
          })
          .catch(() => {
            this.$message({
              type: "info",
              message: "已取消"
            });
          });
        this.$modal.msgWarning("当前文件暂不支持预览");
        this.previewpdf = false;
        this.hintitle = "当前文件暂不支持预览";
      } else if (name[1] == "jpg" || "png") {

 src/views/project/travelexpenseslist/index.vue

@@ -1865,7 +1865,7 @@
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.$router.push({
        path: "/finance/travelexpenseslist/Modifydetails/",
        path: "finance/travelexpenseslist/Modifydetails/",
        query: { id: row.id, pos: 1 }
      });
      this.dialogType = "edit";

 src/views/project/travelexpenseslistrecord/index.vue

@@ -95,7 +95,7 @@
-->
      <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width" width="270">
        <template slot-scope="scope">
          <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 1"
          <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 1 || scope.row.checkFlag == 0"
            @click="handleUpdate(scope.row)">审批</el-button>
          <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
            @click="handleShow(scope.row)">详情</el-button>
@@ -517,7 +517,7 @@
        </el-row>
        <el-row>
          <el-col :span="14">
            <el-form-item label="文件上传" align="left" prop="annexfiles">
            <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="20"
                :headers="headers" :on-success="(response, file, fileList) =>
@@ -616,6 +616,7 @@
import { listReimbursementpayee, addReimbursementpayee, updateReimbursementpayee } from "@/api/project/reimbursementpayee";
import Li_area_select from "@/components/Address";
import { getUserProfile } from "@/api/system/user";
import { getToken } from "@/utils/auth";

export default {
  components: {
@@ -710,8 +711,15 @@
      rbPayees: [],
      baselist: [],
      balist: [],
      //附件文件

      //附件文件上传路径
      uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload",
      //文件列表
      fileList: [],
      headers: {
        Authorization: "Bearer " + getToken(),
      },

      standardlevel: 0,
      createTime: [],
      //弹窗详情--show；edit
@@ -722,7 +730,7 @@
    this.getList();
  },
  mounted() {
    this.getlistDonatebaseinfo();
    //this.getlistDonatebaseinfo();
    this.getList();
  },
  methods: {
@@ -1308,6 +1316,17 @@
        this.$modal.msgError(response.msg);
      }
    },
    
    // 下载文件
    downFile(item) {
      const url = process.env.VUE_APP_BASE_API + item.url
      var a = document.createElement('a');
      var event = new MouseEvent('click');
      a.download = item.name;
      a.href = url;
      a.dispatchEvent(event);
    },

  },
};
</script>

 vue.config.js

@@ -34,21 +34,13 @@
      // detail: https://cli.vuejs.org/config/#devserver-proxy
      [process.env.VUE_APP_BASE_API]: {        
        target:`http://localhost:8080`,
        //target:`http://116.62.18.175:8080`,
        // target:`http://192.168.1.4:8086`,
        // target:`http://116.62.18.175:8080`,
        // target:`http://192.168.1.4:8080`,
        // target: `https://slb.hospitalstar.com:9093`,
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: ''
        }
      },
      //当pdf和数据接口不在同一个请求地址下时,为pdf预览追加一个代理
      '/pdf': {
        target: 'http://192.168.1.4/pdf/data',
        changOrigin: true,  
        pathRewrite: {
            '^/pdf': ''  
        } 
      }
    },
    disableHostCheck: true