From 0b5a704e49545b4059b9eebe247adea8ec14911f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 05 六月 2025 11:45:24 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo-web

---
 src/views/project/fund/performancedetails/index.vue |   41 ++++++++++++++++++++++++++---------------
 1 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue
index 8aafd44..3144c06 100644
--- a/src/views/project/fund/performancedetails/index.vue
+++ b/src/views/project/fund/performancedetails/index.vue
@@ -14,7 +14,7 @@
                 type="date"
                 value-format="yyyy-MM-dd HH:mm:ss"
                 placeholder="鐢宠鏃ユ湡"
-                disabled="true"
+                :disabled="true"
               >
               </el-date-picker>
             </el-form-item>
@@ -205,7 +205,7 @@
                 ></el-cascader> -->
               </template>
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               prop="jxrq"
               align="center"
               label="缁╂晥鏃ユ湡"
@@ -219,7 +219,7 @@
                 >
                 </el-date-picker>
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <el-table-column
               prop="amount"
               align="center"
@@ -1789,12 +1789,21 @@
       };
       this.$modal.loading("姝ｅ湪鎻愪氦瀹℃牳锛岃绋嶅�欙紒");
       checkfund(checkFundObj).then(res => {
-        //鍏抽棴绐楀彛
-        this.reset();
-        this.$modal.closeLoading();
-        this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
-        this.$store.dispatch("tagsView/delView", this.$route);
-        this.$router.go(-1);
+        if (res.code == 200) {
+          //鍏抽棴绐楀彛
+          this.reset();
+          this.$modal.closeLoading();
+          this.$modal.msgSuccess("瀹℃牳瀹屾垚!");
+          this.$store.dispatch("tagsView/delView", this.$route);
+          this.$router.go(-1);
+        } else {
+          this.$modal.closeLoading();
+          if (res.msg) {
+            this.$modal.msgError("鎿嶄綔澶辫");
+          } else {
+            this.$modal.msgError(res.msg);
+          }
+        }
       });
     },
 
@@ -1812,7 +1821,7 @@
         this.standardlevel = res.data.standardlevel;
         if (
           this.userprofile.userName == "admin" ||
-          this.userprofile.userName == "001" ||
+          this.userprofile.userName == "053" ||
           this.userprofile.userName == "047"
         ) {
           this.ismanager = true;
@@ -2056,10 +2065,12 @@
         if (!this.rbDetails[i].taxamount) {
           this.rbDetails[i].taxamount = 0;
         }
-        this.rbDetails[i].taxedamount =
+        this.rbDetails[i].taxedamount = (
           parseFloat(this.rbDetails[i].amount) -
-          parseFloat(this.rbDetails[i].taxamount);
+          parseFloat(this.rbDetails[i].taxamount)
+        ).toFixed(2);
         targetValue += parseFloat(this.rbDetails[i].amount); // 鍋囪姣忎釜瀵硅薄涓殑鐗瑰畾鍊煎瓨鍌ㄥ湪'specificValue'灞炴�т笅
+        console.log(this.rbDetails[i].taxedamount, "鍚堣");
       }
       console.log(targetValue, "鍚堣");
       this.form.pretaxcost = targetValue;
@@ -2831,19 +2842,19 @@
       var columnnames = [
         "applytype",
         "itemid",
-        "jxrq",
+        // "jxrq",
         "beneficiaryname",
         "idcardno",
         "depositbank",
         "bankcardno",
-        "remark",
+        "remark"
       ];
       columns.forEach((column, index) => {
         if (index === 0) {
           sums[index] = "鍚堣";
           return;
         }
-     
+
         //鍘婚櫎閮ㄥ垎瀛楁璁＄畻
         if (columnnames.indexOf(column.property) > -1) {
           return;

--
Gitblit v1.9.3