From e21e9ad99c4c2a306d15cb270dc41520450ac9f2 Mon Sep 17 00:00:00 2001
From: yxh <172933527@qq.com>
Date: 星期二, 12 十二月 2023 00:16:02 +0800
Subject: [PATCH] yxh：修改了预审核提示信息

---
 src/views/project/fundcheck/expertFeeCheck/index.vue |  121 +++++++++++++++++++++++++++-------------
 1 files changed, 82 insertions(+), 39 deletions(-)

diff --git a/src/views/project/fundcheck/expertFeeCheck/index.vue b/src/views/project/fundcheck/expertFeeCheck/index.vue
index 383b157..e347377 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"
@@ -1316,9 +1328,20 @@
         this.ids.forEach(item => {
           if (xuanzlist.includes(item)) {
           } else {
+            if (this.overallids.length == 1) {
+              this.overallids = [];
+            } else {
+              this.overallids.splice(this.overallids.indexOf(item), 1);
+            }
+            if (this.overallidsvalue.length == 1) {
+              this.overallidsvalue = [];
+            } else {
+              this.overallidsvalue.splice(
+                this.overallidsvalue.indexOf(item),
+                1
+              );
+            }
             this.ids.splice(this.ids.indexOf(item), 1);
-            this.overallids.splice(this.overallids.indexOf(item), 1);
-            this.overallidsvalue.splice(this.overallidsvalue.indexOf(item), 1);
           }
         });
       }
@@ -1363,24 +1386,44 @@
     },
     Totalcalculation(tot) {
       console.log(tot);
-      let bojite={
-        fundids:this.overallids,
-        isTaxAfter:tot,
-      }
+      if(this.overallids.length == 0) {
+        this.$message({
+            type: "info",
+            message: "褰撳墠娌℃湁閫夋嫨瑕佹眹鎬荤殑涓撳璐圭敵璇峰崟锛屼笉鑳芥眹鎬伙紒"
+          });
+        return;}
+      
+      let bojite = {
+        fundids: this.overallids,
+        isTaxAfter: tot
+      };
       if (tot == 0) {
-        TotalcalculationFn(bojite).then(row => {
-          if (row.code=200) {
-            this.$modal.msgSuccess(row.msg);
-          }else{
-          this.$modal.msgError(row.msg);
-          }
-        });
+        TotalcalculationFn(bojite)
+          .then(row => {
+            if (row.code == 200) {
+              this.$modal.msgSuccess(row.msg);
+            } else {
+              console.log(123);
+              this.$modal.msgError(row.msg);
+            }
+          })
+          .catch(error => {
+            this.$modal.msgError(error);
+          });
       } else {
         const hasValue = this.overallidsvalue.every(obj => obj.istax == 1);
         if (hasValue) {
-          TotalcalculationFn(bojite).then(row => {
-            console.log(row.msg);
-          });
+          TotalcalculationFn(bojite)
+            .then(row => {
+              if (row.code == 200) {
+                this.$modal.msgSuccess(row.msg);
+              } else {
+                this.$modal.msgError(row.msg);
+              }
+            })
+            .catch(error => {
+              this.$modal.msgError(error);
+            });
         } else {
           this.$modal.msgError("璇烽�夋嫨绠楃◣鍚庣殑鏁版嵁杩涜鍚堝苟璁＄畻");
         }

--
Gitblit v1.9.3