From 23a9cb837058edd4fd7fd07d74a200845297bca1 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 14 九月 2023 10:56:16 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/fundcheck/expertFeeCheck/index.vue | 66 ++++++++++++++++++++++++++-------
1 files changed, 52 insertions(+), 14 deletions(-)
diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index 5b30798..3685dbf 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -6,14 +6,25 @@
<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">
+ @keyup.enter.native="flowconclusion">
</el-date-picker>
+ </el-form-item>
+ </el-col>
+ <el-col :span="5">
+ <el-form-item label="閲戦" prop="money" style="float: left">
+ <el-input
+ v-model="queryParams.money"
+ placeholder="璇疯緭鍏ョ敵璇蜂汉閲戦"
+ clearable
+ size="small"
+ @keyup.enter.native="flowconclusion"
+ />
</el-form-item>
</el-col>
<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" />
+ @keyup.enter.native="flowconclusion" />
</el-form-item>
</el-col>
<el-col :span="5">
@@ -24,9 +35,25 @@
</el-select>
</el-form-item>
</el-col>
- <el-col :span="6">
+ <!-- <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-row>
+ <el-col :span="3">
+ <div style="margin-bottom: 15px;">
+ <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
+ >
+ </div>
</el-col>
</el-row>
</el-form>
@@ -68,7 +95,7 @@
<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>
+ @click="handleDetail(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']" -->
@@ -497,6 +524,7 @@
APPLICATIONENDTIME: null,
CHECKFLAG: 1,
APPLYTYPE: 1,
+ money: null
},
// 琛ㄥ崟鍙傛暟
form: {},
@@ -908,15 +936,15 @@
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleCheck(row) {
- // this.$router.push({
- // path: "/finance/applyDetail/",
- // query: {
- // id: row.id,
- // businessType: "1",
- // operationType: "check"
- // }
- // });
- // return;
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: row.id,
+ businessType: "1",
+ operationType: "check"
+ }
+ });
+ return;
this.isopen = 0;
this.reset();
@@ -958,7 +986,17 @@
},
//鏌ョ湅瀹℃牳璇︽儏
- handleShow(row) {
+ handleDetail(row) {
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: row.id,
+ businessType: "1",
+ operationType: "detail"
+ }
+ });
+ return;
+
this.isopen = 0;
this.reset();
this.queryParams.params = {};
--
Gitblit v1.9.3