合并冲突

WXL

2026-08-12 cdd399de614778acee8880ec133242c5500c3e03

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

@@ -147,7 +147,7 @@
        </template>
      </el-table-column>
      <el-table-column
        label="申请材料状态"
        label="材料预审状态"
        width="140"
        align="center"
        prop="checkstatus"
@@ -195,7 +195,6 @@
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['project:medicalfund:edit']"
            >修改</el-button
          >

@@ -211,7 +210,6 @@
            size="mini"
            type="text"
            @click="handleDelete(scope.row)"
            v-hasPermi="['project:medicalfund:delete']"
            ><span class="button-delete"
              ><i class="el-icon-delete"></i>删除</span
            ></el-button
@@ -221,7 +219,6 @@
            type="text"
            icon="el-icon-download"
            @click="mixExport(scope.row.id)"
            v-hasPermi="['project:medicalfund:download']"
            >下载</el-button
          >
          <el-button