From 4b59498ceaf1177e5e16578b8e401c0606d0637e Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 12 十月 2023 15:49:59 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue | 87 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 78 insertions(+), 9 deletions(-)
diff --git a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
index 8bb8424..302c123 100644
--- a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -63,6 +63,41 @@
</el-select>
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="5">
+ <el-form-item
+ label-width="120px"
+ 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>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <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="6">
<el-button
type="primary"
@@ -128,11 +163,6 @@
prop="managername"
width="150px"
/>
- <!-- <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="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"
@@ -143,6 +173,19 @@
<dict-tag
:options="dict.type.sys_recordstatus"
:value="scope.row.recordstatus"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="鐢宠鏉愭枡鐘舵��"
+ width="140"
+ align="center"
+ prop="checkFlag"
+ >
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_stage_type"
+ :value="scope.row.checkstatus"
/>
</template>
</el-table-column>
@@ -160,7 +203,7 @@
fixed="right"
align="center"
class-name="small-padding fixed-width"
- width="160px"
+ width="260px"
>
<template slot-scope="scope">
<el-button
@@ -171,6 +214,7 @@
@click="handleDetail(scope.row)"
>璇︽儏</el-button
>
+
<el-button
v-if="scope.row.checkFlag == 1"
size="mini"
@@ -711,6 +755,8 @@
import Li_area_select from "@/components/Address";
import OrgSelecter from "@/views/project/components/orgselect";
import { getUserProfile } from "@/api/system/user";
+// 瀵煎叆鏈湴瀛樺偍鐨勬柟娉�
+import { setItem, grtItem, removeItem } from "@/utils/storage.js";
export default {
components: {
@@ -728,7 +774,8 @@
"sys_ConsolationType",
"sys_fund_type",
"sys_finsubject",
- "sys_financeitemtype"
+ "sys_financeitemtype",
+ "sys_stage_type"
],
data() {
return {
@@ -824,6 +871,21 @@
label: "鍏ㄩ儴"
}
],
+ checkmaterials: [
+ {
+ value: 1,
+ label: "寰呭鏌�"
+ },
+ {
+ value: 2,
+ label: "瀹℃牳閫氳繃绛夊緟鏉愭枡"
+ },
+ {
+ value: 3,
+ label: "宸叉敹鍒版潗鏂�"
+ }
+ ],
+
// 鏌ヨ鍙傛暟
queryParams: {
pageNum: 1,
@@ -912,6 +974,11 @@
this.getUsermsg();
},
mounted() {
+ if (grtItem("ethicalExpertFeeCheck")) {
+ this.queryParams = grtItem("ethicalExpertFeeCheck");
+ this.queryParams.APPLICATIONBEGTIME = "";
+ this.queryParams.APPLICATIONENDTIME = "";
+ }
this.selectReporters();
this.getlistOrganization();
//this.getlistUser();
@@ -928,6 +995,8 @@
getlistbypower() {
this.loading = true;
listbypower(this.queryParams).then(res => {
+ removeItem("ethicalExpertFeeCheck");
+ setItem("ethicalExpertFeeCheck", this.queryParams);
//console.log("鏍规嵁鏉冮檺鏄剧ず鍒楄〃", res);
this.loading = false;
let list = res.rows;
@@ -1022,7 +1091,6 @@
isopenvalue(index) {
this.isopen = index;
},
-
tojust(e) {
let username = "111";
getFund(e).then(res => {
@@ -1228,7 +1296,8 @@
});
}
},
- /** 淇敼鎸夐挳鎿嶄綔 */
+
+ /** 瀹℃牳鎸夐挳鎿嶄綔 */
handleCheck(row) {
this.$router.push({
path: "/finance/applyDetail/",
--
Gitblit v1.9.3