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

---
 src/views/project/donationdetails/index.vue |   35 ++++++++++++++++++++++++++++++-----
 1 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index a95f530..1bbeb09 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: [
         {
@@ -2825,6 +2826,7 @@
       let searchParam = {
         infoid: this.infoid
       };
+      console.log(this.procureddata, "procureddata");
       if (this.actives == 1) {
         this.activetele = "鍖诲璇勪及";
 
@@ -2893,11 +2895,12 @@
             // );
           }
         });
-      } else if (this.actives == 5 && !this.witnessform.id) {
+      } 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]) {
@@ -2905,8 +2908,16 @@
               this.procureddata.infoid = this.infoid;
             } else {
               this.procureddata = this.allocateddata.filter(
-                obj => obj.organname !== "宸﹀崐鑲�" && obj.organname !== "鍙冲崐鑲�"
+                obj =>
+                  obj.organname !== "宸﹀崐鑲�" &&
+                  obj.organname !== "鍙冲崐鑲�" &&
+                  obj.organname !== "宸﹁倽" &&
+                  obj.organname !== "鍙宠倽"
               );
+              this.procureddata = this.procureddata.map(obj => {
+                obj.id = null;
+                return obj;
+              });
               this.procureddata.infoid = this.infoid;
             }
             this.organList.organprocured = [];
@@ -2926,6 +2937,7 @@
             if (response.data) {
               this.witnessform = response.data;
               this.witnessform.infoid = this.infoid;
+              this.istb = false;
             }
           } else {
             // this.$modal.msgError(
@@ -2947,6 +2959,10 @@
                 this.transplantdata.infoid = this.infoid;
               } else {
                 this.transplantdata = this.allocateddata;
+                this.transplantdata = this.transplantdata.map(obj => {
+                  obj.id = null;
+                  return obj;
+                });
                 this.transplantdata.infoid = this.infoid;
               }
               for (let i = 0; i < this.transplantdata.length; i++) {
@@ -3066,11 +3082,11 @@
     // 淇濆瓨浜岀骇琛ㄦ寜閽�
     Savethedetails() {
       console.log(this.actives);
-      this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
       if (this.actives == 1) {
         this.medicineform.infoid = this.infoid;
         this.$refs["medicineform"].validate(valid => {
           if (valid) {
+            this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
             if (this.medicineform.id != null) {
               updateMedicalevaluation(this.medicineform).then(response => {
                 this.$modal.msgSuccess("鍖诲璇勪及淇℃伅淇敼鎴愬姛");
@@ -3091,6 +3107,7 @@
         this.affirmform.kinship = this.kinship.join(",");
         this.$refs["affirmform"].validate(valid => {
           if (valid) {
+            this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
             if (this.affirmform.id != null) {
               this.affirmform.residenceprovincename = this.defultAddresss.sheng;
               this.affirmform.residencecityname = this.defultAddresss.shi;
@@ -3115,6 +3132,7 @@
         this.ethicform.infoid = this.infoid;
         this.$refs["ethicform"].validate(valid => {
           if (valid) {
+            this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
             if (this.ethicform.id != null) {
               // updateDonateflowchart(this.ethicform).then(response => {
               updateEthicalreviewopinions(this.ethicform).then(res => {
@@ -3134,6 +3152,8 @@
       } else if (this.actives == 4) {
         this.procureddata.infoid = this.infoid;
         this.$refs["allocateddataform"].validate(valid => {
+          this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
+
           /**
           let rows = [];
           this.allocateddata.map(item => {
@@ -3184,6 +3204,8 @@
           }
 
           if (valid) {
+            this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
+
             if (this.witnessform.id != null) {
               updateDonationwitness(this.witnessform).then(response => {
                 this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛");
@@ -3192,6 +3214,7 @@
             } else {
               addDonationwitness(this.witnessform).then(response => {
                 this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
+                this.istb = true;
                 this.$modal.closeLoading();
               });
             }
@@ -3204,7 +3227,7 @@
               }
             });
 
-            this.form.donationcategory = this.witnessform.donationcategory;
+            //this.form.donationcategory = this.witnessform.donationcategory;
             this.Processvalidation();
           }
         });
@@ -3212,6 +3235,8 @@
         this.accomplishform.infoid = this.infoid;
         this.$refs["accomplishform"].validate(valid => {
           if (valid) {
+            this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
+
             // 淇濆瓨鎹愮尞鍣ㄥ畼绉绘淇℃伅
             this.transplantdata.infoid = this.infoid;
             console.log(this.form);

--
Gitblit v1.9.3