From 966a9c008ded0a25f1de183b680a291212445e31 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期一, 20 十一月 2023 09:50:14 +0800
Subject: [PATCH] yxh

---
 src/views/project/fundcheck/expertFeeCheck/index.vue |   65 +++++++++++++++++++++-----------
 1 files changed, 42 insertions(+), 23 deletions(-)

diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index db33367..f33cf6d 100644
--- a/src/views/project/fundcheck/expertFeeCheck/index.vue
+++ b/src/views/project/fundcheck/expertFeeCheck/index.vue
@@ -122,20 +122,21 @@
       <el-col :span="8">
         <div style="margin-bottom: 15px;">
           <el-button
+            icon="el-icon-remove-outline"
+            type="success"
+            plain
+            size="mini"
+            disabled="true"
+            @click="Totalcalculation(0)"
+            >涓◣鍓嶆眹鎬�</el-button
+          >
+          <el-button
             type="primary"
             plain
             icon="el-icon-circle-check"
             size="mini"
             @click="Totalcalculation(1)"
-            >璁$◣鍚庡悎璁�</el-button
-          >
-          <el-button
-            icon="el-icon-remove-outline"
-            type="success"
-            plain
-            size="mini"
-            @click="Totalcalculation(0)"
-            >璁$◣鍓嶅悎璁�</el-button
+            >涓◣鍚庢眹鎬�</el-button
           >
         </div>
       </el-col>
@@ -159,8 +160,8 @@
           </el-table-column>
           -->
           <el-table-column type="selection" width="45"> </el-table-column>
-          <el-table-column
-            label="涓◣璁$畻鎯呭喌"
+          <!-- <el-table-column
+            label="涓◣璁$畻"
             align="center"
             prop="recordstatus"
             width="200"
@@ -168,7 +169,28 @@
             <template slot-scope="scope">
               <dict-tag :options="dict.type.sys_tax" :value="scope.row.istax" />
             </template>
+          </el-table-column> -->
+          <el-table-column
+            label="涓◣鏃ユ湡"
+            width="120"
+            align="center"
+            prop="fundtaxtime"
+          >
+            <template slot-scope="scope">
+              <span>{{ parseTime(scope.row.fundtaxtime, "{y}-{m}-{d}") }}</span>
+            </template>
           </el-table-column>
+          <el-table-column
+            label="鎵�灞炵粍鍒�"
+            align="center"
+            prop="deptmentname"
+            width="200px"
+          /><el-table-column
+            label="缁忓姙浜�"
+            align="center"
+            prop="username"
+            width="150px"
+          />
           <el-table-column
             label="鐢宠鏃ユ湡"
             width="120"
@@ -179,24 +201,14 @@
               <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
             </template>
           </el-table-column>
-          <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"
@@ -1374,6 +1386,13 @@
     },
     Totalcalculation(tot) {
       console.log(tot);
+      if(this.overallids.length == 0) {
+        this.$message({
+            type: "info",
+            message: "褰撳墠娌℃湁閫夋嫨瑕佹眹鎬荤殑涓撳璐圭敵璇峰崟锛屼笉鑳芥眹鎬伙紒"
+          });
+        return;}
+      
       let bojite = {
         fundids: this.overallids,
         isTaxAfter: tot

--
Gitblit v1.9.3