From f792e8ecddfcd4c1d09504fa8a6a9181586ae88c Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期四, 14 三月 2024 17:35:22 +0800
Subject: [PATCH] 11

---
 src/views/project/donationdetails/index.vue |  370 ++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 252 insertions(+), 118 deletions(-)

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index c2f5102..9285831 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -6,19 +6,18 @@
         <div>
           <el-steps direction="vertical" :active="workflow">
             <el-step title="娼滃湪鎹愮尞" icon="el-icon-user">
-              <template
-                slot="description"
-                v-if="Processdata.donatebaseinfo.createtime"
-              >
+              <template slot="description" v-if="donatebaseinfo.createtime">
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatebaseinfo.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span
+                    >{{ donatebaseinfo.createperson }}
+                    {{ parseTime(donatebaseinfo.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatebaseinfo.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span
+                    >{{ donatebaseinfo.updateperson }}
+                    {{ parseTime(donatebaseinfo.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -27,19 +26,18 @@
               icon="el-icon-edit-outline"
               description="璇峰厛瀹屾垚鍓嶉儴姝ラ"
             >
-              <template
-                slot="description"
-                v-if="Processdata.medicalevaluation.createtime"
-              >
+              <template slot="description" v-if="medicalevaluation.createtime">
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.medicalevaluation.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ medicalevaluation.createperson }}
+                    {{ parseTime(medicalevaluation.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.medicalevaluation.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ medicalevaluation.updateperson }}
+                    {{ parseTime(medicalevaluation.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -50,17 +48,19 @@
             >
               <template
                 slot="description"
-                v-if="Processdata.relativesconfirmation.createtime"
+                v-if="relativesconfirmation.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.relativesconfirmation.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ relativesconfirmation.createperson }}
+                    {{ parseTime(relativesconfirmation.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.relativesconfirmation.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ relativesconfirmation.updateperson }}
+                    {{ parseTime(relativesconfirmation.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -69,19 +69,18 @@
               description="璇峰厛瀹屾垚鍓嶉儴姝ラ"
               icon="el-icon-s-order"
             >
-              <template
-                slot="description"
-                v-if="Processdata.donateflowcharts.createtime"
-              >
+              <template slot="description" v-if="donateflowcharts.createtime">
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateflowcharts.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ donateflowcharts.createperson }}
+                    {{ parseTime(donateflowcharts.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateflowcharts.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ donateflowcharts.updateperson }}
+                    {{ parseTime(donateflowcharts.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -92,17 +91,19 @@
             >
               <template
                 slot="description"
-                v-if="Processdata.donateorgansService.createtime"
+                v-if="donateorgansService.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateorgansService.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ donateorgansService.createperson }}
+                    {{ parseTime(donateorgansService.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateorgansService.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ donateorgansService.updateperson }}
+                    {{ parseTime(donateorgansService.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -111,19 +112,18 @@
               description="璇峰厛瀹屾垚鍓嶉儴姝ラ"
               icon="el-icon-s-management"
             >
-              <template
-                slot="description"
-                v-if="Processdata.donationwitness.createtime"
-              >
+              <template slot="description" v-if="donationwitness.createtime">
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donationwitness.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ donationwitness.createperson }}
+                    {{ parseTime(donationwitness.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donationwitness.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ donationwitness.updateperson }}
+                    {{ parseTime(donationwitness.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -134,17 +134,19 @@
             >
               <template
                 slot="description"
-                v-if="Processdata.donatecompletioninfo.createtime"
+                v-if="donatecompletioninfo.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatecompletioninfo.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ donatecompletioninfo.createperson }}
+                    {{ parseTime(donatecompletioninfo.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatecompletioninfo.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ donatecompletioninfo.updateperson }}
+                    {{ parseTime(donatecompletioninfo.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -345,7 +347,7 @@
         </el-steps>
       </div>
       <!-- 鍑瘉鏂囦欢 -->
-      <div class="Ticket-button" >
+      <div class="Ticket-button">
         <el-button @click.native.prevent="Filepopup" type="success"
           >鍑瘉鏂囦欢</el-button
         >
@@ -719,12 +721,13 @@
         </el-form>
         <div class="dialog-footer">
           <el-button
-            v-show="!showTerminationBtn"
+            v-show="!showTerminationBtn && workflow != 9"
             type="primary"
             @click="submitForm"
             >淇濆瓨</el-button
           >
           <el-button
+            v-if="workflow != 9"
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -942,12 +945,13 @@
         </el-form>
         <div class="dialog-footer">
           <el-button
-            v-show="!showTerminationBtn"
+            v-show="!showTerminationBtn && workflow != 9"
             type="primary"
             @click="Savethedetails"
             >淇濆瓨</el-button
           >
           <el-button
+            v-if="workflow != 9"
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -1175,12 +1179,13 @@
         </el-form>
         <div class="dialog-footer">
           <el-button
-            v-show="!showTerminationBtn"
+            v-show="!showTerminationBtn && workflow != 9"
             type="primary"
             @click="Savethedetails"
             >淇濆瓨</el-button
           >
           <el-button
+            v-if="workflow != 9"
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -1246,12 +1251,13 @@
         </el-form>
         <div class="dialog-footer" style="min-height: 500px; margin: 20px 0; ">
           <el-button
-            v-show="!showTerminationBtn"
+            v-show="!showTerminationBtn && workflow != 9"
             type="primary"
             @click="Savethedetails"
             >淇濆瓨</el-button
           >
           <el-button
+            v-if="workflow != 9"
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -1362,14 +1368,14 @@
                     label="绉绘鍖婚櫌"
                     align="center"
                     width="230"
-                    prop="gainhospitalno"
+                    prop="transplanthospitalno"
                   >
                     <template slot-scope="scope">
                       <div class="elldiv">
                         <org-selecter
                           ref="tranHosSelect"
                           :org-type="'4'"
-                          v-model="scope.row.gainhospitalno"
+                          v-model="scope.row.transplanthospitalno"
                         />
                       </div>
                     </template>
@@ -1413,12 +1419,13 @@
         </el-form>
         <div class="dialog-footer" v-show="actives == 4">
           <el-button
-            v-show="!showTerminationBtn"
+            v-show="!showTerminationBtn && workflow != 9"
             type="primary"
             @click="Savethedetails"
             >淇濆瓨</el-button
           >
           <el-button
+            v-if="workflow != 9"
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -1699,7 +1706,7 @@
               <el-form-item label-width="100px" label="鑾峰彇鍣ㄥ畼">
                 <el-checkbox-group v-model="organList.organprocured">
                   <el-checkbox
-                    v-for="dict in dict.type.sys_Organ"
+                    v-for="dict in sysOrganlistL"
                     :key="dict.value"
                     :label="dict.value"
                     @change="changeorganprocured(dict.value)"
@@ -1734,7 +1741,7 @@
                     width="90"
                     prop="organno"
                   />
-                  <el-table-column
+                  <!-- <el-table-column
                     label="绯荤粺缂栧彿"
                     align="center"
                     width="120"
@@ -1746,7 +1753,7 @@
                         placeholder="绯荤粺缂栧彿"
                       />
                     </template>
-                  </el-table-column>
+                  </el-table-column> -->
                   <el-table-column
                     label="鍣ㄥ畼绂讳綋鏃堕棿"
                     align="center"
@@ -1795,7 +1802,7 @@
                       />
                     </template>
                   </el-table-column>
-                  <el-table-column
+                  <!-- <el-table-column
                     label="鍙椾綋濮撴皬"
                     align="center"
                     width="120"
@@ -1807,7 +1814,7 @@
                         placeholder="鍙椾綋濮撴皬"
                       />
                     </template>
-                  </el-table-column>
+                  </el-table-column> -->
                   <el-table-column
                     label="鑾峰彇鐘舵��"
                     align="center"
@@ -1923,12 +1930,13 @@
 
         <div class="dialog-footer">
           <el-button
-            v-show="!showTerminationBtn"
+            v-show="!showTerminationBtn && workflow != 9"
             type="primary"
             @click="Savethedetails"
             >淇濆瓨</el-button
           >
           <el-button
+            v-if="workflow != 9"
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -2009,14 +2017,14 @@
                     label="绉绘鍖婚櫌"
                     align="center"
                     width="220"
-                    prop="transplanthospitalname"
+                    prop="hospitalno"
                     v-if="actives == 6"
                   >
                     <template slot-scope="scope">
                       <org-selecter
                         ref="tranHosSelect"
                         :org-type="'4'"
-                        v-model="scope.row.transplanthospitalno"
+                        v-model="scope.row.hospitalno"
                         style="width: 100%"
                       />
                     </template>
@@ -2059,8 +2067,8 @@
                         size="small"
                         style="width: 100%"
                         v-model="scope.row.transplanttime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
+                        type="date"
+                        value-format="yyyy-MM-dd"
                         placeholder="閫夋嫨绉绘鏃堕棿"
                       >
                       </el-date-picker>
@@ -2193,21 +2201,25 @@
         </el-form>
         <div class="dialog-footer">
           <el-button
-            v-show="!showTerminationBtn"
+            v-show="!showTerminationBtn && workflow != 9"
             type="primary"
             @click="Savethedetails"
             >淇濆瓨</el-button
           >
           <el-button
+            v-if="workflow != 9"
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
           >
           <el-button
-            v-show="Reportforreview"
-            type="primary"
+            v-if="workflow != 9"
+            type="success"
             @click="Reportforreview"
-            >鎻愪氦</el-button
+            >鎻愪氦褰掓。</el-button
+          >
+          <el-button v-else type="danger" @click="Reportforreview"
+            >鎾ら攢褰掓。</el-button
           >
           <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
@@ -2297,7 +2309,7 @@
             >
               <el-table-column
                 prop="annexname"
-              align="center"
+                align="center"
                 :show-overflow-tooltip="true"
                 label="鍚嶇О"
               >
@@ -2310,7 +2322,7 @@
 
               <el-table-column
                 prop="name"
-              align="center"
+                align="center"
                 :show-overflow-tooltip="true"
                 label="鍔熻兘"
               >
@@ -2321,7 +2333,6 @@
                     @click.native.prevent.stop="deletedowfile(scope.row)"
                     >鍒犻櫎</el-button
                   >
-
                 </template>
               </el-table-column>
             </el-table>
@@ -2441,12 +2452,20 @@
   saveDonatecomporgan,
   delDonatecomporgan
 } from "@/api/project/donatecompletioninfo";
+import {
+  listDonorchargeorgan,
+  updateDonorchargeorgan,
+  addDonorchargeorgan,
+  saveDonorchargeorgan,
+  delDonorchargeorgan
+} from "@/api/project/donorcharge";
 import Li_area_select from "@/components/Address";
 import OrgSelecter from "@/views/project/components/orgselect";
 import AnnexUpload from "@/views/project/components/annexupload";
 import ReportName from "@/views/project/components/organizationUser";
 import { getToken } from "@/utils/auth";
 import { formatDate } from "@/utils/index";
+import { forEach } from "lodash";
 
 export default {
   name: "donationdetails",
@@ -2524,7 +2543,21 @@
       allocateddataform: {},
       procureddata: [],
       transplantdata: [],
-
+      sysOrganlistL: [
+        { label: "蹇冭剰", value: "C38" },
+        { label: "鑲濊剰", value: "C22" },
+        { label: "宸﹁偩", value: "C64L" },
+        { label: "鍙宠偩", value: "C64R" },
+        { label: "鍏ㄨ偤", value: "C34" },
+        { label: "宸﹁偤", value: "C34L" },
+        { label: "鍙宠偤", value: "C34R" },
+        { label: "灏忚偁", value: "C17" },
+        { label: "鑳拌吅", value: "C25" },
+        { label: "閬椾綋", value: "C00" },
+        { label: "宸︾溂瑙掕啘", value: "C69L" },
+        { label: "鍙崇溂瑙掕啘", value: "C69R" },
+        { label: "鍏朵粬", value: "C01" }
+      ],
       witnessform: {
         infoid: null
       },
@@ -2542,7 +2575,13 @@
       showTerminationBtn: 0, //缁堟鐘舵�� 0-鏈粓姝� 1-宸茬粓姝�
       // 娴佺▼鏁版嵁锛歞onatebaseinfo[createtime,updatetime]銆乵edicalevaluation銆乺elativesconfirmation銆乨onateflowcharts銆乨onateorgansService銆乨onationwitness銆乨onatecompletioninfo
       Processdata: {},
-
+      donatebaseinfo: {},
+      medicalevaluation: {},
+      relativesconfirmation: {},
+      donateflowcharts: {},
+      donateorgansService: {},
+      donationwitness: {},
+      donatecompletioninfo: {},
       //鐪佸競鍖洪粯璁ゅ�艰缃紝鍙负绌�
       searchAddress: {
         sheng: "",
@@ -2672,7 +2711,7 @@
       //鎶ュ憡浜哄垪琛�
       reporters: [],
       //闄勪欢鍒楄〃
-      annextype: '1', //闄勪欢type
+      annextype: "1", //闄勪欢type
       annexfilesList: [], //闄勪欢灞曠ず鍒�
       potentiallist: [], //娼滃湪闄勪欢
       medicinelist: [], //鍖诲闄勪欢
@@ -2730,15 +2769,26 @@
     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("渚ц竟鏍忎俊鎭幏鍙栧け璐�");
+        }
       });
 
       // 琛ㄥ崟鏁版嵁
       getDonatebaseinfo(this.infoid).then(response => {
         this.form = response.data;
-        if(response.data.terminationCase){
+        if (response.data.terminationCase) {
           this.showTerminationBtn = response.data.terminationCase;
-        } else{
+        } else {
           this.showTerminationBtn = 0;
         }
         this.actives = response.data.workflow;
@@ -2771,9 +2821,7 @@
       };
       if (this.actives == 1) {
         this.activetele = "鍖诲璇勪及";
-        if (this.medicineform.infoid) {
-          return;
-        }
+
         listMedicalevaluation(searchParam).then(response => {
           if (response.code == 200 && response.rows[0]) {
             this.medicineform = response.rows[0];
@@ -2785,9 +2833,7 @@
         });
       } else if (this.actives == 2) {
         this.activetele = "鎹愮尞纭";
-        if (this.affirmform.infoid) {
-          return;
-        }
+
         listRelativesconfirmation(searchParam).then(response => {
           if (response.code == 200 && response.rows[0]) {
             this.affirmform = response.rows[0];
@@ -2819,9 +2865,7 @@
         });
       } else if (this.actives == 3) {
         this.activetele = "浼︾悊瀹℃煡";
-        if (this.ethicform.infoid) {
-          return;
-        }
+
         //listDonateflowchart(searchParam).then(response => {
         listEthicalreviewopinions(searchParam).then(response => {
           if (response.code == 200 && response.rows.length) {
@@ -2830,7 +2874,7 @@
             console.log("浼︾悊瀹℃煡鏁版嵁涓虹┖");
           }
         });
-      } else if (this.actives == 4 && !this.allocateddata[0]) {
+      } else if (this.actives == 4) {
         listDonateorgan(searchParam).then(res => {
           if (res.code == 200) {
             if (res.rows[0]) {
@@ -2848,16 +2892,20 @@
             // );
           }
         });
-      } else if (this.actives == 5 && !this.witnessform.infoid) {
+      } else if (this.actives == 5 && !this.witnessform.id) {
         // 涓嶅瓨鍦ㄦ椂鑾峰彇鍣ㄥ畼淇℃伅
-        if (this.witnessform.infoid) {
+        if (this.witnessform.id) {
           return;
         }
-
         listDonationwitnessorgan(searchParam).then(res => {
           if (res.code == 200) {
             if (res.rows[0]) {
               this.procureddata = res.rows;
+              this.procureddata.infoid = this.infoid;
+            } else {
+              this.procureddata = this.allocateddata.filter(
+                obj => obj.organname !== "宸﹁倽" && obj.organname !== "鍙宠倽"
+              );
               this.procureddata.infoid = this.infoid;
             }
             this.organList.organprocured = [];
@@ -2886,18 +2934,18 @@
         });
       } else if (this.actives == 6) {
         this.activetele = "瀹屾垚鐧昏";
-        if (this.accomplishform.infoid) {
+        if (this.accomplishform.id) {
           return;
         }
-        // 涓嶅瓨鍦ㄦ椂鑾峰彇鍣ㄥ畼
-        // let accpre = {
-        //   id: searchParam.infoid
-        // };
+
         if (!this.organList.organtransplant[0]) {
           listDonatecomporgan(searchParam).then(res => {
             if (res.code == 200) {
               if (res.rows[0]) {
                 this.transplantdata = res.rows;
+                this.transplantdata.infoid = this.infoid;
+              } else {
+                this.transplantdata = this.allocateddata;
                 this.transplantdata.infoid = this.infoid;
               }
               for (let i = 0; i < this.transplantdata.length; i++) {
@@ -2913,7 +2961,6 @@
           });
         }
         // 鑾峰彇瀹屾垚鐧昏淇℃伅
-        // listnewDonatecompletioninfo(accpre).then(response => {
         listDonatecompletioninfo(searchParam).then(response => {
           if (response.code == 200 && response.rows.length) {
             this.accomplishform = response.rows[0];
@@ -3018,6 +3065,7 @@
     // 淇濆瓨浜岀骇琛ㄦ寜閽�
     Savethedetails() {
       console.log(this.actives);
+      this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒");
       if (this.actives == 1) {
         this.medicineform.infoid = this.infoid;
         this.$refs["medicineform"].validate(valid => {
@@ -3025,10 +3073,12 @@
             if (this.medicineform.id != null) {
               updateMedicalevaluation(this.medicineform).then(response => {
                 this.$modal.msgSuccess("鍖诲璇勪及淇℃伅淇敼鎴愬姛");
+                this.$modal.closeLoading();
               });
             } else {
               addMedicalevaluation(this.medicineform).then(response => {
                 this.$modal.msgSuccess("鍖诲璇勪及淇℃伅鏂板鎴愬姛");
+                this.$modal.closeLoading();
               });
             }
             this.Processvalidation();
@@ -3045,10 +3095,12 @@
               this.affirmform.residencetownname = this.defultAddresss.qu;
               updateRelativesconfirmation(this.affirmform).then(response => {
                 this.$modal.msgSuccess("鎹愮尞纭淇℃伅淇敼鎴愬姛");
+                this.$modal.closeLoading();
               });
             } else {
               addRelativesconfirmation(this.affirmform).then(response => {
                 this.$modal.msgSuccess("鎹愮尞纭淇℃伅鏂板鎴愬姛");
+                this.$modal.closeLoading();
               });
             }
             this.Processvalidation();
@@ -3062,11 +3114,13 @@
               // updateDonateflowchart(this.ethicform).then(response => {
               updateEthicalreviewopinions(this.ethicform).then(res => {
                 this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅淇敼鎴愬姛");
+                this.$modal.closeLoading();
               });
             } else {
               //addDonateflowchart(this.ethicform).then(response => {
               addEthicalreviewopinions(this.ethicform).then(res => {
                 this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅鏂板鎴愬姛");
+                this.$modal.closeLoading();
               });
             }
             this.Processvalidation();
@@ -3098,6 +3152,7 @@
           saveDonateorgan(this.allocateddata).then(res => {
             if (res.code == 200) {
               this.$modal.msgSuccess("鍣ㄥ畼鎹愮尞鍒嗛厤淇℃伅淇濆瓨鎴愬姛锛�");
+              this.$modal.closeLoading();
             }
           });
           this.Processvalidation();
@@ -3127,10 +3182,12 @@
             if (this.witnessform.id != null) {
               updateDonationwitness(this.witnessform).then(response => {
                 this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛");
+                this.$modal.closeLoading();
               });
             } else {
               addDonationwitness(this.witnessform).then(response => {
                 this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
+                this.$modal.closeLoading();
               });
             }
 
@@ -3152,20 +3209,58 @@
           if (valid) {
             // 淇濆瓨鎹愮尞鍣ㄥ畼绉绘淇℃伅
             this.transplantdata.infoid = this.infoid;
+            console.log(this.form);
+            this.transplantdata.forEach(item => {
+              listDonorchargeorgan({
+                infoid: item.infoid,
+                organno: item.organno
+              }).then(res => {
+                console.log("aaa");
+                if (res.rows[0]) {
+                  let objfn = res.rows[0];
+                  console.log(objfn, "sass");
+
+                  objfn.caseno = item.caseno;
+                  objfn.hospitalno = item.hospitalno;
+                  objfn.name = item.name;
+                  objfn.receiveTime = item.transplanttime;
+                  console.log(objfn, "sass");
+                  updateDonorchargeorgan(objfn).then(res1 => {});
+                } else {
+                  item.id = null;
+                  addDonorchargeorgan(item).then(res2 => {});
+                }
+              });
+            });
             saveDonatecomporgan(this.transplantdata).then(res => {
               if (res == 200) {
                 this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
+              } else {
+                this.$modal.msgSuccess(res.msg);
+                return;
               }
             });
-console.log(this.accomplishform.id,'瀹屾垚id');
+
+            console.log(this.accomplishform.id, "瀹屾垚id");
             // 淇濆瓨纭淇℃伅
             if (this.accomplishform.id) {
               updateDonatecompletioninfo(this.accomplishform).then(response => {
                 this.$modal.msgSuccess("瀹屾垚鐧昏淇℃伅淇敼鎴愬姛");
+                this.$modal.closeLoading();
               });
             } else {
               addDonatecompletioninfo(this.accomplishform).then(response => {
                 this.$modal.msgSuccess("瀹屾垚鐧昏鎴愬姛");
+                this.$modal.closeLoading();
+                // this.$modal
+                //   .confirm("妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�")
+                //   .then(() => {
+                //     this.$router.push({
+                //       path: "/finance/donorchargedetail/",
+                //       query: { gxinzt: true, operation: "add", data: this.form, }
+                //     });
+                //   })
+                //   .catch(() => {});
               });
             }
 
@@ -3358,6 +3453,12 @@
                     this.$modal.msgSuccess(
                       "鍒犻櫎鎴愬姛锛屽鏋滈渶瑕佸鍔犺鍣ㄥ畼锛岃閲嶆柊閫夋嫨鍣ㄥ畼锛�"
                     );
+                    listDonorchargeorgan({
+                      infoid: this.transplantdata[organIndex].infoid,
+                      organno: this.transplantdata[organIndex].organno
+                    }).then(res => {
+                      delDonorchargeorgan(res.rows[0].id);
+                    });
                   }
                 );
               })
@@ -3387,7 +3488,8 @@
               id: null,
               infoid: this.infoid,
               donorno: this.form.donorno,
-              organstate: 1
+              organstate: 1,
+              transplantstate: 1
             });
           }
         } else {
@@ -3418,7 +3520,7 @@
         this.submitForm();
         Modifydonationattachment(this.donatelist).then(res => {});
         this.listDonateannex();
-        this.GetAttacheddata();
+        // this.GetAttacheddata();
       } else {
         this.submitForm();
         // this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
@@ -3427,9 +3529,42 @@
     },
     // 鎻愪氦褰掓。
     Reportforreview() {
-      fileCase({infoId:this.infoid}).then(res=>{
-        console.log(res);
-      })
+      if (this.form.workflow == 9) {
+        this.form.workflow = 8;
+        this.submitForm();
+        this.$router.go(-1);
+        this.$message({
+          type: "success",
+          message: "鎾ら攢鎴愬姛!"
+        });
+      } else {
+        this.$confirm("鍗冲皢杩涜妗堜緥褰掓。, 纭鎵�鏈夋暟鎹凡淇濆瓨?", "鎻愮ず", {
+          confirmButtonText: "纭畾",
+          cancelButtonText: "鍙栨秷",
+          type: "warning"
+        })
+          .then(() => {
+            fileCase({ infoId: this.infoid }).then(res => {
+              if (res.code == 500) {
+                this.$message.error(res.msg);
+              } else {
+                this.form.workflow = 9;
+                this.submitForm();
+                this.$message({
+                  type: "success",
+                  message: "褰掓。鎴愬姛!"
+                });
+                this.$router.go(-1);
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "宸插彇娑堝綊妗�"
+            });
+          });
+      }
     },
     // 缁堟妗堜緥
     Terminationcase() {
@@ -3635,7 +3770,6 @@
       this.annexfilesList.splice(indexvalue, 1);
       this.Newconversion(this.annexfilesList, indexvalue, "");
     },
- 
 
     clearFilter() {
       this.$refs.filterTable.clearFilter();

--
Gitblit v1.9.3