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/donationdetails/index.vue |   49 +++++++++++++++++++++++++++++++++----------------
 1 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index bf69ebc..8780e32 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -156,7 +156,7 @@
     <div style="background: #fff;">
       <!-- 椤堕儴鏁版嵁 -->
       <div class="boxdiv">
-        <div class="top-text">鎹愮尞鑰呰褰曞伐浣滃彴</div>
+        <div class="top-text">鎹愮尞妗堜緥淇℃伅</div>
         <el-form
           ref="form"
           :model="form"
@@ -747,7 +747,7 @@
             >涓婃姤瀹℃牳</el-button
           >
 
-          <el-button @click="cancel">鍙� 娑�</el-button>
+          <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
           <!-- <el-button @click="handleapproval">鎻愪氦瀹℃牳</el-button> -->
         </div>
       </div>
@@ -972,7 +972,7 @@
             @click="makeastepforward"
             >涓嬩竴姝�</el-button
           > -->
-          <el-button @click="cancel">鍙� 娑�</el-button>
+          <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
       </div>
       <!-- 鎹愮尞纭 -->
@@ -1172,7 +1172,7 @@
             @click="makeastepforward"
             >涓嬩竴姝�</el-button
           > -->
-          <el-button @click="cancel">鍙� 娑�</el-button>
+          <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
       </div>
       <!-- 浼︾悊瀹℃煡 -->
@@ -1240,7 +1240,7 @@
             @click="makeastepforward"
             >涓嬩竴姝�</el-button
           > -->
-          <el-button @click="cancel">鍙� 娑�</el-button>
+          <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
       </div>
       <!-- 鍣ㄥ畼鍒嗛厤 -->
@@ -1618,7 +1618,7 @@
             @click="makeastepforward"
             >涓嬩竴姝�</el-button
           > -->
-          <el-button @click="cancel">鍙� 娑�</el-button>
+          <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
       </div>
       <!-- 鑾峰彇瑙佽瘉 -->
@@ -1974,7 +1974,7 @@
             >涓嬩竴姝�</el-button
           > -->
 
-          <el-button @click="cancel">鍙� 娑�</el-button>
+          <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
       </div>
       <!-- 瀹屾垚鐧昏 -->
@@ -2095,7 +2095,7 @@
             @click="Reportforreview"
             >涓婃姤瀹℃牳</el-button
           >
-          <el-button @click="cancel">鍙� 娑�</el-button>
+          <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
       </div>
       <!-- 瀹岀粨娴佺▼ -->
@@ -2605,9 +2605,12 @@
       let searchParam = {
         infoid: this.infoid
       };
-      if (this.actives == 1 && !this.medicineform.infoid) {
+      if (this.actives == 1) {
         this.annexfilesList = this.medicinelist;
         this.activetele = "鍖诲璇勪及";
+        if (this.medicineform.infoid) {
+          return;
+        }
         listMedicalevaluation(searchParam).then(response => {
           if (response.code == 200 && response.rows[0]) {
             this.medicineform = response.rows[0];
@@ -2617,9 +2620,12 @@
             // );
           }
         });
-      } else if (this.actives == 2 && !this.affirmform.infoid) {
+      } else if (this.actives == 2) {
         this.annexfilesList = this.affirmlist;
         this.activetele = "鎹愮尞纭";
+        if (this.affirmform.infoid) {
+          return;
+        }
         listRelativesconfirmation(searchParam).then(response => {
           if (response.code == 200 && response.rows[0]) {
             this.affirmform = response.rows[0];
@@ -2646,10 +2652,12 @@
             // );
           }
         });
-      } else if (this.actives == 3 && !this.ethicform.infoid) {
+      } else if (this.actives == 3) {
         this.annexfilesList = this.ethiclist;
         this.activetele = "浼︾悊瀹℃煡";
-
+        if (this.ethicform.infoid) {
+          return;
+        }
         listDonateflowchart(searchParam).then(response => {
           if (response.code == 200 && response.rows.length) {
             this.ethicform = response.rows[0];
@@ -2701,9 +2709,12 @@
             // );
           }
         });
-      } else if (this.actives == 6 && !this.allocationform.infoid) {
+      } else if (this.actives == 6) {
         this.annexfilesList = this.registerlist;
         this.activetele = "瀹屾垚鐧昏";
+        if (this.allocationform.infoid) {
+          return;
+        }
         let accpre = {
           id: searchParam.infoid
         };
@@ -2732,7 +2743,7 @@
           }
         });
       } else if (this.actives == 0) {
-        this.annexfilesList = this.registerlist;
+        this.annexfilesList = this.potentiallist;
         this.activetele = "娼滃湪鎹愮尞";
       }
     },
@@ -3065,9 +3076,14 @@
         // this.GetAttacheddata();
       } else if (this.form.workflow > this.actives) {
         // this.submitForm();
+        Modifydonationattachment(this.donatelist).then(res => {
+          console.log(res);
+        });
+        this.listDonateannex()
         this.GetAttacheddata();
       } else {
-        this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
+        this.submitForm();
+        // this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
         return;
       }
       console.log(this.form.workflow);
@@ -3305,7 +3321,7 @@
   height: 100%;
   .left-course {
     background: #fff;
-    width: 25vw;
+    width: 20vw;
     text-align: center;
     margin: 20px 10px;
     padding: 10px;
@@ -3378,6 +3394,7 @@
   padding-right: 66px;
 }
 .boxdiv {
+  max-width: 80vw;
   font-size: 18px;
   padding: 0 30px;
   padding-bottom: 10px;

--
Gitblit v1.9.3