From 9789cd52927f0193c669ee388303cd2c3e48cfa6 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 28 三月 2024 16:49:51 +0800
Subject: [PATCH] 11

---
 src/views/project/donationdetails/index.vue |   44 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index af7326d..a5d2237 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -2485,6 +2485,7 @@
       infoid: 736,
       drawer: false,
       form: {},
+      istb: false,
       activeName: "",
       tableDatafile: [
         {
@@ -2894,15 +2895,12 @@
             // );
           }
         });
-      } else if (
-        this.actives == 5 &&
-        !this.witnessform.id &&
-        !this.procureddata[0]
-      ) {
+      } else if (this.actives == 5) {
         // 涓嶅瓨鍦ㄦ椂鑾峰彇鍣ㄥ畼淇℃伅
-        if (this.witnessform.id) {
+        if (this.procureddata[0] && !this.istb) {
           return;
         }
+
         listDonationwitnessorgan(searchParam).then(res => {
           if (res.code == 200) {
             if (res.rows[0]) {
@@ -2916,6 +2914,10 @@
                   obj.organname !== "宸﹁倽" &&
                   obj.organname !== "鍙宠倽"
               );
+              this.procureddata = this.procureddata.map(obj => {
+                obj.id = null;
+                return obj;
+              });
               this.procureddata.infoid = this.infoid;
             }
             this.organList.organprocured = [];
@@ -2935,6 +2937,7 @@
             if (response.data) {
               this.witnessform = response.data;
               this.witnessform.infoid = this.infoid;
+              this.istb = false;
             }
           } else {
             // this.$modal.msgError(
@@ -2944,7 +2947,7 @@
         });
       } else if (this.actives == 6) {
         this.activetele = "瀹屾垚鐧昏";
-        if (this.accomplishform.id) {
+        if (this.transplantdata[0] && !this.istb) {
           return;
         }
 
@@ -2956,6 +2959,14 @@
                 this.transplantdata.infoid = this.infoid;
               } else {
                 this.transplantdata = this.allocateddata;
+                this.transplantdata = this.transplantdata.map(obj => {
+                  obj.id = null;
+                  if (obj.organname == "宸︾溂瑙掕啘"||obj.organname == "鍙崇溂瑙掕啘") {
+                    obj.transplantstate = 2;
+                  }
+                  return obj;
+                });
+
                 this.transplantdata.infoid = this.infoid;
               }
               for (let i = 0; i < this.transplantdata.length; i++) {
@@ -2981,6 +2992,22 @@
         });
       } else if (this.actives == 0) {
         this.activetele = "娼滃湪鎹愮尞";
+      }
+      if (!this.allocateddata[0]) {
+        listDonateorgan(searchParam).then(res => {
+          if (res.code == 200) {
+            if (res.rows[0]) {
+              this.allocateddata = res.rows;
+              console.log("this.allocateddata", this.allocateddata);
+              this.allocateddataform.allocateddata = this.allocateddata;
+            }
+            this.organList.organallocated = [];
+            for (let i = 0; i < res.rows.length; i++) {
+              this.organList.organallocated.push(this.allocateddata[i].organno);
+            }
+          } else {
+          }
+        });
       }
     },
     /** 淇濆瓨涓昏〃鎸夐挳 */
@@ -3207,6 +3234,7 @@
             } else {
               addDonationwitness(this.witnessform).then(response => {
                 this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
+                this.istb = true;
                 this.$modal.closeLoading();
               });
             }
@@ -3219,7 +3247,7 @@
               }
             });
 
-            this.form.donationcategory = this.witnessform.donationcategory;
+            //this.form.donationcategory = this.witnessform.donationcategory;
             this.Processvalidation();
           }
         });

--
Gitblit v1.9.3