合并冲突

WXL

2026-08-12 cdd399de614778acee8880ec133242c5500c3e03

 src/views/project/fundcheck/performanceCheck/index.vue

@@ -1,9 +1,9 @@
<template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="120px">
    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
      <el-row align="left">
        <el-col :span="5">
          <el-form-item label-width="120px" label="预审状态" prop="checkstatus" style="float: left">
          <el-form-item label="预审状态" prop="checkstatus" style="float: left">
            <el-select v-model="queryParams.checkstatus" placeholder="请选择" style="width: 100%">
              <el-option v-for="item in checkmaterials" :key="item.value" :label="item.label" :value="item.value">
              </el-option>
@@ -51,36 +51,36 @@
    <el-form ref="infoform" label-width="100px">
      <el-row>
        <el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
          <el-table-column type="selection" width="45"> </el-table-column>
          <el-table-column label="个税计算情况" align="center" prop="recordstatus" width="200">
          <el-table-column type="selection" width="45px"> </el-table-column>
          <!-- <el-table-column label="个税计算情况" align="center" prop="istax" width="200px">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.sys_tax" :value="scope.row.istax" />
            </template>
          </el-table-column>
          <el-table-column label="申请日期" width="180" align="center" prop="applyTime">
          </el-table-column> -->
          <el-table-column label="申请日期" width="120px" align="center" prop="applyTime">
            <template slot-scope="scope">
              <span>{{ parseTime(scope.row.applyTime, "{y}-{m}-{d}") }}</span>
            </template>
          </el-table-column>
          <el-table-column label="经办人" align="center" prop="username" width="150px" />
          <el-table-column label="申请金额" align="center" prop="pretaxcost" width="200px" />
          <el-table-column label="绩效类型" width="150" align="center" prop="Performancetype">
          <el-table-column label="经办人" align="center" prop="username" width="90px" />
          <el-table-column label="申请金额" align="center" prop="pretaxcost" width="120px" />
          <el-table-column label="绩效类型" width="150px" align="center" prop="Performancetype">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.sys_performance_type" :value="scope.row.Performancetype" />
            </template>
          </el-table-column>
          <el-table-column label="审核状态" align="center" prop="recordstatus" width="200">
          <el-table-column label="审核状态" align="center" prop="recordstatus" width="140px">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
            </template>
          </el-table-column>
          <el-table-column label="申请材料状态" width="140" align="center" prop="checkstatus">
          <el-table-column label="材料预审状态" width="140px" align="center" prop="checkstatus">
            <template slot-scope="scope">
              <dict-tag :options="dict.type.sys_stage_type" :value="scope.row.checkstatus" />
            </template>
          </el-table-column>
          <el-table-column label="备注" align="center" prop="remark" />
          <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" width="260px">
          <el-table-column label="操作" fixed="right" align="center" class-name="small-padding fixed-width" width="200px">
            <template slot-scope="scope">
              <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
                @click="handleDetail(scope.row)">详情</el-button>