From 4434fc4e9fa6819452596445b71eb67f4b422f0d Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期一, 16 十月 2023 18:02:37 +0800
Subject: [PATCH] 11

---
 src/views/project/donationdetails/index.vue         |  425 +++++++++++++++--
 src/views/project/fund/performancedetails/index.vue |   26 +
 src/views/project/fund/applyDetail/index.vue        |   10 
 src/views/project/medicalevaluation/index.vue       |  142 +++---
 src/views/project/donationwitness/index.vue         |  754 ++++++++++++++++++++++++--------
 5 files changed, 1,031 insertions(+), 326 deletions(-)

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index fb6c5f1..1f5e948 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -47,8 +47,9 @@
         </div>
       </div>
     </div>
-<!-- 鍙充晶鏁版嵁 -->
+    <!-- 鍙充晶鏁版嵁 -->
     <div style="background: #fff;">
+      <!-- 椤堕儴鏁版嵁 -->
       <div class="boxdiv">
         <div class="top-text">鎹愮尞鑰呰褰曞伐浣滃彴</div>
         <el-form
@@ -298,25 +299,22 @@
       <!-- 娼滃湪鎹愮尞 -->
       <div class="boxdiv" style="margin: 30px 0 66px 0;" v-show="actives == 0">
         <el-form
-          ref="latentform"
-          :model="latentform"
-          :rules="latentrules"
+          ref="form"
+          :model="form"
+          :rules="rules"
           label-width="100px"
           label-position="right"
         >
           <el-row>
             <el-col :span="8">
               <el-form-item label="浣忛櫌鍙�" prop="inpatientno">
-                <el-input
-                  v-model="latentform.inpatientno"
-                  placeholder="浣忛櫌鍙�"
-                />
+                <el-input v-model="form.inpatientno" placeholder="浣忛櫌鍙�" />
               </el-form-item>
             </el-col>
             <el-col :span="16">
               <el-form-item label="鐤剧梾璇婃柇" prop="diagnosisname">
                 <el-input
-                  v-model="latentform.diagnosisname"
+                  v-model="form.diagnosisname"
                   placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�"
                 />
               </el-form-item>
@@ -325,7 +323,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item align="left" label="琛�鍨�" prop="bloodtype">
-                <el-radio-group v-model="latentform.bloodtype">
+                <el-radio-group v-model="form.bloodtype">
                   <el-radio
                     v-for="dict in dict.type.sys_BloodType"
                     :key="dict.value"
@@ -337,7 +335,7 @@
             </el-col>
             <el-col :span="12" :pull="1">
               <el-form-item label="Rh(D)" align="left" prop="rhyin">
-                <el-radio-group v-model="latentform.rhyin">
+                <el-radio-group v-model="form.rhyin">
                   <el-radio
                     v-for="dict in dict.type.sys_bloodtype_rhd"
                     :key="dict.value"
@@ -350,7 +348,7 @@
           </el-row>
           <el-row>
             <el-form-item label="鐤剧梾绫诲瀷" align="left">
-              <el-checkbox-group v-model="latentform.diseasetype">
+              <el-checkbox-group v-model="form.diseasetype">
                 <el-checkbox
                   v-for="dict in dict.type.sys_DiseaseType"
                   :key="dict.value"
@@ -362,7 +360,7 @@
             </el-form-item>
             <el-form-item label="鍏朵粬" prop="diseasetypeOther">
               <el-input
-                v-model="latentform.diseasetypeOther"
+                v-model="form.diseasetypeOther"
                 placeholder="璇疯緭鍏ュ叾浠�"
               />
             </el-form-item>
@@ -370,7 +368,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item align="left" label="浼犳煋鐥�">
-                <el-checkbox-group v-model="latentform.infectious">
+                <el-checkbox-group v-model="form.infectious">
                   <el-checkbox
                     v-for="dict in dict.type.sys_Infectious"
                     :key="dict.value"
@@ -384,7 +382,7 @@
             <el-col :span="12">
               <el-form-item align="left" label="鍏朵粬" prop="infectiousOther">
                 <el-input
-                  v-model="latentform.infectiousOther"
+                  v-model="form.infectiousOther"
                   placeholder="璇疯緭鍏ュ叾浠�"
                 />
               </el-form-item>
@@ -393,7 +391,7 @@
           <el-row>
             <el-col :span="9">
               <el-form-item align="left" label="鐥呬汉鐘跺喌">
-                <el-checkbox-group v-model="latentform.patientstate">
+                <el-checkbox-group v-model="form.patientstate">
                   <el-checkbox
                     v-for="dict in dict.type.sys_patientstate"
                     :key="dict.value"
@@ -406,7 +404,7 @@
             </el-col>
             <el-col :span="15" align="left">
               <el-form-item label="鍏朵粬鎯呭喌">
-                <el-checkbox-group v-model="latentform.othercases">
+                <el-checkbox-group v-model="form.othercases">
                   <el-checkbox
                     v-for="dict in dict.type.sys_OtherCases"
                     :key="dict.value"
@@ -428,7 +426,7 @@
                     class="relation"
                     align="left"
                   >
-                    <el-checkbox-group v-model="latentform.kinship">
+                    <el-checkbox-group v-model="form.kinship">
                       <el-checkbox
                         v-for="dict in dict.type.sys_Kinship"
                         :key="dict.value"
@@ -442,7 +440,7 @@
                 <el-col :span="12">
                   <el-form-item label="鍏朵粬" prop="kinshipOther">
                     <el-input
-                      v-model="latentform.kinshipOther"
+                      v-model="form.kinshipOther"
                       placeholder="璇疯緭鍏ュ叾浠�"
                     />
                   </el-form-item>
@@ -453,7 +451,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item align="left" label="鏈汉鎰忔効 ">
-                <el-checkbox-group v-model="latentform.selfwill">
+                <el-checkbox-group v-model="form.selfwill">
                   <el-checkbox
                     v-for="dict in dict.type.sys_SelfWill"
                     :key="dict.value"
@@ -469,7 +467,7 @@
             <el-col :span="12">
               <el-form-item label="涓昏浜插睘" prop="majorrelatives">
                 <el-input
-                  v-model="latentform.majorrelatives"
+                  v-model="form.majorrelatives"
                   placeholder="璇疯緭鍏ヤ富瑕佷翰灞�"
                 />
               </el-form-item>
@@ -477,7 +475,7 @@
             <el-col :span="8">
               <el-form-item label="涓庢崘璧犺�呭叧绯�" prop="familyrelations">
                 <el-select
-                  v-model="latentform.familyrelations"
+                  v-model="form.familyrelations"
                   placeholder="璇烽�夋嫨涓庢崘璧犺�呭叧绯�"
                 >
                   <el-option
@@ -493,7 +491,7 @@
           <el-row>
             <el-col :span="12">
               <el-form-item align="left" label="淇℃伅鏉ユ簮">
-                <el-checkbox-group v-model="latentform.infosources">
+                <el-checkbox-group v-model="form.infosources">
                   <el-checkbox
                     v-for="dict in dict.type.sys_InfoSources"
                     :key="dict.value"
@@ -507,7 +505,7 @@
             <el-col :span="8">
               <el-form-item label="鍏朵粬" prop="infosourcesOther">
                 <el-input
-                  v-model="latentform.infosourcesOther"
+                  v-model="form.infosourcesOther"
                   placeholder="璇疯緭鍏ヤ俊鎭潵婧愬叾浠�"
                 />
               </el-form-item>
@@ -516,16 +514,13 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="淇℃伅鍛�" prop="infoname">
-                <el-input
-                  v-model="latentform.infoname"
-                  placeholder="璇疯緭鍏ヤ俊鎭憳"
-                />
+                <el-input v-model="form.infoname" placeholder="璇疯緭鍏ヤ俊鎭憳" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="鑱旂郴鐢佃瘽" prop="infophone">
                 <el-input
-                  v-model="latentform.infophone"
+                  v-model="form.infophone"
                   placeholder="璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽"
                 />
               </el-form-item>
@@ -537,14 +532,14 @@
                 <org-selecter
                   ref="addCrossOrgSelect"
                   :org-type="'2'"
-                  v-model="latentform.redorganno"
+                  v-model="form.redorganno"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item label="鑱旂郴浜�" prop="contactperson">
                 <el-input
-                  v-model="latentform.contactperson"
+                  v-model="form.contactperson"
                   placeholder="璇疯緭鍏ヨ仈绯讳汉"
                 />
               </el-form-item>
@@ -555,7 +550,7 @@
                   clearable
                   size="small"
                   style="width: 190px"
-                  v-model="latentform.contacttime"
+                  v-model="form.contacttime"
                   type="datetime"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="閫夋嫨鎶ュ憡鏃堕棿"
@@ -575,7 +570,7 @@
                   style="width: 260px"
                   ref="orgSelecter"
                   :org-type="'1'"
-                  v-model="latentform.acquisitiontissueno"
+                  v-model="form.acquisitiontissueno"
                 />
               </el-form-item>
             </el-col>
@@ -585,7 +580,7 @@
               <el-form-item label="鎶ュ憡浜�" prop="reporterno">
                 <el-select
                   ref="getReportname"
-                  v-model="latentform.reporterno"
+                  v-model="form.reporterno"
                   placeholder="璇烽�夋嫨"
                 >
                   <el-option
@@ -601,7 +596,7 @@
             <el-col :span="8">
               <el-form-item label="鑱旂郴鐢佃瘽" prop="reporterphone">
                 <el-input
-                  v-model="latentform.reporterphone"
+                  v-model="form.reporterphone"
                   placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
                 />
               </el-form-item>
@@ -612,7 +607,7 @@
                   clearable
                   size="small"
                   style="width: 190px"
-                  v-model="latentform.reporttime"
+                  v-model="form.reporttime"
                   type="datetime"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="閫夋嫨鎶ュ憡鏃堕棿"
@@ -846,7 +841,7 @@
           </el-row>
         </el-form>
         <div class="dialog-footer">
-          <el-button v-show="showSaveBtn" type="primary" @click="submitForm"
+          <el-button v-show="showSaveBtn" type="primary" @click="Savethedetails"
             >淇濆瓨璇勪及淇℃伅</el-button
           >
           <el-button
@@ -1059,7 +1054,7 @@
           </el-row>
         </el-form>
         <div class="dialog-footer">
-          <el-button v-show="showSaveBtn" type="primary" @click="submitForm"
+          <el-button v-show="showSaveBtn" type="primary" @click="Savethedetails"
             >淇濆瓨鎹愮尞淇℃伅</el-button
           >
           <el-button
@@ -1122,7 +1117,7 @@
           </el-row>
         </el-form>
         <div class="dialog-footer" style="min-height: 500px; margin: 20px 0; ">
-          <el-button v-show="showSaveBtn" type="primary" @click="submitForm"
+          <el-button v-show="showSaveBtn" type="primary" @click="Savethedetails"
             >淇濆瓨鎹愮尞淇℃伅</el-button
           >
           <el-button
@@ -1254,7 +1249,7 @@
           </el-row>
         </el-form>
         <div class="dialog-footer">
-          <el-button v-show="showSaveBtn" type="primary" @click="submitForm"
+          <el-button v-show="showSaveBtn" type="primary" @click="Savethedetails"
             >淇濆瓨鎹愮尞淇℃伅</el-button
           >
           <el-button
@@ -1700,7 +1695,7 @@
         </el-form>
 
         <div class="dialog-footer">
-          <el-button v-show="showSaveBtn" type="primary" @click="submitForm"
+          <el-button v-show="showSaveBtn" type="primary" @click="Savethedetails"
             >淇濆瓨鎹愮尞淇℃伅</el-button
           >
           <el-button
@@ -1930,7 +1925,7 @@
           </el-row>
         </el-form>
         <div class="dialog-footer">
-          <el-button v-show="showSaveBtn" type="primary" @click="submitForm"
+          <el-button v-show="showSaveBtn" type="primary" @click="Savethedetails"
             >淇濆瓨鎹愮尞鑰呬俊鎭�</el-button
           >
           <el-button
@@ -1951,16 +1946,31 @@
 
 <script>
 import {
-  listDonatebaseinfo,
   getDonatebaseinfo,
-  delDonatebaseinfo,
   addDonatebaseinfo,
-  updateDonatebaseinfo,
-  exportDonatebaseinfo,
-  downloadbaseinfo,
-  getdonatorno
-  // exportProvincemessage,
+  updateDonatebaseinfo
 } from "@/api/project/donatebaseinfo";
+import {
+  listMedicalevaluation,
+  addMedicalevaluation,
+  updateMedicalevaluation
+} from "@/api/project/medicalevaluation";
+import {
+  addDonateflowchart,
+  listDonateflowchart,
+  updateDonateflowchart
+} from "@/api/project/DonationEvaluation";
+import {
+  listOrganallocation,
+  addOrganallocation,
+  updateOrganallocation
+} from "@/api/project/organallocation";
+import {
+  listDonateorgan,
+  addDonateorgan,
+  delDonateorgan,
+  updateDonateorgan
+} from "@/api/project/donateorgan";
 import Li_area_select from "@/components/Address";
 import OrgSelecter from "@/views/project/components/orgselect";
 import AnnexUpload from "@/views/project/components/annexupload";
@@ -2001,13 +2011,13 @@
     return {
       id: 736,
       form: {},
-      latentform: {},
       medicineform: {},
       affirmform: {},
       ethicform: {},
       allocationform: {},
       witnessform: {},
       accomplishform: {},
+      tableData:[],
       actives: 0,
       //   淇濆瓨銆佺粓姝㈡寜閽‘璁�
       showSaveBtn: true,
@@ -2057,11 +2067,7 @@
         age: [{ required: true, message: "璇疯緭鍏ュ勾榫�", trigger: "blur" }],
         treatmenthospitalno: [
           { required: true, message: "璇烽�夋嫨鍖荤枟鏈烘瀯", trigger: "blur" }
-        ]
-        // treatmenthospitalno: [{ required: true, message: "璇烽�夋嫨鍖荤枟鏈烘瀯", trigger: "change" }],
-      },
-      // 娼滃湪鎹愮尞鏁堥獙
-      latentrules: {
+        ],
         bloodtype: [
           { required: true, message: "璇烽�夋嫨ABO琛�鍨�", trigger: "blur" }
         ],
@@ -2092,7 +2098,6 @@
             trigger: "blur"
           }
         ],
-        // contactnumber: [{required: true,message: "璇疯緭鍏ョ孩鍗佸瓧浼氳仈绯荤數璇�",trigger: "change"}],
         acquisitiontissueno: [
           { required: true, message: "鍣ㄥ畼鑾峰彇缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
         ],
@@ -2106,6 +2111,7 @@
           { required: true, message: "璇疯緭鍏ユ姤鍛婁汉鑱旂郴鐢佃瘽", trigger: "blur" }
         ]
       },
+
       medicinerules: {},
       affirmrules: {},
       ethicrules: {},
@@ -2121,6 +2127,7 @@
   },
 
   methods: {
+    // 鑾峰彇涓昏〃鏁版嵁
     Getbasicinformation() {
       getDonatebaseinfo(this.id).then(response => {
         this.form = response.data;
@@ -2141,8 +2148,309 @@
         this.residenceAddresss.shi = response.data.residencecityname;
         this.residenceAddresss.qu = response.data.residencetownname;
         this.registerAddresss.qu = response.data.registertownname;
-        this.latentform = this.form;
       });
+    },
+    // 鑾峰彇浜岀骇琛ㄦ暟鎹�
+    GetAttacheddata() {
+      let searchParam = {
+        id: this.form.id
+      };
+      if (this.actives == 2) {
+        listMedicalevaluation(searchParam).then(response => {
+          if (response.code == 200 && response.rows.length == 1) {
+            this.medicineform = response.rows[0];
+          } else {
+            this.$modal.msgError(
+              "鑾峰彇鍖诲璇勪及璁板綍澶辫触锛�" + JSON.stringify(response)
+            );
+          }
+        });
+      } else if (this.actives == 3) {
+        listRelativesconfirmation(searchParam).then(response => {
+          if (response.code == 200 && response.rows.length == 1) {
+            this.affirmform = response.rows[0];
+            this.affirmform.donorno = row.donorno;
+            this.affirmform.doname = row.name;
+            this.affirmform.dosex = row.sex;
+            // 鍑虹敓鏃ユ湡
+            this.affirmform.dobirthday = row.birthday;
+            // 姘戞棌
+            this.affirmform.donationality = row.nationality;
+            // 瀛﹀巻
+            this.affirmform.doeducation = row.education;
+            // 鑱屼笟
+            this.affirmform.dooccupation = row.occupation;
+            this.affirmform.donation = row.nation;
+            this.affirmform.doidcardtype = row.idcardtype;
+            this.affirmform.doidcardno = row.idcardno;
+            this.affirmform.donativeplace = row.nativeplace;
+            this.defultAddresss.sheng = this.affirmform.residenceprovincename;
+            this.defultAddresss.shi = this.affirmform.residencecityname;
+            this.defultAddresss.qu = this.affirmform.residencetownname;
+            if (this.affirmform.kinship) {
+              this.affirmform.kinship = this.affirmform.kinship.split(",");
+            }
+            if (this.affirmform.organdecision) {
+              this.affirmform.organdecision = this.affirmform.organdecision.split(
+                ","
+              );
+            }
+          } else {
+            this.$modal.msgError(
+              "鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍澶辫触" + JSON.stringify(response)
+            );
+          }
+        });
+      } else if (this.actives == 4) {
+        listDonateflowchart(searchParam).then(response => {
+          if (response.code == 200 && response.rows.length == 1) {
+            this.form = response.rows[0];
+          } else if (response.rows.length == 0) {
+            this.$modal.msgError("鏈壘鍒版湰妗堜緥鐨勪鸡鐞嗗鏌ヨ褰曪紝璇疯仈绯荤鐞嗗憳锛�");
+          } else {
+            this.$modal.msgError("鏁版嵁閲嶅");
+          }
+        });
+      } else if (this.actives == 5) {
+        listOrganallocation(searchParam).then(response => {
+          if (response.code == 200 && response.rows.length == 1) {
+            this.form = response.rows[0];
+            this.form.infoid = data.id;
+            this.open = true;
+          } else {
+            this.$modal.msgError(
+              "鑾峰彇鍣ㄥ畼鍒嗛厤淇℃伅澶辫触锛�" + JSON.stringify(response)
+            );
+          }
+        });
+      } else if (this.actives == 6) {
+        listMedicalevaluation(searchParam).then(response => {
+          if (response.code == 200 && response.rows.length == 1) {
+            this.form = response.rows[0];
+            this.form.infoid = data.id;
+            this.open = true;
+          } else {
+            this.$modal.msgError(
+              "鑾峰彇鍖诲璇勪及璁板綍澶辫触锛�" + JSON.stringify(response)
+            );
+          }
+        });
+      } else if (this.actives == 7) {
+        listMedicalevaluation(searchParam).then(response => {
+          if (response.code == 200 && response.rows.length == 1) {
+            this.form = response.rows[0];
+            this.form.infoid = data.id;
+            this.open = true;
+          } else {
+            this.$modal.msgError(
+              "鑾峰彇鍖诲璇勪及璁板綍澶辫触锛�" + JSON.stringify(response)
+            );
+          }
+        });
+      }
+    },
+    /** 淇濆瓨涓昏〃鎸夐挳 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        console.log("鎻愪氦鐨勬暟鎹滑锛�", this.form);
+        if (valid) {
+          this.form.birthday = this.$moment(this.form.birthday).format(
+            "YYYY-MM-DD HH:mm:ss"
+          );
+          this.form.diseasetype = this.form.diseasetype.join(",");
+          this.form.infectious = this.form.infectious.join(",");
+          this.form.selfwill = this.form.selfwill.join(",");
+          this.form.othercases = this.form.othercases.join(",");
+          this.form.infosources = this.form.infosources.join(",");
+          this.form.kinship = this.form.kinship.join(",");
+          this.form.patientstate = this.form.patientstate.join(",");
+          this.form.registerprovince = this.$refs.registerSelect.getSheng();
+          this.form.registerprovincename = this.registerAddresss.sheng;
+
+          this.form.residenceprovince = this.$refs.residenceSelect.getSheng();
+          this.form.residenceprovincename = this.residenceAddresss.sheng;
+
+          this.form.registercity = this.$refs.registerSelect.getShi();
+          this.form.registercityname = this.registerAddresss.shi;
+
+          this.form.residencecity = this.$refs.residenceSelect.getShi();
+          this.form.residencecityname = this.residenceAddresss.shi;
+
+          this.form.residencetown = this.$refs.residenceSelect.getQu();
+          this.form.residencetownname = this.residenceAddresss.qu;
+
+          this.form.registertown = this.$refs.registerSelect.getQu();
+          this.form.registertownname = this.registerAddresss.qu;
+
+          this.form.reportername = this.$refs.getReportname.$data.selectedLabel;
+
+          try {
+            this.form.treatmenthospitalname = this.$refs.addOrgSelect.getOptionByValue(
+              this.form.treatmenthospitalno
+            ).organizationname;
+          } catch {
+            this.form.treatmenthospitalname = this.form.treatmenthospitalno;
+          }
+
+          try {
+            this.form.redorganname = this.$refs.addCrossOrgSelect.getOptionByValue(
+              this.form.redorganno
+            ).organizationname;
+          } catch {
+            this.form.redorganname = this.form.redorganno;
+          }
+
+          //灏濊瘯鐢熸垚鎹愮尞缂栧彿锛堝凡缁忕敱addDonatebaseinfo鎺ュ彛涓敓鎴愬彇浠o級
+          // getdonatorno(this.form).then((response) => {
+          //   // alert(JSON.stringify(response));
+          //   this.reset();
+          // });
+
+          if (this.form.id != null) {
+            updateDonatebaseinfo(this.form).then(response => {
+              this.$modal.msgSuccess("淇敼鎴愬姛");
+              this.Getbasicinformation();
+              this.open = false;
+            });
+          } else {
+            this.form.recordstate = 0;
+            addDonatebaseinfo(this.form).then(response => {
+              if (response.code == 200) {
+                this.$modal.msgSuccess("鏂板鎴愬姛");
+                this.open = false;
+              } else {
+                this.$modal.msgError("鏂板澶辫触锛�" + response.msg);
+              }
+            });
+          }
+        }
+      });
+    },
+    // 淇濆瓨鏄庣粏琛�
+    Savethedetails() {
+      if (this.actives == 2) {
+        this.$refs["medicineform"].validate(valid => {
+          if (valid) {
+            if (this.medicineform.id != null) {
+              updateMedicalevaluation(this.medicineform).then(response => {
+                this.$modal.msgSuccess("淇敼鎴愬姛");
+              });
+            } else {
+              addMedicalevaluation(this.medicineform).then(response => {
+                this.$modal.msgSuccess("鏂板鎴愬姛");
+              });
+            }
+            this.submitForm();
+          }
+        });
+      } else if (this.actives == 3) {
+        this.$refs["affirmform"].validate(valid => {
+          if (valid) {
+            if (this.affirmform.id != null) {
+              updateMedicalevaluation(this.affirmform).then(response => {
+                this.$modal.msgSuccess("淇敼鎴愬姛");
+              });
+            } else {
+              addMedicalevaluation(this.affirmform).then(response => {
+                this.$modal.msgSuccess("鏂板鎴愬姛");
+              });
+            }
+            this.submitForm();
+          }
+        });
+      } else if (this.actives == 4) {
+        this.$refs["ethicform"].validate(valid => {
+          if (valid) {
+            if (this.ethicform.id != null) {
+              updateDonateflowchart(this.ethicform).then(response => {
+                this.$modal.msgSuccess("淇敼鎴愬姛");
+              });
+            } else {
+              addDonateflowchart(this.ethicform).then(response => {
+                this.$modal.msgSuccess("鏂板鎴愬姛");
+              });
+            }
+            this.submitForm();
+          }
+        });
+      } else if (this.actives == 5) {
+        this.$refs["allocationform"].validate(valid => {
+          if (valid) {
+            if (this.allocationform.id != null) {
+              updateOrganallocation(this.allocationform).then(response => {
+                this.$modal.msgSuccess("淇敼鎴愬姛");
+              });
+            } else {
+              addOrganallocation(this.allocationform).then(response => {
+                this.$modal.msgSuccess("鏂板鎴愬姛");
+              });
+            }
+            this.submitForm();
+          }
+        });
+      } else if (this.actives == 6) {
+        this.$refs["witnessform"].validate(valid => {
+          if (valid) {
+            if (this.witnessform.id != null) {
+              // 鑾峰彇鎹愮尞鍣ㄥ畼鍒楄〃
+              listDonateorgan(oraganqueryParam).then(response => {
+                this.loading = false;
+                if (response.code == 200) {
+                  this.organdonation = [];
+                  this.tableData = response.rows;
+                  //鑾峰彇鍖婚櫌榛樿鏄Щ妞嶅尰闄�
+                  for (let i = 0; i < this.tableData.length; i++) {
+                    if (
+                      this.tableData[i].gainhospitalname == null ||
+                      this.tableData[i].gainhospitalname == ""
+                    ) {
+                      this.tableData[i].gainhospitalname = this.tableData[
+                        i
+                      ].transplanthospitalname;
+                    }
+                    if (
+                      this.tableData[i].gainhospitalno == null ||
+                      this.tableData[i].gainhospitalno == ""
+                    ) {
+                      this.tableData[i].gainhospitalno = this.tableData[
+                        i
+                      ].transplanthospitalno;
+                    }
+                  }
+                  //this.organalForm.organname = [];
+                  for (let i = 0; i < response.rows.length; i++) {
+                    this.form.organdonation.push(response.rows[i].organno);
+                  }
+                } else {
+                  this.$modal.msgError("鑾峰彇鎹愮尞鍣ㄥ畼澶辫触锛�" + response.msg);
+                }
+              });
+              // 鑾峰彇淇℃伅
+              
+            } else {
+              addMedicalevaluation(this.witnessform).then(response => {
+                this.$modal.msgSuccess("鏂板鎴愬姛");
+              });
+            }
+            this.submitForm();
+          }
+        });
+      } else if (this.actives == 7) {
+        this.$refs["accomplishform"].validate(valid => {
+          if (valid) {
+            if (this.accomplishform.id != null) {
+              updateMedicalevaluation(this.accomplishform).then(response => {
+                this.$modal.msgSuccess("淇敼鎴愬姛");
+              });
+            } else {
+              addMedicalevaluation(this.accomplishform).then(response => {
+                this.$modal.msgSuccess("鏂板鎴愬姛");
+              });
+            }
+            this.submitForm();
+          }
+        });
+      }
     },
     // 鍒囨崲tab
     on_click(e) {
@@ -2151,6 +2459,7 @@
         this.actives = e;
       }
     },
+
     // 鍓嶈繘姝ラ
     makeastepforward() {},
     // 涓婃姤瀹℃牳
@@ -2199,7 +2508,7 @@
   font-size: 18px;
   padding: 0 30px;
   padding-bottom: 10px;
-  margin-top:20px;
+  margin-top: 20px;
 
   .top-text {
     text-align: center;
diff --git a/src/views/project/donationwitness/index.vue b/src/views/project/donationwitness/index.vue
index 6592a4b..529e9c2 100644
--- a/src/views/project/donationwitness/index.vue
+++ b/src/views/project/donationwitness/index.vue
@@ -1,23 +1,47 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="70px">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="70px"
+    >
       <el-row :gutter="8">
         <el-col :span="6">
           <el-form-item label="濮撳悕" prop="name">
-            <el-input v-model="queryParams.name" placeholder="璇疯緭鍏ュ鍚�" clearable size="small"
-              @keyup.enter.native="handleQuery" />
+            <el-input
+              v-model="queryParams.name"
+              placeholder="璇疯緭鍏ュ鍚�"
+              clearable
+              size="small"
+              @keyup.enter.native="handleQuery"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="6">
-          <el-form-item align="left" label="鍖荤枟鏈烘瀯" prop="treatmenthospitalno">
-            <org-selecter ref="orgSelecter" :org-type="'3'" v-model="queryParams.treatmenthospitalno" />
+          <el-form-item
+            align="left"
+            label="鍖荤枟鏈烘瀯"
+            prop="treatmenthospitalno"
+          >
+            <org-selecter
+              ref="orgSelecter"
+              :org-type="'3'"
+              v-model="queryParams.treatmenthospitalno"
+            />
           </el-form-item>
         </el-col>
 
         <el-col :span="6">
           <el-form-item label="鎹愮尞鍦板競">
             <el-select v-model="queryParams.city" placeholder="璇烽�夋嫨鍦板競">
-              <el-option v-for="item in provinceData" :key="item.value" :label="item.label" :value="item.value">
+              <el-option
+                v-for="item in provinceData"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -25,9 +49,18 @@
 
         <el-col :span="6">
           <el-form-item label="鎹愮尞杩涘害" prop="recordstate">
-            <el-select v-model="queryParams.recordstate" placeholder="璇烽�夋嫨鎹愮尞杩涘害" clearable size="small">
-              <el-option v-for="dict in dict.type.sys_DonationStatus" :key="dict.value" :label="dict.label"
-                :value="dict.value" />
+            <el-select
+              v-model="queryParams.recordstate"
+              placeholder="璇烽�夋嫨鎹愮尞杩涘害"
+              clearable
+              size="small"
+            >
+              <el-option
+                v-for="dict in dict.type.sys_DonationStatus"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
             </el-select>
           </el-form-item>
         </el-col>
@@ -35,8 +68,16 @@
       <el-row :gutter="8">
         <el-col :span="6">
           <el-form-item label="鎶ュ憡浜�">
-            <el-select v-model="queryParams.reporterno" placeholder="璇烽�夋嫨鎶ュ憡浜�">
-              <el-option v-for="item in reportlist" :key="item.index" :label="item.reportername" :value="item.reporterno">
+            <el-select
+              v-model="queryParams.reporterno"
+              placeholder="璇烽�夋嫨鎶ュ憡浜�"
+            >
+              <el-option
+                v-for="item in reportlist"
+                :key="item.index"
+                :label="item.reportername"
+                :value="item.reporterno"
+              >
               </el-option>
             </el-select>
           </el-form-item>
@@ -44,33 +85,61 @@
 
         <el-col :span="12">
           <el-form-item label="瑙佽瘉鏃ユ湡">
-            <el-date-picker style="width: 100%" v-model="selecttime" type="monthrange" range-separator="鑷�"
-              start-placeholder="寮�濮嬫湀浠�" end-placeholder="缁撴潫鏈堜唤" value-format="yyyy-MM-dd" @change="getTimeList">
+            <el-date-picker
+              style="width: 100%"
+              v-model="selecttime"
+              type="monthrange"
+              range-separator="鑷�"
+              start-placeholder="寮�濮嬫湀浠�"
+              end-placeholder="缁撴潫鏈堜唤"
+              value-format="yyyy-MM-dd"
+              @change="getTimeList"
+            >
             </el-date-picker>
           </el-form-item>
         </el-col>
 
-
-
         <el-col :span="6">
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">鎼滅储</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">閲嶇疆</el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-search"
+              size="mini"
+              @click="handleQuery"
+              >鎼滅储</el-button
+            >
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+              >閲嶇疆</el-button
+            >
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <el-row :gutter="10" class="mb8">
-
       <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-download" size="mini" :loading="exportLoading"
-          @click="handleExport">瀵煎嚭</el-button>
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          >瀵煎嚭</el-button
+        >
       </el-col>
-
     </el-row>
-    <el-table v-loading="loading" :default-sort="{ prop: 'deathtime', order: 'descending' }" border
-      :data="donatebaseinfoList">
-      <el-table-column label="鎶ュ憡鏃堕棿" align="center" prop="reporttime" width="140">
+    <el-table
+      v-loading="loading"
+      :default-sort="{ prop: 'deathtime', order: 'descending' }"
+      border
+      :data="donatebaseinfoList"
+    >
+      <el-table-column
+        label="鎶ュ憡鏃堕棿"
+        align="center"
+        prop="reporttime"
+        width="140"
+      >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.reporttime, "{y}-{m}-{d}") }}</span>
         </template>
@@ -80,33 +149,70 @@
 
       <el-table-column label="鎬у埆" align="center" prop="sex" width="100">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_user_sex" :value="parseInt(scope.row.sex)" />
+          <dict-tag
+            :options="dict.type.sys_user_sex"
+            :value="parseInt(scope.row.sex)"
+          />
         </template>
       </el-table-column>
       <el-table-column label="骞撮緞" align="center" prop="age" width="100" />
-      <el-table-column label="鍖荤枟鏈烘瀯" align="center" prop="treatmenthospitalname" />
+      <el-table-column
+        label="鍖荤枟鏈烘瀯"
+        align="center"
+        prop="treatmenthospitalname"
+      />
       <!-- <el-table-column label="韬唤璇佸彿" prop="idcardno" width="200" /> -->
-      <el-table-column label="鎹愮尞绫诲埆" align="center" prop="dwdonationcategory" width="150">
+      <el-table-column
+        label="鎹愮尞绫诲埆"
+        align="center"
+        prop="dwdonationcategory"
+        width="150"
+      >
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_DonationCategory" :value="scope.row.dwdonationcategory" />
+          <dict-tag
+            :options="dict.type.sys_DonationCategory"
+            :value="scope.row.dwdonationcategory"
+          />
         </template>
       </el-table-column>
       <el-table-column label="瑙佽瘉鏃堕棿" align="center" prop="operationbegtime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.operationbegtime, "{y}-{m}-{d}") }}</span>
+          <span>{{
+            parseTime(scope.row.operationbegtime, "{y}-{m}-{d}")
+          }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="鎶ュ憡浜�" align="center" prop="reportername" width="100" />
+      <el-table-column
+        label="鎶ュ憡浜�"
+        align="center"
+        prop="reportername"
+        width="100"
+      />
 
       <el-table-column label="鎹愮尞杩涘害" align="center" prop="recordstate">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.sys_DonationStatus" :value="scope.row.recordstate" />
+          <dict-tag
+            :options="dict.type.sys_DonationStatus"
+            :value="scope.row.recordstate"
+          />
         </template>
       </el-table-column>
 
-      <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width" width="140" fixed="right">
+      <el-table-column
+        label="鎿嶄綔"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="140"
+        fixed="right"
+      >
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAdd(scope.row)">瑙佽瘉鐧昏</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleAdd(scope.row)"
+            >瑙佽瘉鐧昏</el-button
+          >
           <!-- <el-button
             v-if="scope.row.recordstate==2 || scope.row.recordstate==3"
               size="mini"
@@ -115,54 +221,115 @@
               @click="submitRecord(scope.row)"
               v-hasPermi="['project:donatebaseinfo:edit']"
               >涓婃姤浼︾悊瀹℃煡</el-button> -->
-          <el-button size="mini" type="text" icon="el-icon-refrigerator" @click="handledownload(scope.row)">涓嬭浇</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-refrigerator"
+            @click="handledownload(scope.row)"
+            >涓嬭浇</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
 
     <!-- 娣诲姞鎴栦慨鏀规崘鐚熀纭�瀵硅瘽妗� -->
-    <el-dialog :title="title" align="center" :visible.sync="open" width="1000px" append-to-body
-      :close-on-click-modal="false">
-      <el-form ref="form" style="margin: 0px auto" :model="form" :rules="rules" label-width="120px">
+    <el-dialog
+      :title="title"
+      align="center"
+      :visible.sync="open"
+      width="1000px"
+      append-to-body
+      :close-on-click-modal="false"
+    >
+      <el-form
+        ref="form"
+        style="margin: 0px auto"
+        :model="form"
+        :rules="rules"
+        label-width="120px"
+      >
         <el-row>
           <el-col :span="12">
             <el-form-item label="鎹愮尞缂栧彿" prop="donorno">
-              <el-input v-model="curCase.donorno" disabled placeholder="璇疯緭鍏ユ崘鐚�呯紪鍙�" />
+              <el-input
+                v-model="curCase.donorno"
+                disabled
+                placeholder="璇疯緭鍏ユ崘鐚�呯紪鍙�"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item align="left" label="鎹愮尞鍖婚櫌" prop="treatmenthospitalname">
-              <org-selecter ref="orgSelecter" :org-type="'3'" v-model="curCase.treatmenthospitalname" disabled />
+            <el-form-item
+              align="left"
+              label="鎹愮尞鍖婚櫌"
+              prop="treatmenthospitalname"
+            >
+              <org-selecter
+                ref="orgSelecter"
+                :org-type="'3'"
+                v-model="curCase.treatmenthospitalname"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="6">
             <el-form-item label="濮撳悕 " prop="name">
-              <el-input v-model="curCase.name" disabled placeholder="璇疯緭鍏ユ崘鐚�呭鍚�" />
+              <el-input
+                v-model="curCase.name"
+                disabled
+                placeholder="璇疯緭鍏ユ崘鐚�呭鍚�"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="鎬у埆" prop="sex">
-              <el-select v-model="curCase.sex" disabled placeholder="璇烽�夋嫨鎬у埆">
-                <el-option v-for="dict in dict.type.sys_user_sex" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
+              <el-select
+                v-model="curCase.sex"
+                disabled
+                placeholder="璇烽�夋嫨鎬у埆"
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_user_sex"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
-              <el-date-picker style="width: 95%" clearable v-model="curCase.birthday" type="date"
-                value-format="yyyy:MM:dd" placeholder="閫夋嫨鍑虹敓鏃ユ湡" disabled>
+              <el-date-picker
+                style="width: 95%"
+                clearable
+                v-model="curCase.birthday"
+                type="date"
+                value-format="yyyy:MM:dd"
+                placeholder="閫夋嫨鍑虹敓鏃ユ湡"
+                disabled
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="璇佷欢鍙风爜" prop="idcardno">
-              <el-input ref="updateBSvalue" class="sfzcode" v-model="curCase.idcardno" placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�" disabled />
+              <el-input
+                ref="updateBSvalue"
+                class="sfzcode"
+                v-model="curCase.idcardno"
+                placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�"
+                disabled
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -206,7 +373,12 @@
           <el-col :span="24">
             <el-form-item align="left" label="鎹愮尞鍐冲畾">
               <el-checkbox-group v-model="form.organdonation">
-                <el-checkbox v-for="dict in dict.type.sys_Organ" :key="dict.value" :label="dict.value" disabled>
+                <el-checkbox
+                  v-for="dict in dict.type.sys_Organ"
+                  :key="dict.value"
+                  :label="dict.value"
+                  disabled
+                >
                   {{ dict.label }}
                 </el-checkbox>
               </el-checkbox-group>
@@ -217,8 +389,12 @@
           <el-col :span="24">
             <el-form-item align="left" label="鎹愮尞绫诲埆" prop="donationcategory">
               <el-radio-group v-model="form.donationcategory">
-                <el-radio v-for="dict in dict.type.sys_DonationCategory" :key="dict.value" :label="dict.value">{{
-                  dict.label }}</el-radio>
+                <el-radio
+                  v-for="dict in dict.type.sys_DonationCategory"
+                  :key="dict.value"
+                  :label="dict.value"
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
@@ -239,26 +415,41 @@
           </el-col>
           <el-col :span="10">
             <el-form-item align="left" label="鍖荤敓涓�" prop="deathjudgedocto">
-              <el-input v-model="form.deathjudgedocto" placeholder="鍒ゅ畾鍖荤敓濮撳悕" />
+              <el-input
+                v-model="form.deathjudgedocto"
+                placeholder="鍒ゅ畾鍖荤敓濮撳悕"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="10">
             <el-form-item align="left" label="鍖荤敓浜�" prop="deathjudgedoctt">
-              <el-input v-model="form.deathjudgedoctt" placeholder="鍒ゅ畾鍖荤敓濮撳悕" />
+              <el-input
+                v-model="form.deathjudgedoctt"
+                placeholder="鍒ゅ畾鍖荤敓濮撳悕"
+              />
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row><el-col :span="2"><el-form-item align="left" label="" /> </el-col>
+        <el-row
+          ><el-col :span="2"><el-form-item align="left" label="" /> </el-col>
           <el-col :span="10">
             <el-form-item align="left" label="姝讳骸鏃堕棿" prop="deathtime">
-              <el-date-picker clearable v-model="form.deathtime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="閫夋嫨姝讳骸鏃堕棿">
+              <el-date-picker
+                clearable
+                v-model="form.deathtime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="閫夋嫨姝讳骸鏃堕棿"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="10">
             <el-form-item align="left" label="姝讳骸鍘熷洜" prop="deathreason">
-              <el-input v-model="form.deathreason" placeholder="璇疯緭鍏ユ浜″師鍥�" />
+              <el-input
+                v-model="form.deathreason"
+                placeholder="璇疯緭鍏ユ浜″師鍥�"
+              />
             </el-form-item>
           </el-col>
         </el-row>
@@ -268,117 +459,249 @@
           </el-col>
           <el-col :span="10">
             <el-form-item align="left" label="寮�濮嬫椂闂�" prop="operationbegtime">
-              <el-date-picker clearable v-model="form.operationbegtime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="閫夋嫨鎵嬫湳寮�濮嬫椂闂�">
+              <el-date-picker
+                clearable
+                v-model="form.operationbegtime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="閫夋嫨鎵嬫湳寮�濮嬫椂闂�"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="10">
             <el-form-item align="left" label="缁撴潫鏃堕棿" prop="operationendtime">
-              <el-date-picker clearable v-model="form.operationendtime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
-                placeholder="閫夋嫨鎵嬫湳缁撴潫鏃堕棿">
+              <el-date-picker
+                clearable
+                v-model="form.operationendtime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="閫夋嫨鎵嬫湳缁撴潫鏃堕棿"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row><el-col :span="2"><el-form-item align="left" label="鑵逛富鍔ㄨ剦:" />
+        <el-row
+          ><el-col :span="2"
+            ><el-form-item align="left" label="鑵逛富鍔ㄨ剦:" />
           </el-col>
           <el-col :span="10">
-            <el-form-item label="鎻掔鏃堕棿" align="left" prop="abdominalaortacannulatime">
-              <el-date-picker clearable v-model="form.abdominalaortacannulatime" type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鑵逛富鍔ㄨ剦鎻掔鏃堕棿">
+            <el-form-item
+              label="鎻掔鏃堕棿"
+              align="left"
+              prop="abdominalaortacannulatime"
+            >
+              <el-date-picker
+                clearable
+                v-model="form.abdominalaortacannulatime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="閫夋嫨鑵逛富鍔ㄨ剦鎻掔鏃堕棿"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="鐏屾敞鏃堕棿" align="left" prop="abdominalaortaperfusiontime">
-              <el-date-picker clearable v-model="form.abdominalaortaperfusiontime" type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿">
+            <el-form-item
+              label="鐏屾敞鏃堕棿"
+              align="left"
+              prop="abdominalaortaperfusiontime"
+            >
+              <el-date-picker
+                clearable
+                v-model="form.abdominalaortaperfusiontime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="閫夋嫨鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
 
-        <el-row><el-col :span="2"><el-form-item align="left" label="闂ㄩ潤鑴�:" />
+        <el-row
+          ><el-col :span="2"
+            ><el-form-item align="left" label="闂ㄩ潤鑴�:" />
           </el-col>
           <el-col :span="10">
-            <el-form-item label="鎻掔鏃堕棿" align="left" prop="portalveincannulatime">
-              <el-date-picker clearable v-model="form.portalveincannulatime" type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨闂ㄩ潤鑴夎剦鎻掔鏃堕棿">
+            <el-form-item
+              label="鎻掔鏃堕棿"
+              align="left"
+              prop="portalveincannulatime"
+            >
+              <el-date-picker
+                clearable
+                v-model="form.portalveincannulatime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="閫夋嫨闂ㄩ潤鑴夎剦鎻掔鏃堕棿"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="鐏屾敞鏃堕棿" align="left" prop="portalveinperfusiontime">
-              <el-date-picker clearable v-model="form.portalveinperfusiontime" type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�">
+            <el-form-item
+              label="鐏屾敞鏃堕棿"
+              align="left"
+              prop="portalveinperfusiontime"
+            >
+              <el-date-picker
+                clearable
+                v-model="form.portalveinperfusiontime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row><el-col :span="2"><el-form-item align="left" label="鑲哄姩鑴�:" />
+        <el-row
+          ><el-col :span="2"
+            ><el-form-item align="left" label="鑲哄姩鑴�:" />
           </el-col>
           <el-col :span="10">
-            <el-form-item label="鎻掔鏃堕棿" align="left" prop="pulmonaryarterycannulatime">
-              <el-date-picker clearable v-model="form.pulmonaryarterycannulatime" type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨闂ㄩ潤鑴夋彃绠℃椂闂�">
+            <el-form-item
+              label="鎻掔鏃堕棿"
+              align="left"
+              prop="pulmonaryarterycannulatime"
+            >
+              <el-date-picker
+                clearable
+                v-model="form.pulmonaryarterycannulatime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="閫夋嫨闂ㄩ潤鑴夋彃绠℃椂闂�"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="鐏屾敞鏃堕棿" align="left" prop="pulmonaryarteryperfusiontime">
-              <el-date-picker clearable v-model="form.pulmonaryarteryperfusiontime" type="datetime"
-                value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�">
+            <el-form-item
+              label="鐏屾敞鏃堕棿"
+              align="left"
+              prop="pulmonaryarteryperfusiontime"
+            >
+              <el-date-picker
+                clearable
+                v-model="form.pulmonaryarteryperfusiontime"
+                type="datetime"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
 
-        <el-row><el-col :span="2"><el-form-item align="left" label="涓诲姩鑴�:" />
+        <el-row
+          ><el-col :span="2"
+            ><el-form-item align="left" label="涓诲姩鑴�:" />
           </el-col>
           <el-col :span="10">
             <el-form-item label="鐏屾敞鏃堕棿" align="left" prop="aortacannulatime">
-              <el-date-picker clearable v-model="form.aortacannulatime" type="datetime"
-                value-format="yyyy-MM-dd  HH:mm:ss" placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�">
+              <el-date-picker
+                clearable
+                v-model="form.aortacannulatime"
+                type="datetime"
+                value-format="yyyy-MM-dd  HH:mm:ss"
+                placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="鐏屾敞鏃堕棿" align="left" prop="aortaperfusiontime">
-              <el-date-picker clearable v-model="form.aortaperfusiontime" type="datetime"
-                value-format="yyyy-MM-dd  HH:mm:ss" placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�">
+            <el-form-item
+              label="鐏屾敞鏃堕棿"
+              align="left"
+              prop="aortaperfusiontime"
+            >
+              <el-date-picker
+                clearable
+                v-model="form.aortaperfusiontime"
+                type="datetime"
+                value-format="yyyy-MM-dd  HH:mm:ss"
+                placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�"
+              >
               </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-table :data="tableData" border>
-          <el-table-column align="center" width="80px" prop="organname" label="鍣ㄥ畼鍚嶇О">
+          <el-table-column
+            align="center"
+            width="80px"
+            prop="organname"
+            label="鍣ㄥ畼鍚嶇О"
+          >
           </el-table-column>
-          <el-table-column align="center" width="220px" prop="gainhospitalno" label="鑾峰彇缁勭粐">
+          <el-table-column
+            align="center"
+            width="220px"
+            prop="gainhospitalno"
+            label="鑾峰彇缁勭粐"
+          >
             <template slot-scope="scope">
-              <org-selecter ref="gainhosselect" :org-type="'4'" v-model="scope.row.gainhospitalno" />
+              <org-selecter
+                ref="gainhosselect"
+                :org-type="'4'"
+                v-model="scope.row.gainhospitalno"
+              />
             </template>
           </el-table-column>
-          <el-table-column align="center" width="140px" prop="organgetdoct" label="鑾峰彇鍖诲笀">
+          <el-table-column
+            align="center"
+            width="140px"
+            prop="organgetdoct"
+            label="鑾峰彇鍖诲笀"
+          >
             <template slot-scope="scope">
-              <el-input v-model="scope.row.organgetdoct" placeholder="璇疯緭鍏ヨ幏鍙栧尰甯�"></el-input>
+              <el-input
+                v-model="scope.row.organgetdoct"
+                placeholder="璇疯緭鍏ヨ幏鍙栧尰甯�"
+              ></el-input>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="210px" prop="organgettime" label="鑾峰彇鏃ユ湡">
+          <el-table-column
+            align="center"
+            width="210px"
+            prop="organgettime"
+            label="鑾峰彇鏃ユ湡"
+          >
             <template slot-scope="scope">
               <el-row>
-                <el-date-picker clearable size="small" style="width: 100%" v-model="scope.row.organgettime"
-                  type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="閫夋嫨鍣ㄥ畼鑾峰彇鏃堕棿">
+                <el-date-picker
+                  clearable
+                  size="small"
+                  style="width: 100%"
+                  v-model="scope.row.organgettime"
+                  type="datetime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="閫夋嫨鍣ㄥ畼鑾峰彇鏃堕棿"
+                >
                 </el-date-picker>
               </el-row>
             </template>
           </el-table-column>
-          <el-table-column label="鍣ㄥ畼鐘舵��" align="center" prop="organstate" width="180">
+          <el-table-column
+            label="鍣ㄥ畼鐘舵��"
+            align="center"
+            prop="organstate"
+            width="180"
+          >
             <template slot-scope="scope">
-              <el-select v-model="scope.row.organstate" placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��">
-                <el-option v-for="dict in dict.type.sys_organstate" :key="dict.value" :label="dict.label"
-                  :value="dict.value"></el-option>
+              <el-select
+                v-model="scope.row.organstate"
+                placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+              >
+                <el-option
+                  v-for="dict in dict.type.sys_organstate"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
               </el-select>
             </template>
           </el-table-column>
@@ -387,33 +710,53 @@
           <el-col :span="12">
             <el-form-item align="left" label="榛樺搥缂呮��浠紡">
               <el-radio-group v-model="form.isspendremember">
-                <el-radio v-for="dict in dict.type.sys_0_1" :key="dict.value" :label="parseInt(dict.value)">{{ dict.label
-                }}</el-radio>
+                <el-radio
+                  v-for="dict in dict.type.sys_0_1"
+                  :key="dict.value"
+                  :label="parseInt(dict.value)"
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item align="left" label="鎭㈠閬椾綋浠">
               <el-radio-group v-model="form.isrestoreremains">
-                <el-radio v-for="dict in dict.type.sys_0_1" :key="dict.value" :label="parseInt(dict.value)">{{ dict.label
-                }}</el-radio>
+                <el-radio
+                  v-for="dict in dict.type.sys_0_1"
+                  :key="dict.value"
+                  :label="parseInt(dict.value)"
+                  >{{ dict.label }}</el-radio
+                >
               </el-radio-group>
-            </el-form-item></el-col>
+            </el-form-item></el-col
+          >
         </el-row>
         <!-- <el-form-item align="left" label="姝讳骸璇佹槑闄勪欢璺緞">
           <fileUpload v-model="form.deathjudgeannex" />
         </el-form-item> -->
         <el-row>
           <el-col :span="8">
-            <el-form-item label="鎵嬫湳璐熻矗浜�" label-width="140px" prop="responsibleusername">
-              <el-input v-model="form.responsibleusername" placeholder="璇疯緭鍏ヨ礋璐d汉濮撳悕" />
+            <el-form-item
+              label="鎵嬫湳璐熻矗浜�"
+              label-width="140px"
+              prop="responsibleusername"
+            >
+              <el-input
+                v-model="form.responsibleusername"
+                placeholder="璇疯緭鍏ヨ礋璐d汉濮撳悕"
+              />
             </el-form-item>
           </el-col>
           <el-col :span="8">
             <el-form-item label="鍗忚皟鍛樹竴" prop="coordinateduserido">
               <el-select v-model="form.coordinateduserido" placeholder="璇烽�夋嫨">
-                <el-option v-for="item in coordinatorlist1" :key="item.reportNo" :label="item.reportName"
-                  :value="item.reportNo">
+                <el-option
+                  v-for="item in coordinatorlist1"
+                  :key="item.reportNo"
+                  :label="item.reportName"
+                  :value="item.reportNo"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -421,8 +764,12 @@
           <el-col :span="8">
             <el-form-item label="鍗忚皟鍛樹簩" prop="coordinateduseridt">
               <el-select v-model="form.coordinateduseridt" placeholder="璇烽�夋嫨">
-                <el-option v-for="item in coordinatorlist1" :key="item.reportNo" :label="item.reportName"
-                  :value="item.reportNo">
+                <el-option
+                  v-for="item in coordinatorlist1"
+                  :key="item.reportNo"
+                  :label="item.reportName"
+                  :value="item.reportNo"
+                >
                 </el-option>
               </el-select>
             </el-form-item>
@@ -431,7 +778,12 @@
       </el-form>
 
       <!-- 缂栬緫鍣ㄥ畼 -->
-      <el-dialog title="鍣ㄥ畼" :close-on-click-modal="false" :visible.sync="dialogFormVisible" append-to-body>
+      <el-dialog
+        title="鍣ㄥ畼"
+        :close-on-click-modal="false"
+        :visible.sync="dialogFormVisible"
+        append-to-body
+      >
         <el-form :model="table">
           <el-form-item label="鍣ㄥ畼鍚嶇О" :label-width="formLabelWidth">
             <el-input v-model="form.organnames"></el-input>
@@ -439,7 +791,9 @@
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button @click="dialogFormVisible = false">鍙� 娑�</el-button>
-          <el-button type="primary" @click="dialogFormVisible = false">淇� 瀛�</el-button>
+          <el-button type="primary" @click="dialogFormVisible = false"
+            >淇� 瀛�</el-button
+          >
         </div>
       </el-dialog>
       <div slot="footer" class="dialog-footer">
@@ -455,8 +809,7 @@
 import {
   listOrganization,
   listReportname,
-  listUser,
-
+  listUser
 } from "@/api/project/organization";
 
 import {
@@ -474,12 +827,12 @@
   listDonateorgan,
   addDonateorgan,
   delDonateorgan,
-  updateDonateorgan,
+  updateDonateorgan
 } from "@/api/project/donateorgan";
 import {
   listDonatebaseinfo,
   updateDonatebaseinfo,
-  getDonatebaseinfo,
+  getDonatebaseinfo
 } from "@/api/project/donatebaseinfo";
 import Li_area_select from "@/components/Address";
 import OrgSelecter from "@/views/project/components/orgselect";
@@ -488,7 +841,7 @@
 export default {
   components: {
     Li_area_select,
-    OrgSelecter,
+    OrgSelecter
   },
   name: "Donationwitness",
   dicts: [
@@ -523,7 +876,7 @@
     "sys_SelfWill",
     "sys_FamilyRelation",
     "sys_Organ",
-    "sys_organstate",
+    "sys_organstate"
   ],
   data() {
     return {
@@ -550,7 +903,7 @@
         { label: "琛㈠窞甯�", value: "8" },
         { label: "鑸熷北甯�", value: "9" },
         { label: "鍙板窞甯�", value: "A" },
-        { label: "涓芥按甯�", value: "B" },
+        { label: "涓芥按甯�", value: "B" }
       ],
 
       // 鎻掔鏃堕棿
@@ -562,7 +915,7 @@
         sheng: "",
         shi: "",
         qu: "",
-        organizationname: null,
+        organizationname: null
       },
 
       table: {},
@@ -632,39 +985,39 @@
         reportername: null,
         reporttime: null,
         city: null,
-        treatmenthospitalno: null,
+        treatmenthospitalno: null
       },
       // 琛ㄥ崟鍙傛暟
       form: {},
       // 琛ㄥ崟鏍¢獙
       rules: {
         donationcategory: [
-          { required: true, message: "璇疯緭鍏ラ�夋嫨鎹愮尞绫诲埆", trigger: "blur" },
+          { required: true, message: "璇疯緭鍏ラ�夋嫨鎹愮尞绫诲埆", trigger: "blur" }
         ],
         deathjudgedocto: [
-          { required: true, message: "璇疯緭鍏ユ浜″垽瀹氫笓瀹朵竴", trigger: "blur" },
+          { required: true, message: "璇疯緭鍏ユ浜″垽瀹氫笓瀹朵竴", trigger: "blur" }
         ],
         deathjudgedoctt: [
-          { required: true, message: "璇疯緭鍏ユ浜″垽瀹氫笓瀹朵簩", trigger: "blur" },
+          { required: true, message: "璇疯緭鍏ユ浜″垽瀹氫笓瀹朵簩", trigger: "blur" }
         ],
         deathtime: [
-          { required: true, message: "璇疯緭鍏ユ浜℃椂闂�", trigger: "blur" },
+          { required: true, message: "璇疯緭鍏ユ浜℃椂闂�", trigger: "blur" }
         ],
         operationbegtime: [
-          { required: true, message: "璇疯緭鍏ユ墜鏈紑濮嬫椂闂�", trigger: "blur" },
+          { required: true, message: "璇疯緭鍏ユ墜鏈紑濮嬫椂闂�", trigger: "blur" }
         ],
         responsibleusername: [
-          { required: true, message: "璇疯緭鍏ユ墜鏈礋璐d汉", trigger: "blur" },
+          { required: true, message: "璇疯緭鍏ユ墜鏈礋璐d汉", trigger: "blur" }
         ],
         coordinateduserido: [
-          { required: true, message: "璇疯緭鍏ュ崗璋冨憳涓�", trigger: "blur" },
+          { required: true, message: "璇疯緭鍏ュ崗璋冨憳涓�", trigger: "blur" }
         ],
         coordinateduseridt: [
-          { required: true, message: "璇疯緭鍏ュ崗璋冨憳浜�", trigger: "blur" },
-        ],
+          { required: true, message: "璇疯緭鍏ュ崗璋冨憳浜�", trigger: "blur" }
+        ]
       },
       curCase: {},
-      tempRecordState: null,
+      tempRecordState: null
     };
   },
   created() {
@@ -686,7 +1039,7 @@
         this.$moment(this.$route.params.starttime).format("YYYY-MM-DD"),
         this.$moment(this.$route.params.endtime)
           .add(-1, "month")
-          .format("YYYY-MM-DD"),
+          .format("YYYY-MM-DD")
       ];
     }
     if (this.$route.params.reporterno != "") {
@@ -726,14 +1079,14 @@
   },
   methods: {
     LoadReportList() {
-      listDonatebaseinfo().then((res) => {
+      listDonatebaseinfo().then(res => {
         console.log("娼滃湪鎹愮尞琛�", res);
         let list = res.rows;
         let reportlist = [];
-        list.forEach((element) => {
+        list.forEach(element => {
           reportlist.push({
             reporterno: element.reporterno,
-            reportername: element.reportername,
+            reportername: element.reportername
           });
         });
         console.log("dwada", reportlist);
@@ -745,7 +1098,7 @@
     },
     resetArr(Arr) {
       var hash = {};
-      Arr = Arr.reduce(function (arr, current) {
+      Arr = Arr.reduce(function(arr, current) {
         hash[current.reporterno]
           ? ""
           : (hash[current.reporterno] = true && arr.push(current));
@@ -810,20 +1163,20 @@
     },
     //鐢ㄦ埛鍒楄〃
     getuserlist() {
-      listUser().then((res) => {
+      listUser().then(res => {
         this.users = res.data;
       });
     },
     getCoordinatorList1() {
       //鍗忚皟鍛樹竴
       // let userType = {"userType":"xty1"};
-      listReportname("xty1").then((res) => {
+      listReportname("xty1").then(res => {
         this.coordinatorlist1 = res.data;
       });
     },
     getCoordinatorList2() {
       //鍗忚皟鍛樹簩
-      listReportname("xty2").then((res) => {
+      listReportname("xty2").then(res => {
         this.coordinatorlist2 = res.data;
       });
     },
@@ -844,7 +1197,7 @@
       //   this.queryParams.recordstate = e
       // }
       this.$nextTick(() => {
-        listnewDonationwitness(this.queryParams).then((response) => {
+        listnewDonationwitness(this.queryParams).then(response => {
           this.donatebaseinfoList = response.rows;
           this.donatebaseinfoList.dodeathtime = "";
           this.total = response.total;
@@ -933,7 +1286,7 @@
         updateBy: null,
         updateTime: null,
         organdonation: [],
-        organdonationOther: null,
+        organdonationOther: null
       };
       this.resetForm("form");
     },
@@ -962,7 +1315,7 @@
         acquisitiontissueno: null,
         reportername: null,
         reporttime: null,
-        city: null,
+        city: null
       };
       this.selecttime = [];
       this.getTimeList();
@@ -970,17 +1323,17 @@
         sheng: "",
         shi: "",
         qu: "",
-        organizationname: null,
+        organizationname: null
       };
-      this.operationbegtime = []
-      this.startoperationbegtime = ""
-      this.endoperationbegtime = ""
+      this.operationbegtime = [];
+      this.startoperationbegtime = "";
+      this.endoperationbegtime = "";
       this.resetForm("queryForm");
       this.handleQuery();
     },
 
     handleSelectionChange(selection) {
-      this.ids = selection.map((item) => item.id);
+      this.ids = selection.map(item => item.id);
 
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
@@ -1006,10 +1359,10 @@
         education: row.education,
         nationality: row.nationality,
         occupation: row.occupation,
-        birthday: row.birthday,
+        birthday: row.birthday
       };
 
-      getDonatebaseinfo(id).then((res) => {
+      getDonatebaseinfo(id).then(res => {
         console.log("鎹愮尞鍩虹琛ㄦ暟鎹�", res);
         this.curCase.nation = res.data.nation;
         this.curCase.education = res.data.education;
@@ -1031,11 +1384,11 @@
 
       //鍒ゆ柇鏄惁瀛樺湪瑙佽瘉璁板綍
       let searchParam = {
-        infoid: row.id,
+        infoid: row.id
       };
       this.GetDonortedList();
       const infoid = this.form.infoid;
-      getByInfoId(infoid).then((response) => {
+      getByInfoId(infoid).then(response => {
         if (response.code == 200) {
           //鑾峰彇鍣ㄥ畼鍒嗛厤淇℃伅
 
@@ -1056,7 +1409,7 @@
     handleUpdate(row) {
       this.reset();
       const id = row.id || this.ids;
-      getDonationwitness(id).then((response) => {
+      getDonationwitness(id).then(response => {
         this.form = response.data;
         this.open = true;
         this.title = "淇敼";
@@ -1065,31 +1418,33 @@
 
     /** 鎻愪氦鎸夐挳 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
           //鍗忚皟鍛�1
           let coordinatedusernameIndex = this.coordinatorlist1.findIndex(
-            (item) => this.form.coordinateduserido == item.reportNo
+            item => this.form.coordinateduserido == item.reportNo
           );
 
           if (coordinatedusernameIndex > -1) {
-            this.form.coordinatedusernameo =
-              this.coordinatorlist1[coordinatedusernameIndex].reportName;
+            this.form.coordinatedusernameo = this.coordinatorlist1[
+              coordinatedusernameIndex
+            ].reportName;
           }
           //鍗忚皟鍛�2
           let coordinatedusernametIndex = this.coordinatorlist1.findIndex(
-            (item) => this.form.coordinateduseridt == item.reportNo
+            item => this.form.coordinateduseridt == item.reportNo
           );
           if (coordinatedusernametIndex > -1) {
-            this.form.coordinatedusernamet =
-              this.coordinatorlist1[coordinatedusernametIndex].reportName;
+            this.form.coordinatedusernamet = this.coordinatorlist1[
+              coordinatedusernametIndex
+            ].reportName;
           }
 
           this.form.organdonation = this.form.organdonation.join(",");
           if (this.form.id != null) {
-            updateDonationwitness(this.form).then((response) => {
+            updateDonationwitness(this.form).then(response => {
               this.$modal.msgSuccess("淇敼鎴愬姛");
-              updatedonatorno(this.form.infoid).then((res) => {
+              updatedonatorno(this.form.infoid).then(res => {
                 this.getList();
               });
               this.open = false;
@@ -1097,14 +1452,15 @@
               //鏇存柊鍣ㄥ畼琛�
               for (let k = 0; k < this.tableData.length; k++) {
                 try {
-                  this.tableData[k].gainhospitalname =
-                    this.$refs.gainhosselect.getOptionByValue(
-                      this.tableData[k].gainhospitalno
-                    ).organizationname;
+                  this.tableData[
+                    k
+                  ].gainhospitalname = this.$refs.gainhosselect.getOptionByValue(
+                    this.tableData[k].gainhospitalno
+                  ).organizationname;
                 } catch {
                   console.log("鑾峰彇鏈烘瀯鍚嶇О澶辫触");
                 }
-                updateDonateorgan(this.tableData[k]).then((response1) => {
+                updateDonateorgan(this.tableData[k]).then(response1 => {
                   if (response1.code == 200) {
                     this.$modal.msgSuccess("鍣ㄥ畼璁板綍淇敼鎴愬姛");
                   }
@@ -1113,35 +1469,36 @@
 
               this.curCase.recordstate = 11;
               //update.donatebaseinfoList.deathtime = this.form.deathtime;
-              updateDonatebaseinfo(this.curCase).then((response) => {
+              updateDonatebaseinfo(this.curCase).then(response => {
                 this.open = false;
               });
               this.getList();
             });
           } else {
-            addDonationwitness(this.form).then((response) => {
+            addDonationwitness(this.form).then(response => {
               this.$modal.msgSuccess("鏂板鎴愬姛");
               //鏇存柊鍣ㄥ畼琛�
               for (let k = 0; k < this.tableData.length; k++) {
                 try {
-                  this.tableData[k].gainhospitalname =
-                    this.$refs.gainhosselect.getOptionByValue(
-                      this.tableData[k].gainhospitalno
-                    ).organizationname;
+                  this.tableData[
+                    k
+                  ].gainhospitalname = this.$refs.gainhosselect.getOptionByValue(
+                    this.tableData[k].gainhospitalno
+                  ).organizationname;
                 } catch {
                   console.log("鑾峰彇鏈烘瀯鍚嶇О澶辫触");
                 }
-                updateDonateorgan(this.tableData[k]).then((response1) => {
+                updateDonateorgan(this.tableData[k]).then(response1 => {
                   if (response1.code == 200) {
                     this.$modal.msgSuccess("鍣ㄥ畼璁板綍淇敼鎴愬姛");
                   }
                 });
               }
-              updatedonatorno(this.form.infoid).then((res) => {
+              updatedonatorno(this.form.infoid).then(res => {
                 this.getList();
               });
               this.curCase.recordstate = 11;
-              updateDonatebaseinfo(this.curCase).then((response) => {
+              updateDonatebaseinfo(this.curCase).then(response => {
                 this.open = false;
                 this.getList();
               });
@@ -1157,27 +1514,27 @@
       const ids = row.id || this.ids;
       this.$modal
         .confirm('鏄惁纭鍒犻櫎鎹愮尞瑙佽瘉缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�')
-        .then(function () {
+        .then(function() {
           return delDonationwitness(ids);
         })
         .then(() => {
           this.getList();
           this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     //鑾峰彇鐥呬汉宸叉崘鐚殑鍣ㄥ畼鍒楄〃
     GetDonortedList() {
       this.loading = true;
       let oraganqueryParam = {
         //donorno: this.form.donorno,
-        infoid: this.curCase.id,
+        infoid: this.curCase.id
       };
       console.log(
         "璋冪敤鍣ㄥ畼鍒楄〃鎺ュ彛锛屽弬鏁帮細" + JSON.stringify(oraganqueryParam)
       );
 
-      listDonateorgan(oraganqueryParam).then((response) => {
+      listDonateorgan(oraganqueryParam).then(response => {
         this.loading = false;
         if (response.code == 200) {
           this.organdonation = [];
@@ -1188,15 +1545,17 @@
               this.tableData[i].gainhospitalname == null ||
               this.tableData[i].gainhospitalname == ""
             ) {
-              this.tableData[i].gainhospitalname =
-                this.tableData[i].transplanthospitalname;
+              this.tableData[i].gainhospitalname = this.tableData[
+                i
+              ].transplanthospitalname;
             }
             if (
               this.tableData[i].gainhospitalno == null ||
               this.tableData[i].gainhospitalno == ""
             ) {
-              this.tableData[i].gainhospitalno =
-                this.tableData[i].transplanthospitalno;
+              this.tableData[i].gainhospitalno = this.tableData[
+                i
+              ].transplanthospitalno;
             }
           }
           //this.organalForm.organname = [];
@@ -1212,7 +1571,7 @@
     handledownload(row) {
       const id = row.id || this.ids;
       console.log("232323232", row);
-      downloadwitnessinfo(row.dwid).then((response) => {
+      downloadwitnessinfo(row.dwid).then(response => {
         var fileUrl = response;
         //鑾峰彇褰撳墠缃戝潃
         var urlBase = process.env.VUE_APP_BASE_API;
@@ -1228,14 +1587,19 @@
     /** 瀵煎嚭鎸夐挳鎿嶄綔 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('鏄惁纭瀵煎嚭鎵�鏈夎幏鍙栬璇佹暟鎹」锛�').then(() => {
-        this.exportLoading = true;
-        return exportDonationwitness(queryParams);
-      }).then(response => {
-        this.$download.name(response.msg);
-        this.exportLoading = false;
-      }).catch(() => { }); z
+      this.$modal
+        .confirm("鏄惁纭瀵煎嚭鎵�鏈夎幏鍙栬璇佹暟鎹」锛�")
+        .then(() => {
+          this.exportLoading = true;
+          return exportDonationwitness(queryParams);
+        })
+        .then(response => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+      z;
     }
-  },
+  }
 };
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/project/fund/applyDetail/index.vue b/src/views/project/fund/applyDetail/index.vue
index f9d9842..d793382 100644
--- a/src/views/project/fund/applyDetail/index.vue
+++ b/src/views/project/fund/applyDetail/index.vue
@@ -157,7 +157,7 @@
                 type="success"
                 icon="el-icon-edit-outline"
                 @click="Manualcalculationfn"
-                >璁$畻鏄庣粏</el-button
+                >璁$畻涓◣</el-button
               >
             </div>
           </el-col>
@@ -2057,6 +2057,14 @@
               );
               return;
             }
+            if (tempDetail.idcardno == null) {
+              this.$modal.msgWarning(
+                "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
+                  (k + 1).toString() +
+                  "琛岀殑韬唤璇佹湭瀹屽杽锛岃鍏堝~鍐欒韩浠借瘉鍚庡啀鎻愪氦淇濆瓨锛�"
+              );
+              return;
+            }
 
             if (this.businessType == "1") {
               if (tempDetail.servicesscope == null) {
diff --git a/src/views/project/fund/performancedetails/index.vue b/src/views/project/fund/performancedetails/index.vue
index a1c1dfa..5cddef8 100644
--- a/src/views/project/fund/performancedetails/index.vue
+++ b/src/views/project/fund/performancedetails/index.vue
@@ -118,14 +118,16 @@
             </div></el-col
           >
         </el-row>
-        <el-row v-if="userprofile.nickName == '闄堟厱鍗�' && operationType == 'check'">
+        <el-row
+          v-if="userprofile.nickName == '闄堟厱鍗�' && operationType == 'check'"
+        >
           <el-col :span="3"
             ><div style="margin-bottom: 15px;">
               <el-button
                 type="success"
                 icon="el-icon-edit-outline"
                 @click="Manualcalculationfn"
-                >璁$畻鏄庣粏</el-button
+                >璁$畻涓◣</el-button
               >
             </div></el-col
           >
@@ -245,6 +247,16 @@
                       : "鐐瑰嚮閫夋嫨"
                   }}</el-button
                 >
+              </template>
+            </el-table-column>
+            <el-table-column
+              prop="idcardno"
+              align="center"
+              label="韬唤璇佸彿"
+              width="200"
+            >
+              <template slot-scope="scope">
+                <el-input v-model="scope.row.idcardno" placeholder="韬唤璇佸彿" />
               </template>
             </el-table-column>
 
@@ -1170,6 +1182,14 @@
               );
               return;
             }
+            if (tempDetail.idcardno == null) {
+              this.$modal.msgWarning(
+                "鏈嶅姟椤圭洰琛ㄤ腑锛岀" +
+                  (k + 1).toString() +
+                  "琛岀殑韬唤璇佹湭瀹屽杽锛岃鍏堝~鍐欒韩浠借瘉鍚庡啀鎻愪氦淇濆瓨锛�"
+              );
+              return;
+            }
 
             if (this.businessType == "1") {
               if (tempDetail.servicesscope == null) {
@@ -1780,7 +1800,7 @@
     BatchentryFn() {
       console.log(this.rbDetails[0]);
       if (!this.rbDetails[0].applytype) {
-        this.rbDetails=[]
+        this.rbDetails = [];
       }
       this.checkedCities.forEach(item => {
         let rowData = {
diff --git a/src/views/project/medicalevaluation/index.vue b/src/views/project/medicalevaluation/index.vue
index a3a9d24..157fda8 100644
--- a/src/views/project/medicalevaluation/index.vue
+++ b/src/views/project/medicalevaluation/index.vue
@@ -9,7 +9,6 @@
       label-width="70px"
     >
       <el-row :gutter="8">
-        
         <el-col :span="6">
           <el-form-item label="濮撳悕" prop="name">
             <el-input
@@ -35,7 +34,7 @@
           </el-form-item>
         </el-col>
 
-         <el-col :span="6">
+        <el-col :span="6">
           <el-form-item label="鎹愮尞鍦板競">
             <el-select v-model="queryParams.city" placeholder="璇烽�夋嫨鍦板競">
               <el-option
@@ -48,7 +47,7 @@
             </el-select>
           </el-form-item>
         </el-col>
-        
+
         <el-col :span="6">
           <el-form-item label="鎹愮尞杩涘害" prop="recordstate">
             <el-select
@@ -70,7 +69,10 @@
       <el-row :gutter="8">
         <el-col :span="6">
           <el-form-item label="鎶ュ憡浜�">
-            <el-select v-model="queryParams.reporterno" placeholder="璇烽�夋嫨鎶ュ憡浜�">
+            <el-select
+              v-model="queryParams.reporterno"
+              placeholder="璇烽�夋嫨鎶ュ憡浜�"
+            >
               <el-option
                 v-for="item in reportlist"
                 :key="item.index"
@@ -204,7 +206,7 @@
           />
         </template>
       </el-table-column>
-      
+
       <el-table-column
         label="鎿嶄綔"
         align="center"
@@ -571,7 +573,7 @@
   listDonatebaseinfo,
   getDonatebaseinfo,
   addDonatebaseinfo,
-  updateDonatebaseinfo,
+  updateDonatebaseinfo
   // exportProvincemessage,
 } from "@/api/project/donatebaseinfo";
 
@@ -584,7 +586,7 @@
   delMedicalevaluation,
   addMedicalevaluation,
   updateMedicalevaluation,
-  exportMedicalevaluation,
+  exportMedicalevaluation
 } from "@/api/project/medicalevaluation";
 
 import { listRelativesconfirmation } from "@/api/project/relativesconfirmation";
@@ -599,7 +601,7 @@
   components: {
     Li_area_select,
     OrgSelecter,
-    AnnexUpload,
+    AnnexUpload
   },
   name: "Medicalevaluation",
   dicts: [
@@ -626,7 +628,7 @@
     "sys_organstate",
     "sys_CoreAssessConclusion",
     "sys_BaseAssessConclusion",
-    "sys_OrganDecision",
+    "sys_OrganDecision"
   ],
   data() {
     //杩欓噷瀛樻斁鏁版嵁
@@ -645,7 +647,7 @@
         sheng: "",
         shi: "",
         qu: "",
-        organizationname: null,
+        organizationname: null
       },
       provinceData: [
         { label: "鍏ㄩ儴", value: "" },
@@ -659,22 +661,22 @@
         { label: "琛㈠窞甯�", value: "8" },
         { label: "鑸熷北甯�", value: "9" },
         { label: "鍙板窞甯�", value: "A" },
-        { label: "涓芥按甯�", value: "B" },
+        { label: "涓芥按甯�", value: "B" }
       ],
       residenceAddresss: {
         sheng: "娴欐睙鐪�",
         shi: "",
-        qu: "",
+        qu: ""
       },
       registerAddresss: {
         sheng: "娴欐睙鐪�",
         shi: "",
-        qu: "",
+        qu: ""
       },
       defultAddresss: {
         sheng: "娴欐睙鐪�",
         shi: "",
-        qu: "",
+        qu: ""
       },
       // 閬僵灞�
       loading: true,
@@ -716,7 +718,7 @@
         donorno: null,
         reportername: null,
         reporttime: null,
-        city: null,
+        city: null
       },
       // 琛ㄥ崟鍙傛暟
       form: {},
@@ -734,7 +736,7 @@
       //纭鐧昏琛╰itle
       confirmationTitle: "",
       //鐢ㄦ埛琛�
-      users: [],
+      users: []
     };
   },
   //鐩戝惉灞炴�� 绫讳技浜巇ata姒傚康
@@ -753,7 +755,7 @@
         this.$moment(this.$route.params.starttime).format("YYYY-MM-DD"),
         this.$moment(this.$route.params.endtime)
           .add(-1, "month")
-          .format("YYYY-MM-DD"),
+          .format("YYYY-MM-DD")
       ];
     }
     if (this.$route.params.reporterno != "") {
@@ -790,7 +792,7 @@
   methods: {
     //鑾峰彇鐢ㄦ埛鍒楄〃
     getuserlist() {
-      listUser().then((res) => {
+      listUser().then(res => {
         this.users = res.data;
       });
     },
@@ -849,13 +851,13 @@
       }
     },
     LoadReportList() {
-      listDonatebaseinfo().then((res) => {
+      listDonatebaseinfo().then(res => {
         let list = res.rows;
         let reportlist = [];
-        list.forEach((element) => {
+        list.forEach(element => {
           reportlist.push({
             reporterno: element.reporterno,
-            reportername: element.reportername,
+            reportername: element.reportername
           });
         });
 
@@ -867,7 +869,7 @@
     },
     resetArr(Arr) {
       var hash = {};
-      Arr = Arr.reduce(function (arr, current) {
+      Arr = Arr.reduce(function(arr, current) {
         hash[current.reporterno]
           ? ""
           : (hash[current.reporterno] = true && arr.push(current));
@@ -904,7 +906,7 @@
       }
       this.queryParams.reportervalue = this.reportervalue;
       this.$nextTick(() => {
-        listnewMedicalevaluation(this.queryParams).then((response) => {
+        listnewMedicalevaluation(this.queryParams).then(response => {
           this.VMedicalevaluation = response.rows;
           console.log("1111111");
           this.total = response.total;
@@ -940,7 +942,7 @@
         coreteamassesstime: null,
         treatmenthospitalname: null,
         coreteamassessconclusion: null,
-        assessannex: null,
+        assessannex: null
       };
       this.resetForm("form");
     },
@@ -973,7 +975,7 @@
         acquisitiontissueno: null,
         reportername: null,
         reporttime: null,
-        city: null,
+        city: null
       };
       this.selecttime = [];
       this.getTimeList();
@@ -981,7 +983,7 @@
         sheng: "",
         shi: "",
         qu: "",
-        organizationname: null,
+        organizationname: null
       };
 
       this.resetForm("queryForm");
@@ -1006,7 +1008,7 @@
       }
       this.setState({
         birthday,
-        sex,
+        sex
       });
     },
 
@@ -1025,22 +1027,22 @@
       this.curCase = {
         id: data.id,
         recordstate: null,
-        donorno: data.donorno,
+        donorno: data.donorno
       };
       //鑾峰彇鍖诲鎹愮尞璇勪及璁板綍
       this.loading = true;
       if (data.meid) {
         let searchParam = {
-          id: data.meid,
+          id: data.meid
         };
         //listDonatebaseinfo(searchParam).then((response) => {
-        listMedicalevaluation(searchParam).then((response) => {
+        listMedicalevaluation(searchParam).then(response => {
           if (response.code == 200 && response.rows.length == 1) {
             this.title = "淇敼鎹愮尞鍖诲璇勪及";
             this.form = response.rows[0];
             this.form.infoid = data.id;
             this.open = true;
-            this.$nextTick(function () {
+            this.$nextTick(function() {
               this.$refs.evaluationannex.getAnnexList();
             });
           } else {
@@ -1055,7 +1057,7 @@
         this.form.donorno = data.donorno;
 
         this.open = true;
-        this.$nextTick(function () {
+        this.$nextTick(function() {
           this.$refs.evaluationannex.getAnnexList();
         });
       }
@@ -1064,27 +1066,30 @@
     /** 鎻愪氦鎸夐挳 */
     submitForm() {
       this.loading = true;
-      this.$refs["form"].validate((valid) => {
+      this.$refs["form"].validate(valid => {
         if (valid) {
+          console.log(this.form.id);
           if (this.form.id != null) {
-            updateMedicalevaluation(this.form).then((response) => {
+            updateMedicalevaluation(this.form).then(response => {
               this.loading = false;
               this.$modal.msgSuccess("淇敼鎴愬姛");
               //鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍
               let searchConfirmParam = {
-                infoid: this.curCase.id.toString(),
+                infoid: this.curCase.id.toString()
               };
               this.loading = true;
-              listRelativesconfirmation(searchConfirmParam).then((response) => {
+              listRelativesconfirmation(searchConfirmParam).then(response => {
                 this.loading = false;
+                console.log(789);
                 if (response.code == 200) {
                   if (response.rows.length > 0) {
                     this.curCase.recordstate = 7;
                   } else {
                     this.curCase.recordstate = 4;
                   }
-                  updateDonatebaseinfo(this.curCase).then((response1) => {
-                    this.getList();
+                  updateDonatebaseinfo(this.curCase).then(response1 => {
+                    // this.getList();
+                    console.log(456);
                     if (response1.code == 200) {
                       if (this.curCase.recordstate == 7) {
                         this.$modal.msgSuccess("鎹愮尞璇勪及瀹屾垚骞朵笂鎶ヤ鸡鐞嗗鏌�");
@@ -1099,19 +1104,20 @@
                   });
                 }
               });
+              console.log(123);
               this.open = false;
               this.getList();
             });
           } else {
-            addMedicalevaluation(this.form).then((response) => {
+            addMedicalevaluation(this.form).then(response => {
               this.loading = false;
               this.$modal.msgSuccess("鏂板鎴愬姛");
               //鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍
               let searchConfirmParam = {
-                infoid: this.curCase.id.toString(),
+                infoid: this.curCase.id.toString()
               };
               this.loading = true;
-              listRelativesconfirmation(searchConfirmParam).then((response) => {
+              listRelativesconfirmation(searchConfirmParam).then(response => {
                 this.loading = false;
                 if (response.code == 200) {
                   if (response.rows.length > 0) {
@@ -1119,7 +1125,7 @@
                   } else {
                     this.curCase.recordstate = 4;
                   }
-                  updateDonatebaseinfo(this.curCase).then((response1) => {
+                  updateDonatebaseinfo(this.curCase).then(response1 => {
                     this.getList();
                     if (response1.code == 200) {
                       if (this.curCase.recordstate == 7) {
@@ -1185,7 +1191,7 @@
         createBy: null,
         createTime: null,
         updateBy: null,
-        updateTime: null,
+        updateTime: null
       };
       this.resetForm("confirmationform");
     },
@@ -1202,13 +1208,13 @@
       this.annexno = "";
       //鏌ヨ鏄惁瀛樺湪纭鐧昏璁板綍
       let searchConfirmParam = {
-        infoid: row.id.toString(),
+        infoid: row.id.toString()
       };
       this.curCase = row;
       this.resetConfirmForm();
 
       this.loading = true;
-      listRelativesconfirmation(searchConfirmParam).then((response) => {
+      listRelativesconfirmation(searchConfirmParam).then(response => {
         this.loading = false;
         if (response.code == 200) {
           if (response.rows.length == 0) {
@@ -1230,7 +1236,7 @@
               row.residencetownname;
             this.confirmationTitle = "鏂板浜轰綋鍣ㄥ畼鎹愮尞浜插睘纭鐧昏琛�";
             this.isShowConfirmationDialog = true;
-            this.$nextTick(function () {
+            this.$nextTick(function() {
               this.$refs.confirmannex.getAnnexList();
             });
           } else if (response.rows.length == 1) {
@@ -1250,16 +1256,16 @@
               row.residenceprovincename +
               row.residencecityname +
               row.residencetownname;
-            this.defultAddresss.sheng =
-              this.confirmationform.residenceprovincename;
+            this.defultAddresss.sheng = this.confirmationform.residenceprovincename;
             this.defultAddresss.shi = this.confirmationform.residencecityname;
             this.defultAddresss.qu = this.confirmationform.residencetownname;
             //this.form.kinship = this.form.kinship.split(",");
-            this.confirmationform.organdecision =
-              this.confirmationform.organdecision.split(",");
+            this.confirmationform.organdecision = this.confirmationform.organdecision.split(
+              ","
+            );
             this.isShowConfirmationDialog = true;
             this.title = "淇敼浜轰綋鍣ㄥ畼鎹愮尞浜插睘纭鐧昏琛�";
-            this.$nextTick(function () {
+            this.$nextTick(function() {
               this.$refs.confirmannex.getAnnexList();
             });
           } else {
@@ -1275,39 +1281,37 @@
 
     //淇濆瓨瀹跺睘纭琛�
     saveConfirmationForm() {
-      this.$refs["confirmationform"].validate((valid) => {
+      this.$refs["confirmationform"].validate(valid => {
         if (valid) {
           // this.form.kinship = this.form.kinship.join(",");
 
-          this.confirmationform.organdecision =
-            this.confirmationform.organdecision.join(",");
-          this.confirmationform.kinship =
-            this.confirmationform.kinship.join(",");
-          this.confirmationform.residenceprovince =
-            this.$refs.residenceaddresss.getSheng();
-          this.confirmationform.residenceprovincename =
-            this.defultAddresss.sheng;
-          this.confirmationform.residencecity =
-            this.$refs.residenceaddresss.getShi();
+          this.confirmationform.organdecision = this.confirmationform.organdecision.join(
+            ","
+          );
+          this.confirmationform.kinship = this.confirmationform.kinship.join(
+            ","
+          );
+          this.confirmationform.residenceprovince = this.$refs.residenceaddresss.getSheng();
+          this.confirmationform.residenceprovincename = this.defultAddresss.sheng;
+          this.confirmationform.residencecity = this.$refs.residenceaddresss.getShi();
           this.confirmationform.residencecityname = this.defultAddresss.shi;
-          this.confirmationform.residencetown =
-            this.$refs.residenceaddresss.getQu();
+          this.confirmationform.residencetown = this.$refs.residenceaddresss.getQu();
           this.confirmationform.residencetownname = this.defultAddresss.qu;
           if (this.confirmationform.id != null) {
             updateRelativesconfirmation(this.confirmationform).then(
-              (response) => {
+              response => {
                 this.$modal.msgSuccess("淇敼鎴愬姛");
                 this.isShowConfirmationDialog = false;
                 this.getList();
               }
             );
           } else {
-            addRelativesconfirmation(this.confirmationform).then((response) => {
+            addRelativesconfirmation(this.confirmationform).then(response => {
               this.$modal.msgSuccess("鏂板鎴愬姛");
               this.isShowConfirmationDialog = false;
               //涓婃姤浼︾悊瀹℃煡
               this.curCase.recordstate = 7;
-              updateDonatebaseinfo(this.curCase).then((response1) => {
+              updateDonatebaseinfo(this.curCase).then(response1 => {
                 this.getList();
                 if (response1.code == 200) {
                   this.$modal.msgSuccess("涓婃姤浼︾悊瀹℃煡鎴愬姛");
@@ -1321,7 +1325,7 @@
           }
         }
       });
-    },
+    }
   },
 
   //鐢熷懡鍛ㄦ湡 - 鍒涘缓瀹屾垚锛堝彲浠ヨ闂綋鍓峵his瀹炰緥锛�
@@ -1330,7 +1334,7 @@
     this.getuserlist();
     //鑾峰彇鍒楄〃
     this.getList();
-  },
+  }
   // //鐢熷懡鍛ㄦ湡 - 鎸傝浇瀹屾垚锛堝彲浠ヨ闂瓺OM鍏冪礌锛�
   //    mounted() {},
   // beforeCreate() {}, //鐢熷懡鍛ㄦ湡 - 鍒涘缓涔嬪墠

--
Gitblit v1.9.3