From 3b7aabfe05743f678dbeda05b5c75a155353c5eb Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 11 三月 2024 13:15:12 +0800
Subject: [PATCH] 11

---
 src/views/project/donationdetails/index.vue |  184 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 130 insertions(+), 54 deletions(-)

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 215c8b6..044770b 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -11,14 +11,16 @@
                 v-if="Processdata.donatebaseinfo.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatebaseinfo.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span
+                    >{{ Processdata.donatebaseinfo.createperson }}
+                    {{ parseTime(Processdata.donatebaseinfo.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatebaseinfo.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span
+                    >{{ Processdata.donatebaseinfo.updateperson }}
+                    {{ parseTime(Processdata.donatebaseinfo.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -32,14 +34,20 @@
                 v-if="Processdata.medicalevaluation.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.medicalevaluation.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ Processdata.medicalevaluation.createperson }}
+                    {{
+                      parseTime(Processdata.medicalevaluation.createtime)
+                    }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.medicalevaluation.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ Processdata.medicalevaluation.updateperson }}
+                    {{
+                      parseTime(Processdata.medicalevaluation.updatetime)
+                    }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -53,14 +61,20 @@
                 v-if="Processdata.relativesconfirmation.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.relativesconfirmation.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ Processdata.relativesconfirmation.createperson }}
+                    {{
+                      parseTime(Processdata.relativesconfirmation.createtime)
+                    }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.relativesconfirmation.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ Processdata.relativesconfirmation.updateperson }}
+                    {{
+                      parseTime(Processdata.relativesconfirmation.updatetime)
+                    }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -74,14 +88,20 @@
                 v-if="Processdata.donateflowcharts.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateflowcharts.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ Processdata.donateflowcharts.createperson }}
+                    {{
+                      parseTime(Processdata.donateflowcharts.createtime)
+                    }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateflowcharts.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ Processdata.donateflowcharts.updateperson }}
+                    {{
+                      parseTime(Processdata.donateflowcharts.updatetime)
+                    }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -95,14 +115,20 @@
                 v-if="Processdata.donateorgansService.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateorgansService.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ Processdata.donateorgansService.createperson }}
+                    {{
+                      parseTime(Processdata.donateorgansService.createtime)
+                    }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateorgansService.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ Processdata.donateorgansService.updateperson }}
+                    {{
+                      parseTime(Processdata.donateorgansService.updatetime)
+                    }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -116,14 +142,20 @@
                 v-if="Processdata.donationwitness.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donationwitness.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ Processdata.donationwitness.createperson }}
+                    {{
+                      parseTime(Processdata.donationwitness.createtime)
+                    }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donationwitness.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ Processdata.donationwitness.updateperson }}
+                    {{
+                      parseTime(Processdata.donationwitness.updatetime)
+                    }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -137,14 +169,20 @@
                 v-if="Processdata.donatecompletioninfo.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatecompletioninfo.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ Processdata.donatecompletioninfo.createperson }}
+                    {{
+                      parseTime(Processdata.donatecompletioninfo.createtime)
+                    }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatecompletioninfo.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ Processdata.donatecompletioninfo.updateperson }}
+                    {{
+                      parseTime(Processdata.donatecompletioninfo.updatetime)
+                    }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -1366,14 +1404,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>
@@ -1704,7 +1742,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)"
@@ -1739,7 +1777,7 @@
                     width="90"
                     prop="organno"
                   />
-                  <el-table-column
+                  <!-- <el-table-column
                     label="绯荤粺缂栧彿"
                     align="center"
                     width="120"
@@ -1751,7 +1789,7 @@
                         placeholder="绯荤粺缂栧彿"
                       />
                     </template>
-                  </el-table-column>
+                  </el-table-column> -->
                   <el-table-column
                     label="鍣ㄥ畼绂讳綋鏃堕棿"
                     align="center"
@@ -1800,7 +1838,7 @@
                       />
                     </template>
                   </el-table-column>
-                  <el-table-column
+                  <!-- <el-table-column
                     label="鍙椾綋濮撴皬"
                     align="center"
                     width="120"
@@ -1812,7 +1850,7 @@
                         placeholder="鍙椾綋濮撴皬"
                       />
                     </template>
-                  </el-table-column>
+                  </el-table-column> -->
                   <el-table-column
                     label="鑾峰彇鐘舵��"
                     align="center"
@@ -2015,7 +2053,7 @@
                     label="绉绘鍖婚櫌"
                     align="center"
                     width="220"
-                    prop="transplanthospitalname"
+                    prop="transplanthospitalno"
                     v-if="actives == 6"
                   >
                     <template slot-scope="scope">
@@ -2065,8 +2103,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>
@@ -2533,7 +2571,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
       },
@@ -2871,7 +2923,6 @@
             } else {
               this.procureddata = this.allocateddata;
               this.procureddata.infoid = this.infoid;
-
             }
             this.organList.organprocured = [];
             for (let i = 0; i < this.procureddata.length; i++) {
@@ -3030,6 +3081,7 @@
     // 淇濆瓨浜岀骇琛ㄦ寜閽�
     Savethedetails() {
       console.log(this.actives);
+      this.$modal.loading("姝e湪鎻愪氦锛岃绋嶅�欙紒");
       if (this.actives == 1) {
         this.medicineform.infoid = this.infoid;
         this.$refs["medicineform"].validate(valid => {
@@ -3037,10 +3089,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();
@@ -3057,10 +3111,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();
@@ -3074,11 +3130,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();
@@ -3110,6 +3168,7 @@
           saveDonateorgan(this.allocateddata).then(res => {
             if (res.code == 200) {
               this.$modal.msgSuccess("鍣ㄥ畼鎹愮尞鍒嗛厤淇℃伅淇濆瓨鎴愬姛锛�");
+              this.$modal.closeLoading();
             }
           });
           this.Processvalidation();
@@ -3139,10 +3198,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();
               });
             }
 
@@ -3164,9 +3225,13 @@
           if (valid) {
             // 淇濆瓨鎹愮尞鍣ㄥ畼绉绘淇℃伅
             this.transplantdata.infoid = this.infoid;
+            console.log(this.form);
             saveDonatecomporgan(this.transplantdata).then(res => {
               if (res == 200) {
                 this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
+              } else {
+                this.$modal.msgSuccess(res.msg);
+                return;
               }
             });
             console.log(this.accomplishform.id, "瀹屾垚id");
@@ -3174,10 +3239,21 @@
             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: { id: 0, operation: "add", data: this.form }
+                    });
+                  })
+                  .catch(() => {});
               });
             }
 

--
Gitblit v1.9.3