From 21ead72243112d675806161b5125d185d5c4f443 Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 12 三月 2024 16:27:59 +0800
Subject: [PATCH] 11

---
 src/views/project/donationdetails/index.vue |  113 ++++++++++++++++++++++++++++++++------------------------
 1 files changed, 65 insertions(+), 48 deletions(-)

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 2fe2221..1ce9e1c 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -8,18 +8,18 @@
             <el-step title="娼滃湪鎹愮尞" icon="el-icon-user">
               <template
                 slot="description"
-                v-if="Processdata.donatebaseinfo.createtime"
+                v-if="donatebaseinfo.createtime"
               >
                 <p>
                   鎻愪氦锛�<span
-                    >{{ Processdata.donatebaseinfo.createperson }}
-                    {{ parseTime(Processdata.donatebaseinfo.createtime) }}</span
+                    >{{ donatebaseinfo.createperson }}
+                    {{ parseTime(donatebaseinfo.createtime) }}</span
                   >
                 </p>
                 <p>
                   鏇存柊锛�<span
-                    >{{ Processdata.donatebaseinfo.updateperson }}
-                    {{ parseTime(Processdata.donatebaseinfo.updatetime) }}</span
+                    >{{ donatebaseinfo.updateperson }}
+                    {{ parseTime(donatebaseinfo.updatetime) }}</span
                   >
                 </p>
               </template>
@@ -31,21 +31,21 @@
             >
               <template
                 slot="description"
-                v-if="Processdata.medicalevaluation.createtime"
+                v-if="medicalevaluation.createtime"
               >
                 <p>
                   鎻愪氦锛�<span>
-                    {{ Processdata.medicalevaluation.createperson }}
+                    {{ medicalevaluation.createperson }}
                     {{
-                      parseTime(Processdata.medicalevaluation.createtime)
+                      parseTime(medicalevaluation.createtime)
                     }}</span
                   >
                 </p>
                 <p>
                   鏇存柊锛�<span>
-                    {{ Processdata.medicalevaluation.updateperson }}
+                    {{ medicalevaluation.updateperson }}
                     {{
-                      parseTime(Processdata.medicalevaluation.updatetime)
+                      parseTime(medicalevaluation.updatetime)
                     }}</span
                   >
                 </p>
@@ -58,21 +58,21 @@
             >
               <template
                 slot="description"
-                v-if="Processdata.relativesconfirmation.createtime"
+                v-if="relativesconfirmation.createtime"
               >
                 <p>
                   鎻愪氦锛�<span>
-                    {{ Processdata.relativesconfirmation.createperson }}
+                    {{ relativesconfirmation.createperson }}
                     {{
-                      parseTime(Processdata.relativesconfirmation.createtime)
+                      parseTime(relativesconfirmation.createtime)
                     }}</span
                   >
                 </p>
                 <p>
                   鏇存柊锛�<span>
-                    {{ Processdata.relativesconfirmation.updateperson }}
+                    {{ relativesconfirmation.updateperson }}
                     {{
-                      parseTime(Processdata.relativesconfirmation.updatetime)
+                      parseTime(relativesconfirmation.updatetime)
                     }}</span
                   >
                 </p>
@@ -85,21 +85,21 @@
             >
               <template
                 slot="description"
-                v-if="Processdata.donateflowcharts.createtime"
+                v-if="donateflowcharts.createtime"
               >
                 <p>
                   鎻愪氦锛�<span>
-                    {{ Processdata.donateflowcharts.createperson }}
+                    {{ donateflowcharts.createperson }}
                     {{
-                      parseTime(Processdata.donateflowcharts.createtime)
+                      parseTime(donateflowcharts.createtime)
                     }}</span
                   >
                 </p>
                 <p>
                   鏇存柊锛�<span>
-                    {{ Processdata.donateflowcharts.updateperson }}
+                    {{ donateflowcharts.updateperson }}
                     {{
-                      parseTime(Processdata.donateflowcharts.updatetime)
+                      parseTime(donateflowcharts.updatetime)
                     }}</span
                   >
                 </p>
@@ -112,21 +112,21 @@
             >
               <template
                 slot="description"
-                v-if="Processdata.donateorgansService.createtime"
+                v-if="donateorgansService.createtime"
               >
                 <p>
                   鎻愪氦锛�<span>
-                    {{ Processdata.donateorgansService.createperson }}
+                    {{ donateorgansService.createperson }}
                     {{
-                      parseTime(Processdata.donateorgansService.createtime)
+                      parseTime(donateorgansService.createtime)
                     }}</span
                   >
                 </p>
                 <p>
                   鏇存柊锛�<span>
-                    {{ Processdata.donateorgansService.updateperson }}
+                    {{ donateorgansService.updateperson }}
                     {{
-                      parseTime(Processdata.donateorgansService.updatetime)
+                      parseTime(donateorgansService.updatetime)
                     }}</span
                   >
                 </p>
@@ -139,21 +139,21 @@
             >
               <template
                 slot="description"
-                v-if="Processdata.donationwitness.createtime"
+                v-if="donationwitness.createtime"
               >
                 <p>
                   鎻愪氦锛�<span>
-                    {{ Processdata.donationwitness.createperson }}
+                    {{ donationwitness.createperson }}
                     {{
-                      parseTime(Processdata.donationwitness.createtime)
+                      parseTime(donationwitness.createtime)
                     }}</span
                   >
                 </p>
                 <p>
                   鏇存柊锛�<span>
-                    {{ Processdata.donationwitness.updateperson }}
+                    {{ donationwitness.updateperson }}
                     {{
-                      parseTime(Processdata.donationwitness.updatetime)
+                      parseTime(donationwitness.updatetime)
                     }}</span
                   >
                 </p>
@@ -166,21 +166,21 @@
             >
               <template
                 slot="description"
-                v-if="Processdata.donatecompletioninfo.createtime"
+                v-if="donatecompletioninfo.createtime"
               >
                 <p>
                   鎻愪氦锛�<span>
-                    {{ Processdata.donatecompletioninfo.createperson }}
+                    {{ donatecompletioninfo.createperson }}
                     {{
-                      parseTime(Processdata.donatecompletioninfo.createtime)
+                      parseTime(donatecompletioninfo.createtime)
                     }}</span
                   >
                 </p>
                 <p>
                   鏇存柊锛�<span>
-                    {{ Processdata.donatecompletioninfo.updateperson }}
+                    {{ donatecompletioninfo.updateperson }}
                     {{
-                      parseTime(Processdata.donatecompletioninfo.updatetime)
+                      parseTime(donatecompletioninfo.updatetime)
                     }}</span
                   >
                 </p>
@@ -2611,7 +2611,13 @@
       showTerminationBtn: 0, //缁堟鐘舵�� 0-鏈粓姝� 1-宸茬粓姝�
       // 娴佺▼鏁版嵁锛歞onatebaseinfo[createtime,updatetime]銆乵edicalevaluation銆乺elativesconfirmation銆乨onateflowcharts銆乨onateorgansService銆乨onationwitness銆乨onatecompletioninfo
       Processdata: {},
-
+      donatebaseinfo:{},
+      medicalevaluation:{},
+      relativesconfirmation:{},
+      donateflowcharts:{},
+      donateorgansService:{},
+      donationwitness:{},
+      donatecompletioninfo:{},
       //鐪佸競鍖洪粯璁ゅ�艰缃紝鍙负绌�
       searchAddress: {
         sheng: "",
@@ -2799,7 +2805,18 @@
     Getbasicinformation() {
       // 宸︿晶娴佺▼鏁版嵁
       getDonatebaseinfoflow(this.infoid).then(res => {
-        this.Processdata = res.data;
+        if (res.code==200) {
+          this.Processdata = res.data;
+          this.donatebaseinfo=this.Processdata.donatebaseinfo;
+          this.medicalevaluation=this.Processdata.medicalevaluation;
+          this.relativesconfirmation=this.Processdata.relativesconfirmation;
+          this.donateflowcharts=this.Processdata.donateflowcharts;
+          this.donateorgansService=this.Processdata.donateorgansService;
+          this.donationwitness=this.Processdata.donationwitness;
+          this.donatecompletioninfo=this.Processdata.donatecompletioninfo;
+        }else{
+          this.$message.error('渚ц竟鏍忎俊鎭幏鍙栧け璐�');
+        }
       });
 
       // 琛ㄥ崟鏁版嵁
@@ -2929,7 +2946,7 @@
               this.procureddata = res.rows;
               this.procureddata.infoid = this.infoid;
             } else {
-              this.procureddata = this.allocateddata;
+              this.procureddata = this.allocateddata.filter(obj => obj.organname !== '宸﹁倽' && obj.organname !== '鍙宠倽');;
               this.procureddata.infoid = this.infoid;
             }
             this.organList.organprocured = [];
@@ -3275,15 +3292,15 @@
               addDonatecompletioninfo(this.accomplishform).then(response => {
                 this.$modal.msgSuccess("瀹屾垚鐧昏鎴愬姛");
                 this.$modal.closeLoading();
-                this.$modal
-                  .confirm("妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�")
-                  .then(() => {
-                    this.$router.push({
-                      path: "/finance/donorchargedetail/",
-                      query: { id: 0, operation: "add", data: this.form }
-                    });
-                  })
-                  .catch(() => {});
+                // this.$modal
+                //   .confirm("妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�")
+                //   .then(() => {
+                //     this.$router.push({
+                //       path: "/finance/donorchargedetail/",
+                //       query: { gxinzt: true, operation: "add", data: this.form, }
+                //     });
+                //   })
+                //   .catch(() => {});
               });
             }
 
@@ -3543,7 +3560,7 @@
         this.submitForm();
         Modifydonationattachment(this.donatelist).then(res => {});
         this.listDonateannex();
-        this.GetAttacheddata();
+        // this.GetAttacheddata();
       } else {
         this.submitForm();
         // this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");

--
Gitblit v1.9.3