修改了财务和审批

yxh

2023-05-23 86a98c135c7ebc417f8af2045aa105a94f2ccbeb

 src/views/project/donateconsolationfundlist/index.vue

@@ -2,7 +2,7 @@
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="80px">
      <el-row>
        <el-col :span="9">
        <el-col :span="8">
          <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="申请结束日期"
@@ -10,14 +10,13 @@
            </el-date-picker>
          </el-form-item>
        </el-col>

        <el-col :span="8">
          <el-form-item label="申请人" label-width="180px" prop="APPLICANT">
        <el-col :span="5">
          <el-form-item label="经办人" prop="APPLICANT" style="float: left">
            <el-input v-model="queryParams.APPLICANT" placeholder="请输入申请人姓名" clearable size="small"
              @keyup.enter.native="handleQuery" />
          </el-form-item>
        </el-col>
        <el-col :span="7">
        <el-col :span="5">
          <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">
@@ -25,14 +24,12 @@
            </el-select>
          </el-form-item>
        </el-col>
        <el-col :span="6">
          <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>
    <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-col>
    </el-row>
    <el-form ref="infoform" label-width="100px">
      <el-row>
        <el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
@@ -48,34 +45,23 @@
              <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="unitname"
            width="230px"
          /> -->
          <!-- <el-table-column
            label="联系电话"
            align="center"
            prop="phone"
            width="160"
          /> -->
          <el-table-column label="经办人" align="center" prop="username" width="120px" />
          <el-table-column label="所属组别" align="center" prop="deptmentname" width="160px" />
          <el-table-column label="组长" align="center" prop="managername" width="120px" />
          <!-- <el-table-column label="工作单位" align="center"  prop="unitname" width="230px" /> -->
          <!-- <el-table-column label="联系电话" align="center"  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="prepaidamount" width="120px" />
          <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" />
            </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="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="操作" 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"
@@ -97,7 +83,8 @@
    <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="5">
            <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"
@@ -105,26 +92,9 @@
              </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-form-item>
          </el-col>

          <el-col :span="7">
            <el-form-item label="捐献者" prop="donorname">
              <el-input disabled v-model="form.donorname" placeholder="请输入捐献者姓名" clearable />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="7">
            <el-form-item label="申请人姓名" prop="username">
              <!-- <el-input
                v-model="form.username"
                placeholder="请输入申请人姓名"
                clearable
              /> -->
          <el-col :span="5">
            <el-form-item label="经办人" prop="username">
              <!-- <el-input v-model="form.username" 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"
@@ -132,35 +102,80 @@
              </el-select>
            </el-form-item>
          </el-col>

          <el-col :span="5">
            <el-form-item label="所属组别" prop="deptmentname">
              <el-input disabled v-model="form.deptmentname" placeholder="请输入所属组别" clearable />
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="组长" prop="managername">
              <el-input disabled v-model="form.managername" placeholder="请输入组长" clearable />
            </el-form-item>
          </el-col>
        </el-row>
        <el-row>
          <el-col :span="5">
            <el-form-item label="申请类型">
              <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="1">专家费用申请</el-radio>
              </el-radio-group>
            </el-form-item></el-col>
          <el-col :span="10">
            <el-form-item label="申请说明" prop="remark">
              <el-input disabled v-model="form.remark" placeholder="请输入捐献者姓名" clearable />
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="捐献者" prop="donorname">
              <el-input disabled v-model="form.donorname" placeholder="请输入捐献者姓名" clearable />
            </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-form-item>
          </el-col>
          <el-col :span="8">
            <el-form-item label="联系电话" prop="phone">
              <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" />
            </el-form-item>
          </el-col>
          -->
        </el-row>

        <el-row style="text-align: left">
          <el-form-item label="申请类型">
            <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="1">专家费用申请</el-radio>
            </el-radio-group>
          </el-form-item>
        <el-row>
          <el-col :span="5">
            <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-form-item label="税前金额" prop="amountrequested">
              <el-input v-model="form.pretaxcost" placeholder="税前金额合计" />
            </el-form-item>
          </el-col>
          <el-col :span="5">
            <el-form-item label="税后金额" prop="amountrequested">
              <el-input v-model="form.taxedcost" placeholder="税后金额合计" />
            </el-form-item>
          </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-row>

        <el-row>
          <el-col :span="4">
            <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="addRow"
@@ -217,8 +232,8 @@
            <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) => {
                    change(scope.row);
                  }
                  change(scope.row);
                }
                  " placeholder="税前金额" />
              </template>
            </el-table-column>
@@ -276,27 +291,6 @@
            </el-form-item>
          </el-col>
        </el-row>
        <el-row style="margin-top: 25px; margin-bottom: 5px">
          <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>
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="税前金额合计" prop="amountrequested">
              <el-input v-model="form.pretaxcost" placeholder="税前金额合计" />
            </el-form-item>
          </el-col>
          <el-col :span="7">
            <el-form-item label="税后金额合计" prop="amountrequested">
              <el-input v-model="form.taxedcost" placeholder="税后金额合计" />
            </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" />
@@ -348,7 +342,7 @@
  getdownloadYX,
  getdownloadBX,
  checkfund,
  listbypower,addFundSharedInfo
  listbypower, addFundSharedInfo
} from "@/api/project/fund";
import {
  onelistFunds,