From 0c5042c0d7c8a904298b25ad42143a843dd47595 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 10 十一月 2023 17:46:18 +0800
Subject: [PATCH] 11

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

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 1696702..50036af 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -33,7 +33,7 @@
               >
                 <p>
                   鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.medicalevaluation.updatetime)
+                    parseTime(Processdata.medicalevaluation.createtime)
                   }}</span>
                 </p>
                 <p>
@@ -54,7 +54,7 @@
               >
                 <p>
                   鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.relativesconfirmation.updatetime)
+                    parseTime(Processdata.relativesconfirmation.createtime)
                   }}</span>
                 </p>
                 <p>
@@ -75,7 +75,7 @@
               >
                 <p>
                   鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.ethicalreviewopinions.updatetime)
+                    parseTime(Processdata.ethicalreviewopinions.createtime)
                   }}</span>
                 </p>
                 <p>
@@ -96,7 +96,7 @@
               >
                 <p>
                   鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateorgansService.updatetime)
+                    parseTime(Processdata.donateorgansService.createtime)
                   }}</span>
                 </p>
                 <p>
@@ -117,7 +117,7 @@
               >
                 <p>
                   鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donationwitness.updatetime)
+                    parseTime(Processdata.donationwitness.createtime)
                   }}</span>
                 </p>
                 <p>
@@ -138,7 +138,7 @@
               >
                 <p>
                   鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatecompletioninfo.updatetime)
+                    parseTime(Processdata.donatecompletioninfo.createtime)
                   }}</span>
                 </p>
                 <p>
@@ -966,7 +966,12 @@
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
           >
-
+          <!-- <el-button
+            v-show="makeastepforward"
+            type="primary"
+            @click="makeastepforward"
+            >涓嬩竴姝�</el-button
+          > -->
           <el-button @click="cancel">鍙� 娑�</el-button>
         </div>
       </div>
@@ -1161,7 +1166,12 @@
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
           >
-
+          <!-- <el-button
+            v-show="makeastepforward"
+            type="primary"
+            @click="makeastepforward"
+            >涓嬩竴姝�</el-button
+          > -->
           <el-button @click="cancel">鍙� 娑�</el-button>
         </div>
       </div>
@@ -1224,7 +1234,12 @@
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
           >
-
+          <!-- <el-button
+            v-show="makeastepforward"
+            type="primary"
+            @click="makeastepforward"
+            >涓嬩竴姝�</el-button
+          > -->
           <el-button @click="cancel">鍙� 娑�</el-button>
         </div>
       </div>
@@ -1952,6 +1967,12 @@
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
           >
+          <!-- <el-button
+            v-show="makeastepforward"
+            type="primary"
+            @click="makeastepforward"
+            >涓嬩竴姝�</el-button
+          > -->
 
           <el-button @click="cancel">鍙� 娑�</el-button>
         </div>
@@ -2352,7 +2373,7 @@
         infoid: null
       },
       affirmform: {
-        infoid: null,
+        infoid: null
       },
       ethicform: {
         infoid: null
@@ -2584,21 +2605,27 @@
       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];
           } else {
-            this.$modal.msgError(
-              "鑾峰彇鍖诲璇勪及璁板綍澶辫触锛�" + JSON.stringify(response)
-            );
+            // this.$modal.msgError(
+            //   "鑾峰彇鍖诲璇勪及璁板綍澶辫触锛�" + JSON.stringify(response)
+            // );
           }
         });
-      } 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];
@@ -2620,17 +2647,19 @@
             //   );
             // }
           } else {
-            this.$modal.msgError(
-              "鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍澶辫触" + JSON.stringify(response)
-            );
+            // this.$modal.msgError(
+            //   "鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍澶辫触" + JSON.stringify(response)
+            // );
           }
         });
-      } 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 == 1) {
+          if (response.code == 200 && response.rows.length) {
             this.ethicform = response.rows[0];
           } else {
             console.log("浼︾悊瀹℃煡鏁版嵁涓虹┖");
@@ -2647,9 +2676,9 @@
               this.organalForm.organname.push(response.rows[i].organno);
             }
           } else {
-            this.$modal.msgError(
-              "鑾峰彇鍣ㄥ畼鍒嗛厤淇℃伅澶辫触锛�" + JSON.stringify(response)
-            );
+            // this.$modal.msgError(
+            //   "鑾峰彇鍣ㄥ畼鍒嗛厤淇℃伅澶辫触锛�" + JSON.stringify(response)
+            // );
           }
         });
       } else if (this.actives == 5 && !this.witnessform.infoid) {
@@ -2661,9 +2690,9 @@
                 this.allocationform = resall.rows;
               }
             } else {
-              this.$modal.msgError(
-                "鍣ㄥ畼鍒楄〃鑾峰彇澶辫触锛�" + JSON.stringify(resall)
-              );
+              // this.$modal.msgError(
+              //   "鍣ㄥ畼鍒楄〃鑾峰彇澶辫触锛�" + JSON.stringify(resall)
+              // );
             }
           });
         }
@@ -2675,14 +2704,17 @@
               this.witnessform.infoid = this.infoid;
             }
           } else {
-            this.$modal.msgError(
-              "鑾峰彇瑙佽瘉淇℃伅鎷垮彇澶辫触锛�" + JSON.stringify(response)
-            );
+            // this.$modal.msgError(
+            //   "鑾峰彇瑙佽瘉淇℃伅鎷垮彇澶辫触锛�" + JSON.stringify(response)
+            // );
           }
         });
-      } 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
         };
@@ -2695,9 +2727,9 @@
                 this.allocationform.infoid = this.infoid;
               }
             } else {
-              this.$modal.msgError(
-                "鍣ㄥ畼鍒楄〃鑾峰彇澶辫触锛�" + JSON.stringify(resall)
-              );
+              // this.$modal.msgError(
+              //   "鍣ㄥ畼鍒楄〃鑾峰彇澶辫触锛�" + JSON.stringify(resall)
+              // );
             }
           });
         }
@@ -2707,7 +2739,7 @@
             this.accomplishform = response.rows[0];
             this.accomplishform.infoid = this.infoid;
           } else {
-            this.$modal.msgError("瀹屾垚鐧昏澶辫触锛�" + JSON.stringify(response));
+            // this.$modal.msgError("瀹屾垚鐧昏澶辫触锛�" + JSON.stringify(response));
           }
         });
       } else if (this.actives == 0) {
@@ -2953,11 +2985,13 @@
     },
     // 鍒囨崲tab
     on_click(e) {
-      console.log(e);
       // if (e != "" || e != null) {
-      if (this.form.workflow >= e) {
+      console.log(this.form.workflow);
+      console.log(e);
+      let asdx = this.form.workflow + 1;
+      if (asdx >= e) {
         this.actives = e;
-        this.Processvalidation(e);
+        this.GetAttacheddata();
       } else {
         this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
       }
@@ -2986,7 +3020,7 @@
             donorno: this.form.donorno,
             transplanthospitalname: null,
             transplanthospitalno: null,
-            organstate: "2"
+            organstate: 0
           });
         }
       } else {
@@ -3033,10 +3067,10 @@
     Processvalidation() {
       console.log(this.form.workflow);
       console.log(this.actives);
-      if (this.form.workflow == this.actives) {
+      if (this.form.workflow + 1 == this.actives) {
         if (this.form.workflow <= 6) {
-        } else {
           this.form.workflow++;
+        } else {
         }
         this.submitForm();
         // this.GetAttacheddata();
@@ -3044,7 +3078,8 @@
         // this.submitForm();
         this.GetAttacheddata();
       } else {
-        this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
+        this.submitForm();
+        // this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
         return;
       }
       console.log(this.form.workflow);
@@ -3282,14 +3317,14 @@
   height: 100%;
   .left-course {
     background: #fff;
-    width: 20%;
+    width: 20vw;
     text-align: center;
     margin: 20px 10px;
     padding: 10px;
     margin-top: 0;
 
     .postfilx {
-      width: 15%;
+      width: 15vw;
       text-align: center;
       margin: 20px 10px;
       padding: 10px;
@@ -3355,6 +3390,7 @@
   padding-right: 66px;
 }
 .boxdiv {
+  max-width: 80vw;
   font-size: 18px;
   padding: 0 30px;
   padding-bottom: 10px;

--
Gitblit v1.9.3