From c75027743ea7c3ecc2d0885f01d11d2ad78679a3 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期五, 23 十月 2026 14:23:26 +0800
Subject: [PATCH] Merge branch 'yxh' of http://116.62.18.175:6699/r/~yxh/opo-web
---
src/views/project/fund/ethicalExpertFeeApply/index.vue | 423 +++++++++++++++++++++++++++++++---------------------
1 files changed, 251 insertions(+), 172 deletions(-)
diff --git a/src/views/project/fund/ethicalExpertFeeApply/index.vue b/src/views/project/fund/ethicalExpertFeeApply/index.vue
index 5be6779..c6a74c6 100644
--- a/src/views/project/fund/ethicalExpertFeeApply/index.vue
+++ b/src/views/project/fund/ethicalExpertFeeApply/index.vue
@@ -1,122 +1,67 @@
<!-- -->
<template>
<div class="app-container">
- <el-form
- :model="queryParams"
- ref="queryForm"
- :inline="true"
- label-width="70px"
- >
- <el-row align="left">
- <el-col :span="6">
- <el-form-item label="濮撳悕" prop="name">
- <el-input
- v-model="queryParams.name"
- placeholder="璇疯緭鍏ュ鍚�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎹愮尞杩涘害" prop="recordstate">
- <el-select
- v-model="queryParams.recordstate"
- placeholder="璇烽�夋嫨璁板綍鐘舵��"
- clearable
- size="small"
- >
- <el-option
- v-for="dict in dict.type.sys_DonationStatus"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-form-item label="鎹愮尞鑰�" prop="name">
- <el-input
- v-model="queryParams.donorname"
- placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- </el-col>
- <el-col :span="6">
- <el-button
- type="primary"
- icon="el-icon-search"
- size="mini"
- @click="handleQuery"
- >鎼滅储</el-button
- >
- <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
- >閲嶇疆</el-button
- >
- </el-col>
- </el-row>
- </el-form>
<el-row>
- <el-col :span="6">
- <el-card shadow="never">
- <!-- 鎹愮尞妗堜緥鍒楄〃 -->
- <el-row>
- <el-col :span="10">
- <el-row type="flex" :gutter="10" align="right" class="mb8">
- </el-row>
- </el-col>
- </el-row>
- <el-table
- v-loading="loading"
- border
- highlight-current-row
- :data="donatebaseinfoList"
- @row-click="selectDonotor"
- >
- <!-- <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" /> -->
- <el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate">
- <template slot-scope="scope">
- <dict-tag
- :options="dict.type.sys_DonationStatus"
- :value="scope.row.recordstate"
- />
- </template>
- </el-table-column>
- <el-table-column label="濮撳悕" align="center" prop="name" />
- </el-table>
- <pagination
- v-show="total > 0"
- :total="total"
- small
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getBaseInfoList"
- />
- </el-card>
- </el-col>
- <el-col :span="18">
+ <el-col :span="24">
<el-card shadow="naver">
<el-form ref="infoform" label-width="100px">
- <el-row :gutter="4" align="right" class="mb8">
- <el-col :span="9">
- <el-form-item label="鎹愮尞缂栧彿">
- <el-input
- v-model="curCase.donorno"
- :disabled="true"
- ></el-input>
- </el-form-item>
- </el-col>
- <el-col :span="9">
- <el-form-item label="濮撳悕">
- <el-input v-model="curCase.name" :disabled="true"></el-input>
- </el-form-item>
- </el-col>
- </el-row>
+ <!-- 鎶ラ攢鍗曠瓫閫夛細鎹愮尞鑰呫�佸鎵圭姸鎬� -->
+ <el-form
+ class="opo-query-form"
+ :model="fundQueryParam"
+ ref="fundQueryForm"
+ :inline="true"
+ label-width="82px"
+ >
+ <el-row>
+ <el-col :span="6">
+ <el-form-item label="鎹愮尞鑰�" prop="donorname">
+ <el-input
+ v-model="fundQueryParam.donorname"
+ placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQueryFund"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label="瀹℃壒鐘舵��" prop="recordstatus">
+ <el-select
+ v-model="fundQueryParam.recordstatus"
+ placeholder="璇烽�夋嫨瀹℃壒鐘舵��"
+ clearable
+ size="small"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_recordstatus"
+ :key="dict.value"
+ :label="dict.label"
+ :value="Number(dict.value)"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="6">
+ <el-form-item label-width="10px">
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="small"
+ @click="handleQueryFund"
+ >鎼滅储</el-button
+ >
+ <el-button
+ icon="el-icon-refresh"
+ size="small"
+ @click="resetFundQuery"
+ >閲嶇疆</el-button
+ >
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
@@ -198,6 +143,13 @@
/>
</template>
</el-table-column>
+ <el-table-column
+ label="鎹愮尞鑰�"
+ align="center"
+ prop="donorname"
+ width="110px"
+ show-overflow-tooltip
+ />
<!--
<el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
<el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="220px" />
@@ -261,11 +213,119 @@
</template>
</el-table-column>
</el-table>
+ <!-- 鏈�夋嫨妗堜緥鏃跺睍绀鸿鐧诲綍浜哄叏閮ㄤ鸡鐞嗗鏌ュ崟鎹紝瓒呰繃涓�椤靛彲鐢ㄥ垎椤电炕鐪� -->
+ <pagination
+ v-show="fundTotal > 0"
+ :total="fundTotal"
+ small
+ :page.sync="fundQueryParam.pageNum"
+ :limit.sync="fundQueryParam.pageSize"
+ @pagination="listFundData"
+ />
</el-row>
</el-form>
</el-card>
</el-col>
</el-row>
+
+ <!-- 鏂板鐢宠鍗曞墠鍏堥�夋嫨鎹愮尞妗堜緥锛堝師宸︿晶妗堜緥鍒楄〃绉诲埌杩欓噷锛� -->
+ <el-dialog
+ title="閫夋嫨鎹愮尞妗堜緥"
+ :visible.sync="caseDialogVisible"
+ width="760px"
+ append-to-body
+ >
+ <el-form
+ class="opo-query-form"
+ :model="queryParams"
+ ref="queryForm"
+ :inline="true"
+ label-width="70px"
+ >
+ <el-row>
+ <el-col :span="8">
+ <el-form-item label="濮撳悕" prop="name">
+ <el-input
+ v-model="queryParams.name"
+ placeholder="璇疯緭鍏ュ鍚�"
+ clearable
+ size="small"
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label="鎹愮尞杩涘害" prop="recordstate">
+ <el-select
+ v-model="queryParams.recordstate"
+ placeholder="璇烽�夋嫨璁板綍鐘舵��"
+ clearable
+ size="small"
+ style="width: 100%"
+ >
+ <el-option
+ v-for="dict in dict.type.sys_DonationStatus"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="8">
+ <el-form-item label-width="10px">
+ <el-button
+ type="primary"
+ icon="el-icon-search"
+ size="small"
+ @click="handleQuery"
+ >鎼滅储</el-button
+ >
+ <el-button icon="el-icon-refresh" size="small" @click="resetQuery"
+ >閲嶇疆</el-button
+ >
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <el-table
+ ref="caseTable"
+ v-loading="loading"
+ border
+ height="380"
+ highlight-current-row
+ :data="donatebaseinfoList"
+ @row-click="selectDonotor"
+ >
+ <el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate">
+ <template slot-scope="scope">
+ <dict-tag
+ :options="dict.type.sys_DonationStatus"
+ :value="scope.row.recordstate"
+ />
+ </template>
+ </el-table-column>
+ <el-table-column label="濮撳悕" align="center" prop="name" />
+ <el-table-column label="鎿嶄綔" align="center" width="90">
+ <template slot-scope="scope">
+ <el-button type="text" size="mini" @click="selectDonotor(scope.row)"
+ >閫夋嫨</el-button
+ >
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination
+ v-show="total > 0"
+ :total="total"
+ small
+ :page.sync="queryParams.pageNum"
+ :limit.sync="queryParams.pageSize"
+ @pagination="getBaseInfoList"
+ />
+ <div slot="footer" class="dialog-footer">
+ <el-button @click="caseDialogVisible = false">鍙� 娑�</el-button>
+ </div>
+ </el-dialog>
<!-- 娣诲姞鎴栦慨鏀硅垂鐢ㄧ敵璇峰崟 -->
<el-dialog
@@ -284,7 +344,7 @@
clearable
style="width: 100%"
v-model="form.applyTime"
- type="date"
+ type="date" format="yyyy-MM-dd"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="鐢宠鏃ユ湡"
>
@@ -1012,11 +1072,19 @@
},
fundQueryParam: {
pageNum: 1,
- pageSize: 100,
+ pageSize: 10,
infoid: null,
applytype: "2",
- createBy: null
+ createBy: null,
+ // 鎶ラ攢鍗曠瓫閫夋潯浠�
+ donorname: null,
+ recordstatus: null
},
+ // 鍙充晶鎶ラ攢鍗曟�绘暟锛堢敤浜庡垎椤碉級
+ fundTotal: 0,
+ // 銆岄�夋嫨鎹愮尞妗堜緥銆嶅璇濇锛堟柊澧炵敵璇峰崟鏃朵娇鐢級
+ caseDialogVisible: false,
+ casePickerMode: "",
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
@@ -1103,55 +1171,23 @@
},
/** 鏂板鎸夐挳鎿嶄綔 */
handleAdd() {
- if (this.curCase.id) {
- this.$router.push({
- path: "/finance/applyDetail/",
- query: {
- id: 0,
- businessType: "2",
- operationType: "add",
- curCase: this.curCase
- }
- });
- } else {
- const h = this.$createElement;
- this.$message({
- message: h("p", null, [
- h("span", null, "璇峰湪宸﹁竟鐨勬崘鐚渚嬭〃閫夋嫨闇�瑕佹搷浣滅殑妗堜緥锛�")
- ])
- });
- }
- return;
+ // 鏂板鐢宠鍗曪細鍏堝脊鍑恒�岄�夋嫨鎹愮尞妗堜緥銆嶅璇濇
+ this.casePickerMode = "add";
+ this.caseDialogVisible = true;
+ this.getBaseInfoList();
+ },
- if (this.curCase.id) {
- this.istrue += 2;
- this.reset();
- this.dialogOpen = true;
- this.title = "娣诲姞璐圭敤鐢宠";
- this.dialogType = "edit";
- this.queryParams.params = {};
-
- this.form.infoid = this.curCase.id;
- this.form.donorno = this.curCase.donorno;
- this.form.donorname = this.curCase.name;
- this.form.username = this.defaultperson.nickName;
- this.form.userno = this.defaultperson.userName;
-
- this.form.deptmentname = this.defaultperson.dept.deptName;
- this.form.deptmentno = this.defaultperson.dept.deptId;
- this.form.managername = this.defaultperson.dept.leader;
- // this.form.createTime = nowdate;
- //this.open = true;
- //this.initFundApplyForm();
- this.fundDetailArr = [];
- this.fundflowList = [];
- this.addRow();
- } else {
- const h = this.$createElement;
- this.$message({
- message: h("p", null, [h("span", null, "璇峰厛閫夋嫨宸︽柟鎹愮尞妗堜緥 ")])
- });
- }
+ /** 鎼哄甫宸查�夋渚嬭烦杞埌鐢宠鍗曞～鍐欓〉 */
+ goApplyAdd() {
+ this.$router.push({
+ path: "/finance/applyDetail/",
+ query: {
+ id: 0,
+ businessType: "2",
+ operationType: "add",
+ curCase: this.curCase
+ }
+ });
},
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
@@ -1495,18 +1531,60 @@
//鐐瑰嚮鎹愮尞妗堜緥鍒楄〃瑙﹀彂鏂规硶
selectDonotor(row, column, event) {
this.curCase = row;
- this.getfundList();
+ if (this.casePickerMode === "add") {
+ // 浠庛�屾柊澧炵敵璇峰崟銆嶈繘鍏ワ細閫夊畬妗堜緥鐩存帴璺冲埌鐢宠鍗曞～鍐欓〉
+ this.casePickerMode = "";
+ this.caseDialogVisible = false;
+ this.goApplyAdd();
+ }
+ },
+
+ /** 鎸夊綋鍓� fundQueryParam 鏌ヨ鍙充晶鎶ラ攢鍗曞垪琛� */
+ listFundData() {
+ this.loading = true;
+ listFund(this.fundQueryParam).then(response => {
+ this.loading = false;
+ this.donateconsolationfundList = response.rows;
+ this.fundTotal = response.total;
+ });
+ },
+
+ /** 鎶ラ攢鍗曠瓫閫夛細鎼滅储 */
+ handleQueryFund() {
+ this.fundQueryParam.pageNum = 1;
+ this.listFundData();
+ },
+
+ /** 鎶ラ攢鍗曠瓫閫夛細閲嶇疆锛堟竻绌烘潯浠朵笌宸查�夋渚嬶紝鍥炲埌璇ョ櫥褰曚汉鍏ㄩ儴鍗曟嵁锛� */
+ resetFundQuery() {
+ this.fundQueryParam.donorname = null;
+ this.fundQueryParam.recordstatus = null;
+ this.getAllfundList();
+ },
+
+ /** 妫�绱㈠叏閮細鍙栨秷妗堜緥閫夋嫨涓庣瓫閫夋潯浠讹紝鏌ヨ褰撳墠鐧诲綍浜虹殑鍏ㄩ儴浼︾悊瀹℃煡鍗曟嵁 */
+ getAllfundList() {
+ this.curCase = {};
+ if (this.$refs.caseTable) {
+ this.$refs.caseTable.setCurrentRow();
+ }
+ this.reset();
+ this.fundQueryParam.infoid = null;
+ this.fundQueryParam.donorname = null;
+ this.fundQueryParam.recordstatus = null;
+ this.fundQueryParam.pageNum = 1;
+ this.listFundData();
},
//鑾峰彇妗堜緥涓撳璐圭敤鐢宠鍗�
getfundList() {
- this.loading = true;
this.reset();
+ // 閫変腑妗堜緥鍚庢寜妗堜緥灞曠ず锛屽悓鏃舵竻鎺夊垪琛ㄧ瓫閫夋潯浠讹紝閬垮厤涓や釜鏉′欢鍙犲姞瀵艰嚧绌哄垪琛�
+ this.fundQueryParam.donorname = null;
+ this.fundQueryParam.recordstatus = null;
this.fundQueryParam.infoid = this.curCase.id;
- listFund(this.fundQueryParam).then(response => {
- this.loading = false;
- this.donateconsolationfundList = response.rows;
- });
+ this.fundQueryParam.pageNum = 1;
+ this.listFundData();
},
select(row) {
@@ -2057,10 +2135,11 @@
//鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
created() {
this.getUnitList();
- this.getList();
- this.getBaseInfoList();
+ // 妗堜緥鍒楄〃宸茬Щ鍏ャ�岄�夋嫨鎹愮尞妗堜緥銆嶅璇濇锛屾墦寮�瀵硅瘽妗嗘椂鍐嶆煡璇�
this.getlistUser();
this.getCurFundType();
+ // 棣栧睆灞曠ず褰撳墠鐧诲綍浜虹殑鍏ㄩ儴浼︾悊瀹℃煡鍗曟嵁
+ this.getAllfundList();
},
//鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
mounted() {
--
Gitblit v1.9.3