From 733457daf115deb6088984c3c55dc5bcc906d28c Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期三, 09 八月 2023 23:53:58 +0800
Subject: [PATCH] yxh

---
 src/views/project/fund/fundApply/index.vue |   29 ++++++++++-------------------
 1 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/views/project/fund/fundApply/index.vue b/src/views/project/fund/fundApply/index.vue
index 229e81c..aa4e074 100644
--- a/src/views/project/fund/fundApply/index.vue
+++ b/src/views/project/fund/fundApply/index.vue
@@ -24,7 +24,7 @@
       </el-row>
     </el-form>
     <el-row>
-      <el-col :span="8">
+      <el-col :span="6">
         <el-card shadow="never">
           <!-- 鎹愮尞妗堜緥鍒楄〃 -->
           <el-row>
@@ -47,7 +47,7 @@
             :limit.sync="queryParams.pageSize" @pagination="getBaseInfoList" />
         </el-card>
       </el-col>
-      <el-col :span="16">
+      <el-col :span="18">
         <el-card shadow="naver">
           <el-form ref="infoform" label-width="100px">
             <el-row :gutter="4" align="right" class="mb8">
@@ -558,9 +558,6 @@
         deptmentname: [
           { required: true, message: "璇疯緭鍏ユ墍灞炵粍鍒�", trigger: "blur" },
         ],
-        amountrequested: [
-          { required: true, message: "璇疯緭鍏ョ敵璇烽噾棰�", trigger: "blur" },
-        ],
       },
       //鎹愮尞妗堜緥鍒楄〃鏁版嵁
       // donationCaseTableData:[],
@@ -749,10 +746,14 @@
       if (this.curCase.id) {
         this.istrue += 2;
         this.reset();
+        this.dialogOpen = true;
+        this.title = "娣诲姞璐圭敤鐢宠";
+        this.dialogType = "edit";
         this.queryParams.params = {};
-        this.form.donorno = this.curCase.donorno;
-        this.form.name = this.curCase.name;
+
         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;
 
@@ -765,9 +766,6 @@
         this.fundDetailArr = [];
         this.fundflowList = [];
         this.addRow();
-        this.dialogOpen = true;
-        this.title = "娣诲姞璐圭敤鐢宠";
-        this.dialogType = "edit";
       } else {
         const h = this.$createElement;
         this.$message({
@@ -1000,8 +998,7 @@
           if (list.length > 0) {
             this.form.annexbankcard = list.map(item => item.url).join(",");
           }
-
-          this.form.donorname = this.curCase.name;
+          
           if (this.form.id != null) {
             updateFund(this.form).then((response) => {
               this.getfundList();
@@ -1109,8 +1106,6 @@
       this.isopen = 0;
       this.reset();
       this.queryParams.params = {};
-      this.form.donorno = this.curCase.donorno;
-      this.form.infoid = this.curCase.id;
       this.dialogOpen = true;
       this.title = "淇敼璐圭敤鐢宠";
       this.dialogType = "edit";
@@ -1118,7 +1113,6 @@
       const id = row.id || this.ids;
       getFund(id).then((response) => {
         this.form = response.data;
-        this.form.name = this.curCase.name;
         //闄勪欢澶勭悊
         this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
 
@@ -1137,8 +1131,6 @@
       this.isopen = 0;
       this.reset();
       this.queryParams.params = {};
-      this.form.donorno = this.curCase.donorno;
-      this.form.infoid = this.curCase.id;
       this.dialogOpen = true;
       this.title = "鏌ョ湅璐圭敤鐢宠";
       this.dialogType = "detail";
@@ -1146,7 +1138,6 @@
 
       getFund(id).then((response) => {
         this.form = response.data;
-        this.form.name = this.curCase.name;
         let listFundflowparams = {
           fundid: row.id,
           fundtype: 2,
@@ -1470,7 +1461,7 @@
         this.$modal.msgSuccess(response.msg);
         this.fileList.push({ name: response.fileName, url: response.fileName });
       } else {
-        console.log(response.msg);;
+        this.$modal.msgError(response.msg);
       }
     },
 

--
Gitblit v1.9.3