From f3004e4dc475e6a81ac884d166fc472b052a3ab4 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 11 十月 2023 17:16:08 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/fundcheck/expertFeeCheck/index.vue | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index 264798d..8fc2cff 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -41,6 +41,17 @@
</el-col> -->
</el-row>
<el-row>
+ <el-col :span="5">
+ <el-form-item label="鎹愮尞鑰�" prop="donorname" style="float: left">
+ <el-input
+ v-model="queryParams.donorname"
+ placeholder="璇疯緭鍏ョ敵璇蜂汉鎹愮尞鑰�"
+ clearable
+ size="small"
+ @keyup.enter.native="flowconclusion"
+ />
+ </el-form-item>
+ </el-col>
<el-col :span="3">
<div style="margin-bottom: 15px;">
<el-button
@@ -88,14 +99,35 @@
<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"
+ >
+ <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="donorname" width="120px" />
<el-table-column label="澶囨敞" align="center" prop="remark" />
<!--<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">
+ <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="260px">
<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>
+ <el-button
+ v-if="scope.row.checkFlag == 1"
+ size="mini"
+ type="text"
+ icon="el-icon-edit"
+ @click="beforehandCheck(scope.row)"
+ >棰勫鏍�</el-button
+ >
<el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
@click="handleCheck(scope.row)">瀹℃牳</el-button>
<!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
@@ -299,7 +331,7 @@
<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="200">
<template slot-scope="scope">
<el-button @click="saveRows(scope.row, scope.$index)" type="text" size="small" v-if="show === 1">
淇濆瓨
@@ -444,6 +476,7 @@
"sys_fund_type",
"sys_finsubject",
"sys_financeitemtype",
+ "sys_stage_type"
],
data() {
return {
@@ -608,6 +641,8 @@
mounted() {
if (grtItem("expertFeeCheck")) {
this.queryParams = grtItem("expertFeeCheck");
+ this.queryParams.APPLICATIONBEGTIME = '';
+ this.queryParams.APPLICATIONENDTIME ='';
};
this.selectReporters();
this.getlistOrganization();
@@ -942,6 +977,17 @@
});
}
},
+ beforehandCheck(row){
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: row.id,
+ businessType: "1",
+ beforehandType:'1',
+ operationType: "check",
+ }
+ });
+ },
/** 淇敼鎸夐挳鎿嶄綔 */
handleCheck(row) {
this.$router.push({
--
Gitblit v1.9.3