From d08414f291cdfc84625e6d34241a56228c958134 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期四, 10 八月 2023 14:12:50 +0800
Subject: [PATCH] yxh

---
 src/views/project/fund/overheadcosts/index.vue |   85 ++++++++++--------------------------------
 1 files changed, 21 insertions(+), 64 deletions(-)

diff --git a/src/views/project/fund/overheadcosts/index.vue b/src/views/project/fund/overheadcosts/index.vue
index c3d4f8b..b570cb3 100644
--- a/src/views/project/fund/overheadcosts/index.vue
+++ b/src/views/project/fund/overheadcosts/index.vue
@@ -4,8 +4,8 @@
     <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"
+          <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>
@@ -28,18 +28,6 @@
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
           v-hasPermi="['project:medicalfund:add']">鍒涘缓鐢宠鍗�</el-button>
       </el-col>
-
-      <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-col> </el-col>
     </el-row>
     <el-row>
       <el-table v-loading="loading" border :data="donateconsolationfundList">
@@ -63,6 +51,7 @@
                   <el-table-column label="鑱旂郴鐢佃瘽" align="center" prop="phone" width="150px" />
                 <el-table-column label="宸ヤ綔鍗曚綅" align="center" prop="unitname" width="150px" />
                 -->
+        <el-table-column label="澶囨敞" align="center" prop="remark" />
         <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="280px">
           <template slot-scope="scope">
             <el-button v-if="scope.row.recordstatus == -1 ||
@@ -195,7 +184,7 @@
               </template>
             </el-table-column>
 
-            <el-table-column prop="beneficiaryno" align="center" label="濮撳悕" width="120" v-if="form.applytype != 3">
+            <el-table-column prop="beneficiaryno" align="center" label="濮撳悕" width="120" v-if="form.applytype=='1' || form.applytype=='2'">
               <template slot-scope="scope">
                 <el-button type="primary" plain @click="ShowDetailDialog(scope, 'name')">{{ scope.row.beneficiaryname
                 }}</el-button>
@@ -536,7 +525,7 @@
   data() {
     //杩欓噷瀛樻斁鏁版嵁
     return {
-      currentApplyType: "4",
+      businesstype: "4",
       // 閬僵灞�
       loading: true,
       // 瀵煎嚭閬僵灞�
@@ -582,10 +571,7 @@
       },
 
       //鎹愮尞妗堜緥鍒楄〃鏁版嵁
-      // donationCaseTableData:[],
       donatebaseinfoList: [],
-      //褰撳墠閫変腑鎹愮尞妗堜緥
-      curCase: {},
       //鏄惁鏄剧ず璐圭敤鐢宠寮圭獥
       dialogOpen: false,
       // title: "",
@@ -805,8 +791,8 @@
     /** 鏂板鎸夐挳鎿嶄綔 */
     handleAdd() {
       this.$router.push({
-        path: "/finance/funddetail/",
-        query: { id: 0, businesstype: "4", operationtype: "add" }
+        path: "/finance/fundcontext/",
+        query: { id: 0, businessType: "4", operationType: "add" }
       });
 
       this.istrue += 2;
@@ -830,8 +816,8 @@
     /** 淇敼鎸夐挳鎿嶄綔 */
     handleUpdate(row) {
       this.$router.push({
-        path: "/finance/funddetail/",
-        query: { id: row.id, businesstype: 4, operationtype: "edit" }
+        path: "/finance/fundcontext/",
+        query: { id: row.id, businessType: "4", operationType: "update" }
       });
 
       this.isopen = 0;
@@ -845,7 +831,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 })) : []
 
@@ -862,15 +847,13 @@
     /** 鏌ョ湅鎸夐挳鎿嶄綔 */
     handleDetail(row) {
       this.$router.push({
-        path: "/finance/funddetail/",
-        query: { id: row.id, businesstype: 4, operationtype: "detail" }
+        path: "/finance/fundcontext/",
+        query: { id: row.id, businessType: "4", operationType: "detail"}
       });
 
       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";
@@ -878,10 +861,9 @@
 
       getFund(id).then((response) => {
         this.form = response.data;
-        this.form.name = this.curCase.name;
         let listFundflowparams = {
           fundid: row.id,
-          fundtype: 2,
+          fundtype: 4,
         };
         //闄勪欢澶勭悊
         this.fileList = this.form.annexbankcard ? this.form.annexbankcard.split(",").map(item => ({ url: item, name: item })) : []
@@ -920,8 +902,7 @@
               delFunddetail(listdetails[i].id);
             }
           });
-          // this.getList();
-          this.getfundList();
+          this.getList();
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
         .catch(() => { });
@@ -967,18 +948,14 @@
             this.form.annexbankcard = list.map(item => item.url).join(",");
           }
 
-          this.form.donorname = this.curCase.name;
           this.form.pretaxcost = parseFloat(this.form.amountrequested).toFixed(
             2
           );
 
           if (this.form.id != null) {
             updateFund(this.form).then((response) => {
-              this.getfundList();
-
               this.dialogOpen = false;
               this.getList();
-              this.selectDonotor(this.curCase);
               this.$modal.msgSuccess("淇敼鎴愬姛");
               this.loading = false;
               for (let m = 0; m < this.fundDetails.length; m++) {
@@ -1043,20 +1020,14 @@
         }
       });
     },
-    /** 鏌ヨ鎹愮尞浜洪亾鎱伴棶閲戝垪琛� */
+    /** 鏌ヨ鍒楄〃 */
     getList() {
       this.loading = true;
       this.queryParams.params = {};
-      if (null != this.daterangeReporttime && "" != this.daterangeReporttime) {
-        this.queryParams.params["beginReporttime"] =
-          this.daterangeReporttime[0];
-        this.queryParams.params["endReporttime"] = this.daterangeReporttime[1];
-      }
-      // this.queryParams.residencetown = this.$refs.areaSelect.getQu();
-      listDonatebaseinfo(this.queryParams).then((response) => {
-        this.donatebaseinfoList = response.rows;
-        this.total = response.total;
+      this.reset();
+      listFund(this.fundQueryParam).then((response) => {
         this.loading = false;
+        this.donateconsolationfundList = response.rows;
       });
     },
 
@@ -1067,20 +1038,7 @@
         this.total = response.total;
         this.loading = false;
       });
-    },
-
-
-
-
-    getfundList() {
-      this.loading = true;
-      this.reset();
-      this.fundQueryParam.infoid = this.curCase.id;
-      listFund(this.fundQueryParam).then((response) => {
-        this.loading = false;
-        this.donateconsolationfundList = response.rows;
-      });
-    },
+    },    
 
     // 鍙栨秷鎸夐挳
     cancel() {
@@ -1296,7 +1254,7 @@
 
     //鑾峰彇璐圭敤绫诲瀷
     getCurFundType() {
-      getFundTypeAll(this.currentApplyType).then((res) => {
+      getFundTypeAll(this.businesstype).then((res) => {
         let dataList = res.data;
         this.fundtypeArrAll = dataList;
         this.fundtypeArr = [];
@@ -1500,12 +1458,11 @@
 
   //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
   created() {
-    this.getList();
     this.getBaseInfoList();
-
     this.getCurFundType();
     this.getlistUser();
-    // this.getUnitList();
+    this.getUnitList();
+    this.getList();
   },
 
   //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�

--
Gitblit v1.9.3