yxh
yxh
2023-05-08 ca817b63de6b852dbd882080ddda0a4f533a2780
yxh
已修改4个文件
1120 ■■■■ 文件已修改
.env.development 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/donateconsolationfundlist/index.vue 526 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/project/travelexpenseslistrecord/index.vue 586 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
vue.config.js 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
.env.development
@@ -5,8 +5,8 @@
ENV = 'development'
# 管理系统/开发环境
VUE_APP_BASE_API = '/prod-api'
# VUE_APP_BASE_API = '/dev-api'
# VUE_APP_BASE_API = '/prod-api'
VUE_APP_BASE_API = '/dev-api'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
src/views/project/donateconsolationfundlist/index.vue
@@ -1,54 +1,26 @@
<template>
  <div class="app-container">
    <el-form
      :model="queryParams"
      ref="queryForm"
      :inline="true"
      v-show="showSearch"
      label-width="80px"
    >
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
      <el-row>
        <el-col :span="9">
          <el-form-item label="申请日期" prop="createTime">
            <el-date-picker
              format="yyyy-MM-dd"
              @change="selectapplication"
              value-format="yyyy-MM-dd"
              v-model="createTime"
              type="daterange"
              range-separator="至"
              start-placeholder="申请开始日期"
              end-placeholder="申请结束日期"
              @keyup.enter.native="handleQuery"
            >
            <el-date-picker format="yyyy-MM-dd" @change="selectapplication" value-format="yyyy-MM-dd" v-model="createTime"
              type="daterange" range-separator="至" start-placeholder="申请开始日期" end-placeholder="申请结束日期"
              @keyup.enter.native="handleQuery">
            </el-date-picker>
          </el-form-item>
        </el-col>
        <el-col :span="8">
          <el-form-item label="申请人" label-width="180px" prop="APPLICANT">
            <el-input
              v-model="queryParams.APPLICANT"
              placeholder="请输入申请人姓名"
              clearable
              size="small"
              @keyup.enter.native="handleQuery"
            />
            <el-input v-model="queryParams.APPLICANT" placeholder="请输入申请人姓名" clearable size="small"
              @keyup.enter.native="handleQuery" />
          </el-form-item>
        </el-col>
        <el-col :span="7">
          <el-form-item label="审批状态" prop="CHECKFLAG" style="float: left">
            <el-select
              v-model="queryParams.CHECKFLAG"
              placeholder="请选择"
              style="width: 100%"
            >
              <el-option
                v-for="item in checkFlagOptions"
                :key="item.value"
                :label="item.label"
                :value="item.value"
              >
            <el-select v-model="queryParams.CHECKFLAG" placeholder="请选择" style="width: 100%">
              <el-option v-for="item in checkFlagOptions" :key="item.value" :label="item.label" :value="item.value">
              </el-option>
            </el-select>
          </el-form-item>
@@ -57,70 +29,28 @@
    </el-form>
    <el-row type="flex" :gutter="10" align="right" class="mb8">
      <el-col>
        <el-button
          type="primary"
          icon="el-icon-search"
          size="mini"
          @click="flowconclusion"
          >搜索</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="flowconclusion">搜索</el-button>
        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
      </el-col>
    </el-row>
    <el-form ref="infoform" label-width="100px">
      <el-row>
        <el-table
          v-loading="loading"
          border
          :data="donateconsolationfundList"
          @selection-change="handleSelectionChange"
        >
          <el-table-column
            label="审批状态"
            width="120"
            align="center"
            prop="checkFlag"
          >
        <el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
          <el-table-column label="审批状态" width="120" align="center" prop="checkFlag">
            <template slot-scope="scope">
              <span v-if="scope.row.checkFlag == 0"
                ><i
                  class="el-icon-check"
                  style="color: #5fb878; font-weight: bold"
                ></i
              ></span>
              <span v-if="scope.row.checkFlag == 0"><i class="el-icon-check"
                  style="color: #5fb878; font-weight: bold"></i></span>
              <!-- <span v-else>待审核</span> -->
            </template>
          </el-table-column>
          <el-table-column
            label="申请日期"
            width="120"
            align="center"
            prop="createTime"
          >
          <el-table-column label="申请日期" width="120" align="center" prop="createTime">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
            </template>
          </el-table-column>
          <el-table-column
            label="申请人"
            align="center"
            prop="username"
            width="120px"
          />
          <el-table-column
            label="捐献编号"
            align="center"
            prop="donorno"
            width="240px"
          />
          <el-table-column
            label="捐献者"
            align="center"
            prop="donorname"
            width="120px"
          />
          <el-table-column label="申请人" align="center" prop="username" width="120px" />
          <el-table-column label="捐献编号" align="center" prop="donorno" width="240px" />
          <el-table-column label="捐献者" align="center" prop="donorname" width="120px" />
          <!-- <el-table-column
            label="工作单位"
            align="center"
@@ -133,142 +63,57 @@
            prop="phone"
            width="160"
          /> -->
          <el-table-column
            label="税前金额"
            align="center"
            prop="pretaxcost"
            width="120px"
          />
          <el-table-column
            label="税后金额"
            align="center"
            prop="taxedcost"
            width="120px"
          />
          <el-table-column
            label="申请金额"
            align="center"
            prop="amountrequested"
            width="120px"
          />
          <el-table-column label="税前金额" align="center" prop="pretaxcost" width="120px" />
          <el-table-column label="税后金额" align="center" prop="taxedcost" width="120px" />
          <el-table-column label="申请金额" align="center" prop="amountrequested" width="120px" />
          <el-table-column
            label="审核状态"
            align="center"
            prop="recordstatus"
            width="180"
          >
          <el-table-column label="审核状态" align="center" prop="recordstatus" width="180">
            <template slot-scope="scope">
              <dict-tag
                :options="dict.type.sys_recordstatus"
                :value="scope.row.recordstatus"
              />
              <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
            </template>
          </el-table-column>
          <el-table-column
            label="预支费用"
            align="center"
            prop="prepaidamount"
            width="120px"
          />
          <el-table-column
            label="财务审核"
            align="center"
            prop="financechecher"
            width="140"
          />
          <el-table-column label="预支费用" align="center" prop="prepaidamount" width="120px" />
          <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"
          >
          <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"
                @click="handleShow(scope.row)"
                >详情</el-button
              >
              <el-button
                v-if="scope.row.checkFlag == 1"
                size="mini"
                type="text"
                icon="el-icon-edit"
                @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>
              <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
                @click="handleUpdate(scope.row)">审核</el-button>
              <!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
              <el-button
                size="mini"
                type="text"
                icon="el-icon-download"
                @click="dayin(scope.row.id)"
                >下载</el-button
              >
              <el-button size="mini" type="text" icon="el-icon-download" @click="dayin(scope.row.id)">下载</el-button>
            </template>
          </el-table-column>
        </el-table>
        <pagination
          v-show="total > 0"
          :total="total"
          :page.sync="queryParams.pageNum"
          :limit.sync="queryParams.pageSize"
          @pagination="getlistbypower"
        />
        <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
          @pagination="getlistbypower" />
      </el-row>
    </el-form>
    <!-- 添加或修改费用申请单 -->
    <el-dialog
      :visible.sync="dialogOpen"
      width="1200px"
      :title="title"
      style="text-align: center"
    >
    <el-dialog :visible.sync="dialogOpen" width="1400px" :title="title" style="text-align: center">
      <el-form ref="form" :model="form" label-width="120px" :rules="rules">
        <!-- <el-form ref="applyForm" :model="applicationForm" label-width="120px"> -->
        <el-row
          ><el-col :span="7">
        <el-row><el-col :span="7">
            <el-form-item label="申请日期" prop="createTime">
              <!-- <el-input v-model="form.donorno" placeholder="请输入申请日期" /> -->
              <el-date-picker
                clearable
                style="width: 100%"
                v-model="form.createTime"
                type="date"
                value-format="yyyy-MM-dd HH:mm:ss"
                placeholder="申请日期"
              >
              <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
                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="donorno">
              <el-input
                disabled
                v-model="form.donorno"
                placeholder="请输入捐献编号"
                clearable
              />
              <el-input disabled v-model="form.donorno" placeholder="请输入捐献编号" clearable />
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="捐献者" prop="donorname">
              <el-input
                disabled
                v-model="form.donorname"
                placeholder="请输入捐献者姓名"
                clearable
              />
              <el-input disabled v-model="form.donorname" placeholder="请输入捐献者姓名" clearable />
            </el-form-item>
          </el-col>
        </el-row>
@@ -280,41 +125,23 @@
                placeholder="请输入申请人姓名"
                clearable
              /> -->
              <el-select
                v-model="form.username"
                placeholder="申请人姓名"
                clearable
                filterable
                allow-create
                style="width: 100%"
              >
                <el-option
                  v-for="dict in userlist"
                  :key="dict.index"
                  :label="dict.nickname"
                  :value="dict.nickname"
                ></el-option>
              <el-select v-model="form.username" placeholder="申请人姓名" clearable filterable allow-create
                style="width: 100%">
                <el-option v-for="dict in userlist" :key="dict.index" :label="dict.nickname"
                  :value="dict.nickname"></el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="联系电话" prop="phone">
              <el-input
                v-model="form.phone"
                placeholder="请输入申请者的联系方式"
                clearable
              />
              <el-input v-model="form.phone" placeholder="请输入申请者的联系方式" clearable />
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="工作单位" prop="unitno">
              <org-selecter
                ref="orgSelecter"
                :org-type="'3'"
                v-model="form.unitno"
              />
              <org-selecter ref="orgSelecter" :org-type="'3'" v-model="form.unitno" />
            </el-form-item>
          </el-col>
        </el-row>
@@ -329,86 +156,38 @@
                :disabled="form.id != null"
                >{{ dict.label }}</el-radio
              > -->
              <el-radio v-model="form.applytype" label="1"
                >专家费用申请</el-radio
              >
              <el-radio v-model="form.applytype" label="1">专家费用申请</el-radio>
            </el-radio-group>
          </el-form-item>
        </el-row>
        <el-row>
          <el-col :span="4">
            <el-button
              type="primary"
              plain
              icon="el-icon-plus"
              size="mini"
              @click="addRow"
              v-if="show === 1"
              >新增专家费</el-button
            >
            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addRow"
              v-if="show === 1">新增专家费</el-button>
          </el-col>
        </el-row>
        <el-row style="margin-top: 5px; margin-bottom: 5px">
          <el-table
            :data="fundDetailArr"
            :summary-method="getSummaries"
            border
            highlight-current-row
            v-loading="loading"
          >
            <el-table-column
              prop="orderno"
              align="center"
              label="序号"
              width="150"
            >
          <el-table :data="fundDetailArr" :summary-method="getSummaries" border highlight-current-row v-loading="loading">
            <el-table-column prop="orderno" align="center" label="序号" width="80">
              <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="220"
            >
            <el-table-column prop="applytype" align="center" label="费用类型" width="220">
              <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"
                    :value="dict.value"
                  ></el-option>
                <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"
                    :value="dict.value"></el-option>
                </el-select>
              </template>
            </el-table-column>
            <el-table-column
              prop="itemtype"
              align="center"
              label="服务项目"
              width="200"
            >
            <el-table-column prop="itemtype" align="center" label="服务项目" width="200">
              <template slot-scope="scope">
                <el-select
                  v-model="scope.row.itemid"
                  placeholder="服务项目"
                  clearable
                  filterable
                  allow-create
                >
                  <el-option
                    v-for="dict in scope.row.itemArr"
                    :key="dict.index"
                    :label="dict.itemName"
                    :value="dict.id"
                  ></el-option>
                <el-select v-model="scope.row.itemid" placeholder="服务项目" clearable filterable allow-create>
                  <el-option v-for="dict in scope.row.itemArr" :key="dict.index" :label="dict.itemName"
                    :value="dict.id"></el-option>
                  <!-- <el-option
                    v-for="dict in itemArr"
                    :key="dict.index"
@@ -418,163 +197,66 @@
                </el-select>
              </template>
            </el-table-column>
            <el-table-column
              v-if="show === 1"
              prop="servicesscopename"
              align="center"
              label="费用说明"
              width="150"
            >
            <el-table-column v-if="show === 1" prop="servicesscopename" align="center" label="费用说明" width="150">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.servicesscopename"
                  placeholder="费用说明"
                />
                <el-input v-model="scope.row.servicesscopename" placeholder="费用说明" />
              </template>
            </el-table-column>
            <el-table-column
              prop="beneficiaryno"
              align="center"
              label="姓名"
              width="120"
            >
            <el-table-column prop="beneficiaryno" align="center" label="姓名" width="120">
              <template slot-scope="scope">
                <el-select
                  filterable
                  allow-create
                  ref="getReportname"
                  default-first-option
                  @change="selectpersonmsg(scope.row)"
                  v-model="scope.row.beneficiaryname"
                  placeholder="请选择"
                >
                  <el-option
                    v-for="item in arrr3"
                    :key="item.reportNo"
                    :label="item.reportName"
                    :value="item.reportName"
                  >
                <el-select filterable allow-create ref="getReportname" default-first-option
                  @change="selectpersonmsg(scope.row)" v-model="scope.row.beneficiaryname" placeholder="请选择">
                  <el-option v-for="item in arrr3" :key="item.reportNo" :label="item.reportName" :value="item.reportName">
                  </el-option>
                </el-select>
              </template> </el-table-column
            ><el-table-column
              prop="title"
              align="center"
              label="职称"
              width="150"
            >
              </template> </el-table-column><el-table-column prop="title" align="center" label="职称" width="150">
              <template slot-scope="scope">
                <el-input v-model="scope.row.title" placeholder="职称" />
              </template>
            </el-table-column>
            <el-table-column
              v-if="show === 1"
              prop="amount"
              align="center"
              label="税前金额"
              width="100"
            >
            <el-table-column v-if="show === 1" prop="amount" align="center" label="税前金额" width="100">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.amount"
                  v-on:input="
                    (val) => {
                <el-input v-model="scope.row.amount" v-on:input="(val) => {
                      change(scope.row);
                    }
                  "
                  placeholder="税前金额"
                />
                  " placeholder="税前金额" />
              </template>
            </el-table-column>
            <el-table-column
              v-if="show === 1"
              prop="taxedamount"
              align="center"
              label="税后金额"
              width="100"
            >
            <el-table-column v-if="show === 1" prop="taxedamount" align="center" label="税后金额" width="100">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.taxedamount"
                  placeholder="税后金额"
                />
                <el-input v-model="scope.row.taxedamount" placeholder="税后金额" />
              </template>
            </el-table-column>
            <el-table-column
              prop="unitno"
              align="center"
              label="工作单位"
              width="180"
            >
            <el-table-column prop="unitno" align="center" label="工作单位" width="180">
              <template slot-scope="scope">
                <org-selecter
                  :ref="'unitSel' + scope.$index"
                  :org-type="'3'"
                  v-model="scope.row.unitno"
                />
                <org-selecter :ref="'unitSel' + scope.$index" :org-type="'3'" v-model="scope.row.unitno" />
              </template>
            </el-table-column>
            <el-table-column
              prop="idcardno"
              align="center"
              label="身份证号"
              width="200"
            >
            <el-table-column prop="idcardno" align="center" label="身份证号" width="200">
              <template slot-scope="scope">
                <el-input v-model="scope.row.idcardno" placeholder="身份证号" />
              </template>
            </el-table-column>
            <el-table-column
              prop="depositbank"
              align="center"
              label="开户银行"
              width="240"
            >
            <el-table-column prop="depositbank" align="center" label="开户银行" width="240">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.depositbank"
                  placeholder="开户银行"
                />
                <el-input v-model="scope.row.depositbank" placeholder="开户银行" />
              </template>
            </el-table-column>
            <el-table-column
              prop="bankcardno"
              align="center"
              label="银行卡号"
              width="220"
            >
            <el-table-column prop="bankcardno" align="center" label="银行卡号" width="220">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.bankcardno"
                  placeholder="银行卡号"
                />
                <el-input v-model="scope.row.bankcardno" placeholder="银行卡号" />
              </template>
            </el-table-column>
            <el-table-column
              fixed="right"
              align="center"
              label="操作"
              width="120"
            >
            <el-table-column fixed="right" align="center" label="操作" width="120">
              <template slot-scope="scope">
                <el-button
                  @click="saveRows(scope.row, scope.$index)"
                  type="text"
                  size="small"
                  v-if="show === 1"
                >
                <el-button @click="saveRows(scope.row, scope.$index)" type="text" size="small" v-if="show === 1">
                  保存
                </el-button>
                <el-button
                  @click.native.prevent="
                <el-button @click.native.prevent="
                    deleteRows(scope.row, scope.$index, fundDetailArr)
                  "
                  type="text"
                  size="small"
                  v-hasPermi="['project:expertFeeCheck:delete']"
                >
                  " type="text" size="small" v-hasPermi="['project:expertFeeCheck:delete']">
                  删除
                </el-button>
              </template>
@@ -598,14 +280,8 @@
          <el-col :span="7">
            <el-form-item label="申请日期" prop="createTime">
              <!-- <el-input v-model="form.donorno" placeholder="请输入申请日期" /> -->
              <el-date-picker
                clearable
                style="width: 100%"
                v-model="form.createTime"
                type="date"
                value-format="yyyy-MM-dd HH:mm:ss"
                placeholder="申请日期"
              >
              <el-date-picker clearable style="width: 100%" v-model="form.createTime" type="date"
                value-format="yyyy-MM-dd HH:mm:ss" placeholder="申请日期">
              </el-date-picker>
            </el-form-item>
          </el-col>
@@ -623,32 +299,13 @@
        <el-row style="margin-top: 5px; margin-bottom: 5px">
          <el-table :data="fundflowList" border>
            <el-table-column
              label="审核人"
              align="center"
              prop="checkusername"
            />
            <el-table-column
              label="审核日期"
              align="center"
              prop="createTime"
            />
            <el-table-column
              label="审核结果"
              align="center"
              prop="flowconclusion"
              ><template slot-scope="scope"
                ><span v-if="scope.row.flowconclusion == 1">通过</span
                ><span v-if="scope.row.flowconclusion == 2"
                  >不通过</span
                ></template
              >
            <el-table-column label="审核人" align="center" prop="checkusername" />
            <el-table-column label="审核日期" align="center" prop="createTime" />
            <el-table-column label="审核结果" align="center" prop="flowconclusion"><template slot-scope="scope"><span
                  v-if="scope.row.flowconclusion == 1">通过</span><span
                  v-if="scope.row.flowconclusion == 2">不通过</span></template>
            </el-table-column>
            <el-table-column
              label="审核备注"
              align="center"
              prop="flowcontent"
            />
            <el-table-column label="审核备注" align="center" prop="flowcontent" />
          </el-table>
        </el-row>
@@ -663,10 +320,7 @@
          </el-col>
          <el-col :span="12">
            <el-form-item label="审核备注">
              <el-input
                v-model="newobj.flowconclusion"
                placeholder="申报费用"
              />
              <el-input v-model="newobj.flowconclusion" placeholder="申报费用" />
            </el-form-item>
          </el-col>
        </el-row>
src/views/project/travelexpenseslistrecord/index.vue
@@ -1,60 +1,29 @@
<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-row>
        <el-col :span="6">
          <el-form-item label="出差人" prop="travelers">
            <el-input
              v-model="queryParams.travelers"
              placeholder="请输入出差人"
              clearable
              size="small"
              @keyup.enter.native="handleQuery"
            />
            <el-input v-model="queryParams.travelers" placeholder="请输入出差人" clearable size="small"
              @keyup.enter.native="handleQuery" />
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <el-form-item label="报销人" prop="username">
            <el-input
              v-model="queryParams.username"
              placeholder="请输入报销人"
              clearable
              size="small"
              @keyup.enter.native="handleQuery"
            />
            <el-input v-model="queryParams.username" placeholder="请输入报销人" clearable size="small"
              @keyup.enter.native="handleQuery" />
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <el-form-item label="审核状态" prop="recordstatus">
            <el-input
              v-model="queryParams.recordstatus"
              placeholder="请选择审核状态"
              clearable
              size="small"
              v-if="0"
              @keyup.enter.native="handleQuery"
            />
            <el-select
              v-model="queryParams.recordstatus"
              placeholder="请选择审核状态"
              clearable
              size="small"
            >
              <el-option
                v-for="dict in dict.type.sys_recordstatus"
                :key="dict.value"
                :label="dict.label"
                :value="dict.value"
              />
            <el-input v-model="queryParams.recordstatus" placeholder="请选择审核状态" clearable size="small" v-if="0"
              @keyup.enter.native="handleQuery" />
            <el-select v-model="queryParams.recordstatus" placeholder="请选择审核状态" clearable size="small">
              <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>
@@ -63,33 +32,16 @@
      <el-row>
        <el-col :span="8">
          <el-form-item label="报销日期" prop="createTime">
            <el-date-picker
              format="yyyy-MM-dd"
              value-format="yyyy-MM-dd"
              v-model="value1"
              type="daterange"
              @blur="onpick"
              range-separator="至"
              start-placeholder="报销开始日期"
              end-placeholder="报销结束日期"
              @keyup.enter.native="handleQuery"
            >
            <el-date-picker format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-model="value1" type="daterange" @blur="onpick"
              range-separator="至" start-placeholder="报销开始日期" end-placeholder="报销结束日期" @keyup.enter.native="handleQuery">
            </el-date-picker>
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <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-col>
      </el-row>
@@ -97,231 +49,94 @@
    <el-row :gutter="10" class="mb8">
      <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>
      <!-- v-hasPermi="['project:funddetail:export']" -->
      <right-toolbar
        :showSearch.sync="showSearch"
        @queryTable="getList"
      ></right-toolbar>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>
    <el-table
      border
      v-loading="loading"
      :data="reimbursementList"
      @selection-change="handleSelectionChange"
    >
    <el-table border v-loading="loading" :data="reimbursementList" @selection-change="handleSelectionChange">
      <!-- <el-table-column type="selection" width="55" align="center" /> -->
      <el-table-column
        label="审批状态"
        width="120"
        align="center"
        prop="checkFlag"
      >
      <el-table-column label="审批状态" width="120" align="center" prop="checkFlag">
        <template slot-scope="scope">
          <span v-if="scope.row.checkFlag == 0"
            ><i
              class="el-icon-check"
              style="color: #5fb878; font-weight: bold"
            ></i
          ></span>
          <span v-if="scope.row.checkFlag == 0"><i class="el-icon-check"
              style="color: #5fb878; font-weight: bold"></i></span>
          <!-- <span v-else>待审核</span> -->
        </template>
      </el-table-column>
      <el-table-column
        label="报销归类"
        width="120"
        align="center"
        prop="costtype"
      >
      <el-table-column label="报销归类" width="120" align="center" prop="costtype">
        <template slot-scope="scope">
          <dict-tag
            :options="dict.type.sys_travelexpensebelong"
            :value="scope.row.costtype"
          />
          <dict-tag :options="dict.type.sys_travelexpensebelong" :value="scope.row.costtype" />
        </template>
      </el-table-column>
      <el-table-column
        label="申请日期"
        width="120"
        align="center"
        prop="createTime"
      >
      <el-table-column label="申请日期" width="120" align="center" prop="createTime">
        <template slot-scope="scope">
          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
        </template>
      </el-table-column>
      <el-table-column
        label="报销人"
        width="120"
        align="center"
        prop="username"
      >
      <el-table-column label="报销人" width="120" align="center" prop="username">
      </el-table-column>
      <el-table-column
        label="出差人"
        width="180"
        align="center"
        prop="travelers"
      >
      <el-table-column label="出差人" width="180" align="center" prop="travelers">
      </el-table-column>
      <el-table-column
        label="报销金额"
        width="120"
        align="center"
        prop="amountrequested"
      >
      <el-table-column label="报销金额" width="120" align="center" prop="amountrequested">
      </el-table-column>
      <el-table-column
        label="出差事由"
        align="center"
        width="280"
        prop="reason"
      >
      <el-table-column label="出差事由" align="center" width="280" prop="reason">
      </el-table-column>
      <el-table-column label="联系电话" width="120" align="center" prop="phone">
      </el-table-column>
      <el-table-column
        label="开户银行"
        width="180"
        align="center"
        prop="depositbank"
      >
      <el-table-column label="开户银行" width="180" align="center" prop="depositbank">
      </el-table-column>
      <el-table-column
        label="银行卡号"
        width="180"
        align="center"
        prop="bankcardno"
      >
      <el-table-column label="银行卡号" width="180" align="center" prop="bankcardno">
      </el-table-column>
      <!-- <el-table-column label="报销合计" align="center" prop="financechecher">
      </el-table-column> -->
      <el-table-column
        label="财务审核"
        width="120"
        align="center"
        prop="financechecher"
      >
      <el-table-column label="财务审核" width="120" align="center" prop="financechecher">
      </el-table-column>
      <el-table-column
        label="捐献者"
        width="120"
        align="center"
        prop="donorname"
      >
      <el-table-column label="捐献者" width="120" align="center" prop="donorname">
      </el-table-column>
      <el-table-column
        label="操作"
        align="center"
        fixed="right"
        class-name="small-padding fixed-width"
        width="270"
      >
      <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"
            @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
          >
          <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 1"
            @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>
          <!-- v-hasPermi="['project:funddetail:edit']" -->
          <el-button
            size="mini"
            type="text"
            icon="el-icon-download"
            @click="gettable(scope.row)"
          >
          <el-button size="mini" type="text" icon="el-icon-download" @click="gettable(scope.row)">
            下载
          </el-button>
          <!-- v-hasPermi="['project:funddetail:edit']" -->
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            disabled
            @click="handleDelete(scope.row)"
            >删除</el-button
          >
          <el-button size="mini" type="text" icon="el-icon-delete" disabled
            @click="handleDelete(scope.row)">删除</el-button>
          <!-- v-hasPermi="['project:funddetail:remove']" -->
        </template>
      </el-table-column>
    </el-table>
    <!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
    <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="1100px"
      append-to-body
    >
    <el-dialog :title="title" :visible.sync="open" width="1400px" append-to-body>
      <el-form ref="form" :model="form" label-width="120px">
        <el-row>
          <el-col :span="7">
            <el-form-item label="捐献者" prop="infoid">
              <el-select
                v-model="form.infoid"
                @change="selectbaseinfo"
                filterable
                disabled
                placeholder="请选择捐献者"
              >
                <el-option
                  v-for="item in baselist"
                  :key="item.index"
                  :label="item.name"
                  :value="item.infoid"
                >
              <el-select v-model="form.infoid" @change="selectbaseinfo" filterable disabled placeholder="请选择捐献者">
                <el-option v-for="item in baselist" :key="item.index" :label="item.name" :value="item.infoid">
                </el-option>
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="捐献编号" prop="donorno">
              <el-input
                disabled
                v-model="form.donorno"
                placeholder="捐献编号"
              />
              <el-input disabled v-model="form.donorno" placeholder="捐献编号" />
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="申请日期" prop="createTime">
              <el-date-picker
                style="width: 100%"
                v-model="form.createTime"
                disabled
                type="date"
                value-format="yyyy-MM-dd HH:mm:ss"
                placeholder="申请日期"
              >
              <el-date-picker style="width: 100%" v-model="form.createTime" disabled type="date"
                value-format="yyyy-MM-dd HH:mm:ss" placeholder="申请日期">
              </el-date-picker>
            </el-form-item>
          </el-col>
@@ -341,8 +156,7 @@
          <el-col :span="7">
            <el-form-item label="区域组长" prop="managerno">
              <el-input v-model="form.managerno" placeholder="区域组长" />
            </el-form-item> </el-col
        ></el-row>
            </el-form-item> </el-col></el-row>
        <el-row>
          <el-col :span="7">
            <el-form-item label="开户银行" prop="depositbank">
@@ -352,13 +166,11 @@
          <el-col :span="8">
            <el-form-item label="银行账号" prop="bankcardno">
              <el-input v-model="form.bankcardno" placeholder="开户银行" />
            </el-form-item> </el-col
          ><el-col :span="7">
            </el-form-item> </el-col><el-col :span="7">
            <el-form-item label="联系电话" prop="phone">
              <el-input v-model="form.phone" placeholder="联系电话" />
            </el-form-item>
          </el-col> </el-row
        ><el-row>
          </el-col> </el-row><el-row>
          <el-col :span="21">
            <el-form-item label="出差事由" prop="reason">
              <el-input v-model="form.reason" placeholder="出差事由" />
@@ -378,72 +190,28 @@
        <el-row type="flex" :gutter="10" align="right" class="mb8">
          <el-col :span="6">
            <el-button
              type="primary"
              plain
              icon="el-icon-plus"
              size="mini"
              disabled
              @click="addRow"
              >新增一行</el-button
            >
            <el-button type="primary" plain icon="el-icon-plus" size="mini" disabled @click="addRow">新增一行</el-button>
          </el-col>
        </el-row>
        <el-row>
          <el-table :data="applicationDetailArr" border highlight-current-row>
            <el-table-column
              prop="starttime"
              slot=""
              label="出发日期"
              align="center"
              width="150"
            >
            <el-table-column prop="starttime" slot="" label="出发日期" align="center" width="150">
              <template slot-scope="scope">
                <el-date-picker
                  clearable
                  size="small"
                  style="width: 100%"
                  v-model="scope.row.starttime"
                  type="date"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  placeholder="出发日期"
                  @change="getStandard(scope.row)"
                >
                <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.starttime" type="date"
                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="出发日期" @change="getStandard(scope.row)">
                </el-date-picker>
              </template>
            </el-table-column>
            <el-table-column
              prop="departure"
              slot=""
              label="出发地点"
              align="center"
              width="120"
            >
            <el-table-column prop="departure" slot="" label="出发地点" align="center" width="120">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.departure"
                  placeholder="出发地点"
                />
                <el-input v-model="scope.row.departure" placeholder="出发地点" />
              </template>
            </el-table-column>
            <el-table-column
              prop="endtime"
              slot=""
              label="到达日期"
              align="center"
              width="150"
            >
            <el-table-column prop="endtime" slot="" label="到达日期" align="center" width="150">
              <template slot-scope="scope">
                <el-date-picker
                  clearable
                  size="small"
                  style="width: 100%"
                  v-model="scope.row.endtime"
                  type="date"
                  value-format="yyyy-MM-dd HH:mm:ss"
                  placeholder="到达日期"
                >
                <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.endtime" type="date"
                  value-format="yyyy-MM-dd HH:mm:ss" placeholder="到达日期">
                </el-date-picker>
              </template>
            </el-table-column>
@@ -460,208 +228,94 @@
                  @change="selcetdestination(scope.row)"
                ></li_area_select>
              </template>
            </el-table-column> --><el-table-column
              label="到达地点"
              prop="destination"
              align="center"
              width="320"
            >
            </el-table-column> --><el-table-column label="到达地点" prop="destination" align="center" width="320">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.destination"
                  placeholder="出发地点"
                />
                <el-input v-model="scope.row.destination" placeholder="出发地点" />
              </template>
            </el-table-column>
            <el-table-column prop="days" label="天数" width="80" 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="getStandard(scope.row)" placeholder="天数" />
              </template>
            </el-table-column>
            <el-table-column
              prop="traffictype"
              label="交通工具"
              align="center"
              width="120"
            >
            <el-table-column prop="traffictype" label="交通工具" align="center" width="120">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.traffictype"
                  placeholder="交通工具"
                />
                <el-input v-model="scope.row.traffictype" placeholder="交通工具" />
              </template>
            </el-table-column>
            <el-table-column
              prop="trafficexpense"
              label="交通费"
              align="center"
              width="100"
            >
            <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(scope.row);
                    }
                  "
                />
                  " />
              </template>
            </el-table-column>
            <el-table-column
              prop="cityfee"
              label="市内交通费"
              align="center"
              width="100"
            >
            <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(scope.row);
                    }
                  "
                  >{{ Number(scope.row.cityfee).toFixed(2) }}
                  ">{{ Number(scope.row.cityfee).toFixed(2) }}
                </el-input>
              </template>
            </el-table-column>
            <el-table-column
              prop="hotelexpense"
              label="住宿费"
              align="center"
              width="100"
            >
            <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(scope.row);
                    }
                  "
                />
                  " />
              </template>
            </el-table-column>
            <el-table-column
              prop="otherexpense"
              label="杂费"
              align="center"
              width="100"
            >
            <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(scope.row);
                    }
                  "
                />
                  " />
              </template>
            </el-table-column>
            <el-table-column
              prop="foodexpenses"
              label="伙食费报销"
              align="center"
              width="100"
            >
            <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(scope.row);
                    }
                  "
                />
                  " />
              </template>
            </el-table-column>
            <el-table-column
              prop="foodallowance"
              label="伙食费补助"
              align="center"
              width="100"
            >
            <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(scope.row);
                    }
                  "
                />
              </template> </el-table-column
            ><el-table-column
              prop="otherfeeamount"
              label="其他费用"
              align="center"
              width="100"
            >
                  " />
              </template> </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(scope.row);
                    }
                  "
                />
                  " />
              </template>
            </el-table-column>
            <el-table-column
              prop="departure"
              slot=""
              label="其他费用说明"
              align="center"
              width="120"
            >
            <el-table-column prop="departure" slot="" label="其他费用说明" align="center" width="120">
              <template slot-scope="scope">
                <el-input
                  v-model="scope.row.otherfeedesc"
                  placeholder="其他费用说明"
                />
                <el-input v-model="scope.row.otherfeedesc" placeholder="其他费用说明" />
              </template>
            </el-table-column>
            <el-table-column
              prop="total"
              label="合计"
              align="center"
              width="140"
            >
            <el-table-column prop="total" label="合计" align="center" width="140">
              <template slot-scope="scope">
                <el-input v-model="scope.row.total" placeholder="合计" />
              </template>
            </el-table-column>
            <el-table-column
              fixed="right"
              label="操作"
              align="center"
              width="120"
            >
            <el-table-column fixed="right" label="操作" align="center" width="120">
              <!-- deleteRow(scope.$index, applicationDetailArr) -->
              <template slot-scope="scope">
                <el-button
                  @click.native.prevent="
                <el-button @click.native.prevent="
                    deleteRow(scope.$index, applicationDetailArr, scope.row)
                  "
                  type="text"
                  size="small"
                  disabled
                >
                  " type="text" size="small" disabled>
                  删除
                </el-button>
              </template>
@@ -700,67 +354,35 @@
          <el-col :span="6">
            <el-form-item label="财务副院长" prop="finvicepresident">
              <el-input
                v-model="form.finvicepresident"
                placeholder="财务副院长"
              />
              <el-input v-model="form.finvicepresident" placeholder="财务副院长" />
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="业务副院长" prop="busvicepresident">
              <el-input
                v-model="form.busvicepresident"
                placeholder="业务副院长"
              />
            </el-form-item> </el-col></el-row
        ><el-row>
              <el-input v-model="form.busvicepresident" placeholder="业务副院长" />
            </el-form-item> </el-col></el-row><el-row>
          <el-col :span="6">
            <el-form-item label="办公室主任" prop="officedirector">
              <el-input
                v-model="form.officedirector"
                placeholder="办公室主任"
              />
              <el-input v-model="form.officedirector" placeholder="办公室主任" />
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="财务部主任" prop="financedirector">
              <el-input
                v-model="form.financedirector"
                placeholder="财务部主任"
              />
              <el-input v-model="form.financedirector" placeholder="财务部主任" />
            </el-form-item>
          </el-col>
          <el-col :span="6">
            <el-form-item label="财务审核" prop="financechecher">
              <el-input v-model="form.financechecher" placeholder="财务审核" />
            </el-form-item> </el-col
        ></el-row>
            </el-form-item> </el-col></el-row>
      </el-form>
      <el-form label-width="120px">
        <el-table :data="fundflowList" border>
          <el-table-column
            label="审核人"
            align="center"
            width="120"
            prop="checkusername"
          />
          <el-table-column
            label="审核日期"
            align="center"
            width="160"
            prop="createTime"
          />
          <el-table-column
            label="审核结果"
            align="center"
            width="200"
            prop="flowconclusion"
            ><template slot-scope="scope"
              ><span v-if="scope.row.flowconclusion == 1">通过</span
              ><span v-if="scope.row.flowconclusion == 2"
                >不通过</span
              ></template
            >
          <el-table-column label="审核人" align="center" width="120" prop="checkusername" />
          <el-table-column label="审核日期" align="center" width="160" prop="createTime" />
          <el-table-column label="审核结果" align="center" width="200" prop="flowconclusion"><template
              slot-scope="scope"><span v-if="scope.row.flowconclusion == 1">通过</span><span
                v-if="scope.row.flowconclusion == 2">不通过</span></template>
          </el-table-column>
          <el-table-column label="审核备注" align="center" prop="flowcontent" />
        </el-table>
vue.config.js
@@ -35,10 +35,10 @@
      [process.env.VUE_APP_BASE_API]: {
        //target: `http://192.168.2.3:8080`,
        //target: `https://slb.hospitalstar.com:9093`,
        target:`http://www.hxsoft.com:8085`,
        target:`http://116.62.18.175:8080`,
        changeOrigin: true,
        pathRewrite: {
          ['^' + process.env.VUE_APP_BASE_API]: 'ruoyi-admin/prod-api'
          ['^' + process.env.VUE_APP_BASE_API]: ''
        }
      }
    },