From 1fc6fb99de36cc345e23f8ca5a6cbb9bc1828c07 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 04 九月 2023 13:50:23 +0800
Subject: [PATCH] 11

---
 src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue |   69 +++++++++++++++++++++-------------
 1 files changed, 42 insertions(+), 27 deletions(-)

diff --git a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
index 3ded818..d031905 100644
--- a/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/ethicalExpertFeeCheck/index.vue
@@ -32,50 +32,45 @@
     </el-form>
     <el-form ref="infoform" label-width="100px">
       <el-row>
-        <el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" border :data="donateconsolationfundList" @selection-change="handleSelectionChange">          
+         <!--
           <el-table-column label="瀹℃壒鐘舵��" width="120" align="center" prop="checkFlag">
             <template slot-scope="scope">
               <span v-if="scope.row.checkFlag == 0"><i class="el-icon-check"
                   style="color: #5fb878; font-weight: bold"></i></span>
-              <!-- <span v-else>寰呭鏍�</span> -->
+              <span v-else>寰呭鏍�</span>
             </template>
           </el-table-column>
+          -->
           <el-table-column label="鐢宠鏃ユ湡" width="120" align="center" prop="createTime">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="鐢宠浜�" align="center" prop="username" width="120px" />
-          <el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" width="240px" />
-          <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="120px" />
-          <!-- <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="username" width="150px" />
+          <el-table-column label="鐢宠閲戦" align="center" prop="pretaxcost" width="200px" />
+          <el-table-column label="鎵�灞炵粍鍒�" align="center" prop="deptmentname" width="200px" />
+          <el-table-column label="缁勯暱" align="center" 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="recordstatus" width="180">
+          <el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" /> -->
+          <el-table-column label="瀹℃牳鐘舵��" align="center" prop="recordstatus" width="200">
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_recordstatus" :value="scope.row.recordstatus" />
             </template>
           </el-table-column>
-          <el-table-column label="棰勬敮璐圭敤" align="center" prop="prepaidamount" width="120px" />
-          <el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />
-
+          <el-table-column label="鎹愮尞鑰�" align="center" prop="donorname" width="120px" />
+          <el-table-column label="澶囨敞" align="center" prop="remark" />
+          <!--<el-table-column label="鎹愮尞缂栧彿" align="center" prop="donorno" />
+          <el-table-column label="璐㈠姟瀹℃牳" align="center" prop="financechecher" width="140" />-->
           <el-table-column label="鎿嶄綔" fixed="right" align="center" class-name="small-padding fixed-width" width="260px">
             <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>
               <el-button v-if="scope.row.checkFlag == 1" size="mini" type="text" icon="el-icon-edit"
-                @click="handleUpdate(scope.row)">瀹℃牳</el-button>
+                @click="handleCheck(scope.row)">瀹℃牳</el-button>
+              <el-button size="mini" type="text" icon="el-icon-edit" v-if="scope.row.checkFlag == 0"
+                @click="handleDetail(scope.row)">璇︽儏</el-button>
               <!-- v-hasPermi="['project:donateconsolationfund:edit']" -->
               <el-button size="mini" type="text" icon="el-icon-download" @click="totaldayin(scope.row.id)"
                 v-hasPermi="['project:donateconsolationfund:download']">涓嬭浇</el-button>
@@ -867,7 +862,17 @@
       }
     },
     /** 淇敼鎸夐挳鎿嶄綔 */
-    handleUpdate(row) {
+    handleCheck(row) {      
+      this.$router.push({
+        path: "/finance/applyDetail/",
+        query: {
+          id: row.id,
+          businessType: "2",
+          operationType: "check"
+        }
+      });
+      return;
+
       this.isopen = 0;
       this.reset();
       this.queryParams.params = {};
@@ -1287,7 +1292,17 @@
     },
 
     //鏌ョ湅瀹℃牳璇︽儏
-    handleShow(row) {
+    handleDetail(row) {      
+      this.$router.push({
+        path: "/finance/applyDetail/",
+        query: {
+          id: row.id,
+          businessType: "2",
+          operationType: "detail"
+        }
+      });
+      return;
+
       this.isopen = 0;
       this.reset();
       this.queryParams.params = {};

--
Gitblit v1.9.3