From 2698387e653c6a25059c3ae9976f18b814eba892 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期五, 12 九月 2025 15:16:46 +0800
Subject: [PATCH] 医疗权限

---
 src/views/project/donationdetails/index.vue | 1280 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 879 insertions(+), 401 deletions(-)

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 2e99aba..be9cd62 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -6,19 +6,18 @@
         <div>
           <el-steps direction="vertical" :active="workflow">
             <el-step title="娼滃湪鎹愮尞" icon="el-icon-user">
-              <template
-                slot="description"
-                v-if="Processdata.donatebaseinfo.createtime"
-              >
+              <template slot="description" v-if="donatebaseinfo.createtime">
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatebaseinfo.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span
+                    >{{ donatebaseinfo.createperson }}
+                    {{ parseTime(donatebaseinfo.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatebaseinfo.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span
+                    >{{ donatebaseinfo.updateperson }}
+                    {{ parseTime(donatebaseinfo.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -27,19 +26,18 @@
               icon="el-icon-edit-outline"
               description="璇峰厛瀹屾垚鍓嶉儴姝ラ"
             >
-              <template
-                slot="description"
-                v-if="Processdata.medicalevaluation.createtime"
-              >
+              <template slot="description" v-if="medicalevaluation.createtime">
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.medicalevaluation.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ medicalevaluation.createperson }}
+                    {{ parseTime(medicalevaluation.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.medicalevaluation.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ medicalevaluation.updateperson }}
+                    {{ parseTime(medicalevaluation.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -50,17 +48,19 @@
             >
               <template
                 slot="description"
-                v-if="Processdata.relativesconfirmation.createtime"
+                v-if="relativesconfirmation.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.relativesconfirmation.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ relativesconfirmation.createperson }}
+                    {{ parseTime(relativesconfirmation.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.relativesconfirmation.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ relativesconfirmation.updateperson }}
+                    {{ parseTime(relativesconfirmation.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -69,19 +69,18 @@
               description="璇峰厛瀹屾垚鍓嶉儴姝ラ"
               icon="el-icon-s-order"
             >
-              <template
-                slot="description"
-                v-if="Processdata.donateflowcharts.createtime"
-              >
+              <template slot="description" v-if="donateflowcharts.createtime">
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateflowcharts.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ donateflowcharts.createperson }}
+                    {{ parseTime(donateflowcharts.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateflowcharts.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ donateflowcharts.updateperson }}
+                    {{ parseTime(donateflowcharts.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -92,17 +91,19 @@
             >
               <template
                 slot="description"
-                v-if="Processdata.donateorgansService.createtime"
+                v-if="donateorgansService.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateorgansService.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ donateorgansService.createperson }}
+                    {{ parseTime(donateorgansService.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donateorgansService.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ donateorgansService.updateperson }}
+                    {{ parseTime(donateorgansService.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -111,19 +112,18 @@
               description="璇峰厛瀹屾垚鍓嶉儴姝ラ"
               icon="el-icon-s-management"
             >
-              <template
-                slot="description"
-                v-if="Processdata.donationwitness.createtime"
-              >
+              <template slot="description" v-if="donationwitness.createtime">
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donationwitness.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ donationwitness.createperson }}
+                    {{ parseTime(donationwitness.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donationwitness.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ donationwitness.updateperson }}
+                    {{ parseTime(donationwitness.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -134,17 +134,19 @@
             >
               <template
                 slot="description"
-                v-if="Processdata.donatecompletioninfo.createtime"
+                v-if="donatecompletioninfo.createtime"
               >
                 <p>
-                  鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatecompletioninfo.createtime)
-                  }}</span>
+                  鎻愪氦锛�<span>
+                    {{ donatecompletioninfo.createperson }}
+                    {{ parseTime(donatecompletioninfo.createtime) }}</span
+                  >
                 </p>
                 <p>
-                  鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.donatecompletioninfo.updatetime)
-                  }}</span>
+                  鏇存柊锛�<span>
+                    {{ donatecompletioninfo.updateperson }}
+                    {{ parseTime(donatecompletioninfo.updatetime) }}</span
+                  >
                 </p>
               </template>
             </el-step>
@@ -228,7 +230,7 @@
                     placeholder="璇烽�夋嫨璇佷欢绫诲瀷"
                   >
                     <el-option
-                      v-for="dict in dict.type.sys_IDType"
+                      v-for="dict in dict.type.sys_IDType || []"
                       :key="dict.value"
                       :label="dict.label"
                       :value="parseInt(dict.value)"
@@ -266,7 +268,7 @@
                 <el-form-item label="鎬у埆" prop="sex">
                   <el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆">
                     <el-option
-                      v-for="dict in dict.type.sys_user_sex"
+                      v-for="dict in dict.type.sys_user_sex || []"
                       :key="dict.label"
                       :label="dict.label"
                       :value="parseInt(dict.value)"
@@ -276,7 +278,11 @@
               </el-col>
               <el-col :span="6">
                 <el-form-item label="骞撮緞" prop="age">
-                  <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
+                  <el-input
+                    disabled
+                    v-model="form.andAge"
+                    placeholder="璇疯緭鍏ュ勾榫�"
+                  />
                 </el-form-item>
               </el-col>
               <el-col :span="6">
@@ -345,7 +351,7 @@
         </el-steps>
       </div>
       <!-- 鍑瘉鏂囦欢 -->
-      <div class="Ticket-button" v-show="actives != 5 && actives != 4">
+      <div class="Ticket-button">
         <el-button @click.native.prevent="Filepopup" type="success"
           >鍑瘉鏂囦欢</el-button
         >
@@ -379,7 +385,7 @@
               <el-form-item label="姘戞棌" prop="nation">
                 <el-select v-model="form.nation" placeholder="璇烽�夋嫨姘戞棌">
                   <el-option
-                    v-for="dict in dict.type.sys_nation"
+                    v-for="dict in dict.type.sys_nation || []"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -403,7 +409,7 @@
               <el-form-item label="鑱屼笟" prop="occupation">
                 <el-select v-model="form.occupation" placeholder="璇烽�夋嫨鑱屼笟">
                   <el-option
-                    v-for="dict in dict.type.sys_occupation"
+                    v-for="dict in dict.type.sys_occupation || []"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -415,12 +421,50 @@
               <el-form-item label="瀛﹀巻" prop="education">
                 <el-select v-model="form.education" placeholder="璇烽�夋嫨瀛﹀巻">
                   <el-option
-                    v-for="dict in dict.type.sys_education"
+                    v-for="dict in dict.type.sys_education || []"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
                   ></el-option>
                 </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="褰撳墠鍖荤枟鏈烘瀯" prop="occupation">
+                <el-input
+                  v-model="form.currentMedicalInstitution"
+                  placeholder="璇疯緭鍏�"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item
+                label-width="130px"
+                label="褰撳墠鍖荤枟鏈烘瀯绉戝"
+                prop="education"
+              >
+                <el-input v-model="form.currentDept" placeholder="璇疯緭鍏�" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="棣栨鍖荤枟鏈烘瀯" prop="occupation">
+                <el-input
+                  v-model="form.firstMedicalInstitution"
+                  placeholder="璇疯緭鍏�"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item
+                label-width="130px"
+                label="棣栨鍖荤枟鏈烘瀯绉戝"
+                prop="education"
+              >
+                <el-input v-model="form.firstDept" placeholder="璇疯緭鍏�" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -468,7 +512,7 @@
               <el-form-item align="left" label="琛�鍨�" prop="bloodtype">
                 <el-radio-group v-model="form.bloodtype">
                   <el-radio
-                    v-for="dict in dict.type.sys_BloodType"
+                    v-for="dict in dict.type.sys_BloodType || []"
                     :key="dict.value"
                     :label="dict.value"
                     >{{ dict.label }}</el-radio
@@ -480,7 +524,7 @@
               <el-form-item label="Rh(D)" align="left" prop="rhyin">
                 <el-radio-group v-model="form.rhyin">
                   <el-radio
-                    v-for="dict in dict.type.sys_bloodtype_rhd"
+                    v-for="dict in dict.type.sys_bloodtype_rhd || []"
                     :key="dict.value"
                     :label="dict.value"
                     >{{ dict.label }}</el-radio
@@ -493,7 +537,7 @@
             <el-form-item label="鐤剧梾绫诲瀷" align="left">
               <el-checkbox-group v-model="form.diseasetype">
                 <el-checkbox
-                  v-for="dict in dict.type.sys_DiseaseType"
+                  v-for="dict in dict.type.sys_DiseaseType || []"
                   :key="dict.value"
                   :label="dict.value"
                 >
@@ -513,7 +557,7 @@
               <el-form-item align="left" label="浼犳煋鐥�">
                 <el-checkbox-group v-model="form.infectious">
                   <el-checkbox
-                    v-for="dict in dict.type.sys_Infectious"
+                    v-for="dict in dict.type.sys_Infectious || []"
                     :key="dict.value"
                     :label="dict.value"
                   >
@@ -536,7 +580,7 @@
               <el-form-item align="left" label="鐥呬汉鐘跺喌">
                 <el-checkbox-group v-model="form.patientstate">
                   <el-checkbox
-                    v-for="dict in dict.type.sys_patientstate"
+                    v-for="dict in dict.type.sys_patientstate || []"
                     :key="dict.value"
                     :label="dict.value"
                   >
@@ -549,7 +593,7 @@
               <el-form-item label="鍏朵粬鎯呭喌">
                 <el-checkbox-group v-model="form.othercases">
                   <el-checkbox
-                    v-for="dict in dict.type.sys_OtherCases"
+                    v-for="dict in dict.type.sys_OtherCases || []"
                     :key="dict.value"
                     :label="dict.value"
                   >
@@ -571,7 +615,7 @@
                   >
                     <el-checkbox-group v-model="form.kinship">
                       <el-checkbox
-                        v-for="dict in dict.type.sys_Kinship"
+                        v-for="dict in dict.type.sys_kinship || []"
                         :key="dict.value"
                         :label="dict.value"
                       >
@@ -596,7 +640,7 @@
               <el-form-item align="left" label="鏈汉鎰忔効 ">
                 <el-checkbox-group v-model="form.selfwill">
                   <el-checkbox
-                    v-for="dict in dict.type.sys_SelfWill"
+                    v-for="dict in dict.type.sys_SelfWill || []"
                     :key="dict.value"
                     :label="dict.value"
                   >
@@ -622,7 +666,7 @@
                   placeholder="璇烽�夋嫨涓庢崘璧犺�呭叧绯�"
                 >
                   <el-option
-                    v-for="dict in dict.type.sys_FamilyRelation"
+                    v-for="dict in dict.type.sys_FamilyRelation || []"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -636,7 +680,7 @@
               <el-form-item align="left" label="淇℃伅鏉ユ簮">
                 <el-checkbox-group v-model="form.infosources">
                   <el-checkbox
-                    v-for="dict in dict.type.sys_InfoSources"
+                    v-for="dict in dict.type.sys_InfoSources || []"
                     :key="dict.value"
                     :label="dict.value"
                   >
@@ -719,12 +763,13 @@
         </el-form>
         <div class="dialog-footer">
           <el-button
-            v-show="!showTerminationBtn"
+            v-show="!showTerminationBtn && workflow != 9"
             type="primary"
             @click="submitForm"
             >淇濆瓨</el-button
           >
           <el-button
+            v-if="workflow != 9"
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -807,7 +852,7 @@
                   placeholder="璇烽�夋嫨闄㈢骇璇勪及缁撹"
                 >
                   <el-option
-                    v-for="dict in dict.type.sys_BaseAssessConclusion"
+                    v-for="dict in dict.type.sys_BaseAssessConclusion || []"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -859,7 +904,7 @@
                   placeholder="璇烽�夋嫨鐪佺骇璇勪及缁撹"
                 >
                   <el-option
-                    v-for="dict in dict.type.sys_BaseAssessConclusion"
+                    v-for="dict in dict.type.sys_BaseAssessConclusion || []"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -915,7 +960,7 @@
                   placeholder="璇烽�夋嫨鏍稿績鎴愬憳缁撹"
                 >
                   <el-option
-                    v-for="dict in dict.type.sys_CoreAssessConclusion"
+                    v-for="dict in dict.type.sys_CoreAssessConclusion || []"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -942,12 +987,13 @@
         </el-form>
         <div class="dialog-footer">
           <el-button
-            v-show="!showTerminationBtn"
+            v-show="!showTerminationBtn && workflow != 9"
             type="primary"
             @click="Savethedetails"
             >淇濆瓨</el-button
           >
           <el-button
+            v-if="workflow != 9"
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -987,7 +1033,7 @@
                   placeholder="璇烽�夋嫨涓庢崘璧犺�呭叧绯�"
                 >
                   <el-option
-                    v-for="dict in dict.type.sys_FamilyRelation"
+                    v-for="dict in dict.type.sys_FamilyRelation || []"
                     :key="dict.value"
                     :label="dict.label"
                     :value="dict.value"
@@ -1015,17 +1061,60 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="12">
+            <el-col :span="6">
+              <el-form-item label="姘戞棌" prop="nation">
+                <el-select v-model="affirmform.nation" placeholder="璇烽�夋嫨姘戞棌">
+                  <el-option
+                    v-for="dict in dict.type.sys_nation || []"
+                    :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="education">
+                <el-select
+                  v-model="affirmform.education"
+                  placeholder="璇烽�夋嫨瀛﹀巻"
+                >
+                  <el-option
+                    v-for="dict in dict.type.sys_education || []"
+                    :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="occupation">
+                <el-select
+                  v-model="affirmform.occupation"
+                  placeholder="璇烽�夋嫨鑱屼笟"
+                >
+                  <el-option
+                    v-for="dict in dict.type.sys_occupation || []"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <!-- <el-col :span="12">
               <el-form-item label="浜插睘绫嶈疮" prop="residenceaddresss">
                 <div>
                   <li_area_select
                     v-model="defultAddresss"
                     ref="residenceaddresss"
                   ></li_area_select>
-                  <!-- <div>{{defultAddress}}</div> -->
                 </div>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="12">
               <el-form-item label="鐜颁綇鍦板潃" prop="residenceaddress">
                 <el-input
@@ -1038,13 +1127,17 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="绛惧瓧浜插睘" prop="kinshipconfirmationsign">
-                <el-checkbox-group v-model="organdecision">
+                <el-checkbox-group v-model="kinship">
                   <el-checkbox
-                    v-for="item in kinshiplist"
-                    :key="item"
-                    :label="item"
+                    v-for="dict in dict.type.sys_kinshipConfirm || []"
+                    :label="dict.value"
+                    :value="dict.value"
                   >
-                    {{ item == "瀛愬コ" ? item + "(浜�)" : item }}
+                    {{
+                      dict.label == "鎴愬勾瀛愬コ"
+                        ? dict.label + "(浜�)"
+                        : dict.label
+                    }}
                   </el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
@@ -1175,12 +1268,13 @@
         </el-form>
         <div class="dialog-footer">
           <el-button
-            v-show="!showTerminationBtn"
+            v-show="!showTerminationBtn && workflow != 9"
             type="primary"
             @click="Savethedetails"
             >淇濆瓨</el-button
           >
           <el-button
+            v-if="workflow != 9"
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -1208,7 +1302,7 @@
               <el-form-item label="瀹℃煡缁撹">
                 <el-radio-group v-model="ethicform.expertconclusion">
                   <el-radio
-                    v-for="dict in dict.type.sys_EthicalReview"
+                    v-for="dict in dict.type.sys_EthicalReview || []"
                     :key="dict.value"
                     :label="parseInt(dict.value)"
                     >{{ dict.label }}</el-radio
@@ -1246,12 +1340,13 @@
         </el-form>
         <div class="dialog-footer" style="min-height: 500px; margin: 20px 0; ">
           <el-button
-            v-show="!showTerminationBtn"
+            v-show="!showTerminationBtn && workflow != 9"
             type="primary"
             @click="Savethedetails"
             >淇濆瓨</el-button
           >
           <el-button
+            v-if="workflow != 9"
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -1268,9 +1363,9 @@
       <!-- 鍣ㄥ畼鍒嗛厤 -->
       <div class="boxdiv" v-show="actives == 4">
         <el-form
-          ref="allocateddata"
-          :model="allocateddata"
+          ref="allocateddataform"
           :rules="allocationrules"
+          :model="allocateddataform"
           label-position="right"
         >
           <el-row>
@@ -1278,7 +1373,7 @@
               <el-form-item label-width="100px" label="鍒嗛厤鍣ㄥ畼">
                 <el-checkbox-group v-model="organList.organallocated">
                   <el-checkbox
-                    v-for="dict in dict.type.sys_Organ"
+                    v-for="dict in dict.type.sys_Organ || []"
                     :key="dict.value"
                     :label="dict.value"
                     @change="changeorganState(dict.value)"
@@ -1314,7 +1409,7 @@
                     prop="organno"
                   />
                   <el-table-column
-                    label="绯荤粺缂栧彿"
+                    label="鍒嗛厤绯荤粺缂栧彿"
                     align="center"
                     width="120"
                     prop="caseno"
@@ -1322,12 +1417,12 @@
                     <template slot-scope="scope">
                       <el-input
                         v-model="scope.row.caseno"
-                        placeholder="绯荤粺缂栧彿"
+                        placeholder="鍒嗛厤绯荤粺缂栧彿"
                       />
                     </template>
                   </el-table-column>
                   <el-table-column
-                    label="鎺ユ敹鏃堕棿"
+                    label="鍒嗛厤鎺ユ敹鏃堕棿"
                     align="center"
                     width="200"
                     prop="applicanttime"
@@ -1340,13 +1435,13 @@
                         v-model="scope.row.applicanttime"
                         type="datetime"
                         value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="閫夋嫨鎺ユ敹鏃堕棿"
+                        placeholder="閫夋嫨鍒嗛厤鎺ユ敹鏃堕棿"
                       >
                       </el-date-picker>
                     </template>
                   </el-table-column>
                   <el-table-column
-                    label="鍙椾綋濮撳悕"
+                    label="鍙椾綋濮撴皬"
                     align="center"
                     width="120"
                     prop="name"
@@ -1354,33 +1449,28 @@
                     <template slot-scope="scope">
                       <el-input
                         v-model="scope.row.name"
-                        placeholder="鍙椾綋濮撳悕"
+                        placeholder="鍙椾綋濮撴皬"
                       />
                     </template>
                   </el-table-column>
-                  <!--
-              <el-table-column label="璇佷欢绫诲瀷" align="center" width="150" prop="idcardtype">
-                <template slot-scope="scope">
-                  <el-select v-model="scope.row.idcardtype" placeholder="绉绘浜鸿瘉浠剁被鍨�">
-                    <el-option v-for="dict in dict.type.sys_IDType" :key="dict.value" :label="dict.label"
-                      :value="parseInt(dict.value)"></el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column label="璇佷欢鍙风爜" align="center" width="200" prop="idcardno">
-                <template slot-scope="scope">
-                  <el-input v-model="scope.row.idcardno" placeholder="璇佷欢鍙风爜" />
-                </template>
-              </el-table-column>             
-                  <el-table-column label="鍒嗛厤鐘舵��" align="center" width="150" prop="allocationstatus">
+                  <el-table-column
+                    label="绉绘鍖婚櫌"
+                    align="center"
+                    width="230"
+                    prop="transplanthospitalno"
+                  >
                     <template slot-scope="scope">
-                      <el-select v-model="scope.row.allocationstatus" placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��">
-                        <el-option v-for="dict in allocationstatuslist" :key="dict.value" :label="dict.label"
-                          :value="dict.value"></el-option>
-                      </el-select>
+                      <div class="elldiv">
+                        <org-selecter
+                          ref="tranHosSelect"
+                          :org-type="'4'"
+                          :dataList="dataList"
+                          v-model="scope.row.transplanthospitalno"
+                        />
+                      </div>
                     </template>
-                  </el-table-column> 
-                -->
+                  </el-table-column>
+
                   <el-table-column
                     prop="reallocationreason"
                     label="璇存槑"
@@ -1419,12 +1509,13 @@
         </el-form>
         <div class="dialog-footer" v-show="actives == 4">
           <el-button
-            v-show="!showTerminationBtn"
+            v-show="!showTerminationBtn && workflow != 9"
             type="primary"
             @click="Savethedetails"
             >淇濆瓨</el-button
           >
           <el-button
+            v-if="workflow != 9"
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -1456,7 +1547,7 @@
               >
                 <el-radio-group v-model="witnessform.donationcategory">
                   <el-radio
-                    v-for="dict in dict.type.sys_DonationCategory"
+                    v-for="dict in dict.type.sys_DonationCategory || []"
                     :key="dict.value"
                     :label="dict.value"
                     >{{ dict.label }}</el-radio
@@ -1552,6 +1643,59 @@
                 <el-date-picker
                   clearable
                   v-model="witnessform.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="6">
+              <el-form-item
+                align="left"
+                label="鍗忚皟鍛橈細杩涙墜鏈鏃堕棿"
+                label-width="160px"
+                prop="coordinatorInOperating"
+              >
+                <el-date-picker
+                  clearable
+                  v-model="witnessform.coordinatorInOperating"
+                  type="datetime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="閫夋嫨鎵嬫湳寮�濮嬫椂闂�"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item
+                align="left"
+                label="鍑烘墜鏈鏃堕棿"
+                label-width="120px"
+                prop="coordinatorOutOperating"
+              >
+                <el-date-picker
+                  clearable
+                  v-model="witnessform.coordinatorOutOperating"
+                  type="datetime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  placeholder="閫夋嫨鎵嬫湳缁撴潫鏃堕棿"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item
+                align="left"
+                label="绛惧瓧鏃堕棿"
+                label-width="120px"
+                prop="coordinatorSignTime"
+              >
+                <el-date-picker
+                  clearable
+                  v-model="witnessform.coordinatorSignTime"
                   type="datetime"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="閫夋嫨鎵嬫湳缁撴潫鏃堕棿"
@@ -1667,7 +1811,7 @@
             </el-col>
             <el-col :span="6">
               <el-form-item
-                label="涓诲姩鑴夛細鐏屾敞鏃堕棿"
+                label="涓诲姩鑴夛細鎻掔鏃堕棿"
                 align="left"
                 label-width="140px"
                 prop="aortacannulatime"
@@ -1677,7 +1821,7 @@
                   v-model="witnessform.aortacannulatime"
                   type="datetime"
                   value-format="yyyy-MM-dd  HH:mm:ss"
-                  placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�"
+                  placeholder="閫夋嫨涓诲姩鑴夋彃绠℃椂闂�"
                 >
                 </el-date-picker>
               </el-form-item>
@@ -1705,7 +1849,7 @@
               <el-form-item label-width="100px" label="鑾峰彇鍣ㄥ畼">
                 <el-checkbox-group v-model="organList.organprocured">
                   <el-checkbox
-                    v-for="dict in dict.type.sys_Organ"
+                    v-for="dict in sysOrganlistL"
                     :key="dict.value"
                     :label="dict.value"
                     @change="changeorganprocured(dict.value)"
@@ -1740,8 +1884,21 @@
                     width="90"
                     prop="organno"
                   />
+                  <!-- <el-table-column
+                    label="绯荤粺缂栧彿"
+                    align="center"
+                    width="120"
+                    prop="caseno"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        v-model="scope.row.caseno"
+                        placeholder="绯荤粺缂栧彿"
+                      />
+                    </template>
+                  </el-table-column> -->
                   <el-table-column
-                    label="鍣ㄥ畼绂讳綋鏃堕棿"
+                    label="鑾峰彇寮�濮嬫椂闂�"
                     align="center"
                     width="200"
                     prop="organgettime"
@@ -1754,7 +1911,7 @@
                         v-model="scope.row.organgettime"
                         type="datetime"
                         value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="璇疯緭鍏ュ櫒瀹樼浣撴椂闂�"
+                        placeholder="璇疯緭鍏ヨ幏鍙栧紑濮嬫椂闂�"
                       >
                       </el-date-picker>
                     </template>
@@ -1770,6 +1927,7 @@
                         <org-selecter
                           ref="tranHosSelect"
                           :org-type="'4'"
+                          :dataList="dataList"
                           v-model="scope.row.gainhospitalno"
                         />
                       </div>
@@ -1788,6 +1946,19 @@
                       />
                     </template>
                   </el-table-column>
+                  <!-- <el-table-column
+                    label="鍙椾綋濮撴皬"
+                    align="center"
+                    width="120"
+                    prop="name"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        v-model="scope.row.name"
+                        placeholder="鍙椾綋濮撴皬"
+                      />
+                    </template>
+                  </el-table-column> -->
                   <el-table-column
                     label="鑾峰彇鐘舵��"
                     align="center"
@@ -1831,7 +2002,7 @@
               <el-form-item align="left" label="榛樺搥缂呮��浠紡">
                 <el-radio-group v-model="witnessform.isspendremember">
                   <el-radio
-                    v-for="dict in dict.type.sys_0_1"
+                    v-for="dict in dict.type.sys_0_1 || []"
                     :key="dict.value"
                     :label="parseInt(dict.value)"
                     >{{ dict.label }}</el-radio
@@ -1843,7 +2014,7 @@
               <el-form-item align="left" label="鎭㈠閬椾綋浠">
                 <el-radio-group v-model="witnessform.isrestoreremains">
                   <el-radio
-                    v-for="dict in dict.type.sys_0_1"
+                    v-for="dict in dict.type.sys_0_1 || []"
                     :key="dict.value"
                     :label="parseInt(dict.value)"
                     >{{ dict.label }}</el-radio
@@ -1903,12 +2074,13 @@
 
         <div class="dialog-footer">
           <el-button
-            v-show="!showTerminationBtn"
+            v-show="!showTerminationBtn && workflow != 9"
             type="primary"
             @click="Savethedetails"
             >淇濆瓨</el-button
           >
           <el-button
+            v-if="workflow != 9"
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
@@ -1937,7 +2109,7 @@
               <el-form-item label-width="100px" label="绉绘鍣ㄥ畼">
                 <el-checkbox-group v-model="organList.organtransplant">
                   <el-checkbox
-                    v-for="dict in dict.type.sys_Organ"
+                    v-for="dict in dict.type.sys_Organ || []"
                     :key="dict.value"
                     :label="dict.value"
                     @change="changeorgantransplant(dict.value)"
@@ -1973,18 +2145,44 @@
                     prop="organno"
                   />
                   <el-table-column
+                    label="绯荤粺缂栧彿"
+                    align="center"
+                    width="120"
+                    prop="caseno"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        v-model="scope.row.caseno"
+                        placeholder="绯荤粺缂栧彿"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
                     label="绉绘鍖婚櫌"
                     align="center"
                     width="220"
-                    prop="transplanthospitalname"
-                    v-if="actives == 6"
+                    prop="hospitalno"
                   >
                     <template slot-scope="scope">
                       <org-selecter
                         ref="tranHosSelect"
                         :org-type="'4'"
-                        v-model="scope.row.transplanthospitalno"
+                        :dataList="dataList"
+                        v-model="scope.row.hospitalno"
                         style="width: 100%"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鍙椾綋濮撴皬"
+                    align="center"
+                    width="120"
+                    prop="name"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        v-model="scope.row.name"
+                        placeholder="鍙椾綋濮撴皬"
                       />
                     </template>
                   </el-table-column>
@@ -2013,8 +2211,8 @@
                         size="small"
                         style="width: 100%"
                         v-model="scope.row.transplanttime"
-                        type="datetime"
-                        value-format="yyyy-MM-dd HH:mm:ss"
+                        type="date"
+                        value-format="yyyy-MM-dd"
                         placeholder="閫夋嫨绉绘鏃堕棿"
                       >
                       </el-date-picker>
@@ -2063,7 +2261,7 @@
               <el-form-item align="left" label="閬椾綋鎹愮尞" prop="isbodydonation">
                 <el-radio-group v-model="accomplishform.isbodydonation">
                   <el-radio
-                    v-for="dict in dict.type.sys_0_1"
+                    v-for="dict in dict.type.sys_0_1 || []"
                     :key="dict.value"
                     :label="dict.value"
                     >{{ dict.label }}</el-radio
@@ -2147,21 +2345,25 @@
         </el-form>
         <div class="dialog-footer">
           <el-button
-            v-show="!showTerminationBtn"
+            v-show="!showTerminationBtn && workflow != 9"
             type="primary"
             @click="Savethedetails"
             >淇濆瓨</el-button
           >
           <el-button
+            v-if="workflow != 9"
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
             >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
           >
           <el-button
-            v-show="Reportforreview"
-            type="primary"
+            v-if="workflow != 9"
+            type="success"
             @click="Reportforreview"
-            >鎻愪氦</el-button
+            >鎻愪氦褰掓。</el-button
+          >
+          <el-button v-else type="danger" @click="Reportforreview"
+            >鎾ら攢褰掓。</el-button
           >
           <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
@@ -2169,10 +2371,6 @@
       <!-- 瀹岀粨娴佺▼ -->
       <div class="boxdiv" v-show="actives > 6">
         <div style="display:flex; line-height: 100px; justify-content: center;">
-          <!-- <el-image
-            style="width: 100px; height: 100px"
-            :src="require('@/assets/images/wanc.png')"
-          ></el-image> -->
           <div style="padding: 20px 0; margin: 0 30px">
             <img
               style="width: 60px; height: 60px"
@@ -2196,22 +2394,27 @@
       :close-on-click-modal="false"
       :title="pdftitle"
       :visible.sync="pdfVisible"
-      width="60%"
+      width="68%"
     >
-      <!-- <div style="text-align: right;">
-        <el-button type="success" @click="drawer = true"
-          >鏂囦欢鎸囧鐩綍</el-button
-        >
-      </div> -->
-      <el-tabs
-        style="margin-top: 20px;"
-        v-model="activeName"
-        type="card"
-        @tab-click="handleClick"
-      >
-        <el-tab-pane :label="activetele" :name="1"> </el-tab-pane>
-      </el-tabs>
+      <!-- <el-tabs style="margin-top: 20px;" v-model="activeName" type="card">
+        <el-tab-pane :label="activetele" name="1"> </el-tab-pane>
+      </el-tabs> -->
       <div class="pdfimg">
+        <div>
+          <el-tabs
+            tab-position="right"
+            style="height: 600px;"
+            v-model="annextype"
+            @tab-click="selecttab"
+          >
+            <el-tab-pane
+              v-for="dict in dict.type.materials_DBD || []"
+              :label="dict.label"
+              :name="dict.value"
+            ></el-tab-pane>
+          </el-tabs>
+        </div>
+
         <div class="box-pdf">
           <div>
             <el-upload
@@ -2250,6 +2453,7 @@
             >
               <el-table-column
                 prop="annexname"
+                align="center"
                 :show-overflow-tooltip="true"
                 label="鍚嶇О"
               >
@@ -2262,22 +2466,16 @@
 
               <el-table-column
                 prop="name"
-                width="180"
+                align="center"
                 :show-overflow-tooltip="true"
                 label="鍔熻兘"
               >
                 <template slot-scope="scope">
                   <el-button
-                    type="primary"
+                    type="danger"
                     size="mini"
                     @click.native.prevent.stop="deletedowfile(scope.row)"
                     >鍒犻櫎</el-button
-                  >
-                  <el-button
-                    type="primary"
-                    size="mini"
-                    @click.native.prevent.stop="moveupdowfile(scope.row)"
-                    >涓婄Щ</el-button
                   >
                 </template>
               </el-table-column>
@@ -2285,7 +2483,7 @@
           </div>
         </div>
 
-        <div v-if="this.previewpdf && pdfimgsrcList.length" class="pdfimgmin">
+        <div v-if="previewpdf && pdfimgsrcList.length" class="pdfimgmin">
           <!-- <img :src="pdfimg" /> -->
           <el-image
             style="width: 95%; height: 90%"
@@ -2342,7 +2540,9 @@
   getDonatebaseinfo,
   addDonatebaseinfo,
   updateDonatebaseinfo,
-  getDonatebaseinfoflow
+  getDonatebaseinfoflow,
+  fileCase,
+  getDonationNumber
 } from "@/api/project/donatebaseinfo";
 import {
   listMedicalevaluation,
@@ -2390,18 +2590,27 @@
 } from "@/api/project/donationwitness";
 import {
   listnewDonatecompletioninfo,
+  listDonatecompletioninfo,
   addDonatecompletioninfo,
   updateDonatecompletioninfo,
   listDonatecomporgan,
   saveDonatecomporgan,
   delDonatecomporgan
 } from "@/api/project/donatecompletioninfo";
+import {
+  listDonorchargeorgan,
+  updateDonorchargeorgan,
+  addDonorchargeorgan,
+  saveDonorchargeorgan,
+  delDonorchargeorgan
+} from "@/api/project/donorcharge";
 import Li_area_select from "@/components/Address";
 import OrgSelecter from "@/views/project/components/orgselect";
 import AnnexUpload from "@/views/project/components/annexupload";
 import ReportName from "@/views/project/components/organizationUser";
 import { getToken } from "@/utils/auth";
 import { formatDate } from "@/utils/index";
+import { forEach } from "lodash";
 
 export default {
   name: "donationdetails",
@@ -2411,11 +2620,82 @@
     AnnexUpload,
     ReportName
   },
+  dicts: [
+    "sys_nation",
+    "sys_occupation",
+    "sys_education",
+    "sys_Organ",
+    "sys_user_sex",
+    "sys_IDType",
+    "sys_BloodType",
+    "sys_0_1",
+    "sys_patientstate",
+    "sys_DonationCategory",
+    "sys_kinship",
+    "sys_Infectious",
+    "sys_bloodtype_rhd",
+    "sys_InfoSources",
+    "sys_OtherCases",
+    "sys_DiseaseType",
+    "sys_SelfWill",
+    "sys_FamilyRelation",
+    "sys_OrganDecision",
+    "sys_CoreAssessConclusion",
+    "sys_BaseAssessConclusion",
+    "sys_EthicalReview",
+    "materials_DBD",
+    "sys_kinshipConfirm"
+  ],
   data() {
     return {
       infoid: 736,
       drawer: false,
-      form: {},
+      form: {
+        donorno: "",
+        reporterno: "",
+        reporterphone: "",
+        name: "",
+        idcardtype: "",
+        idcardno: "",
+        birthday: "",
+        sex: "",
+        age: "",
+        treatmenthospitalno: "",
+        treatmentdeptname: "",
+        inpatientno: "",
+        diagnosisname: "",
+        nation: "",
+        nativeplace: "",
+        nationality: "",
+        occupation: "",
+        education: "",
+        residenceaddress: "",
+        registeraddress: "",
+        bloodtype: "",
+        rhyin: "",
+        diseasetype: [],
+        diseasetypeOther: "",
+        infectious: [],
+        infectiousOther: "",
+        patientstate: [],
+        othercases: [],
+        kinship: [],
+        kinshipOther: "",
+        selfwill: [],
+        majorrelatives: "",
+        familyrelations: "",
+        infosources: [],
+        infosourcesOther: "",
+        acquisitiontissueno: "",
+        infoname: "",
+        infophone: "",
+        redorganno: "",
+        contactperson: "",
+        contacttime: "",
+        reporttime: ""
+      },
+      istb: false,
+      activeName: "",
       tableDatafile: [
         {
           name: "鐜嬪皬铏�",
@@ -2424,25 +2704,27 @@
           type: "success"
         }
       ],
+      dataList: [],
       medicineform: {
         infoid: null
       },
       affirmform: {
         infoid: null,
-        organdecision: []
+        organdecision: [],
+        kinship: []
       },
       organdecision: [],
+      kinship: [],
       ethicform: {
         infoid: null
       },
-
       kinshiplist: ["閰嶅伓", "鐖朵翰", "姣嶄翰", "瀛愬コ", "鍙楁墭浜�"],
       organselection: [
         "鑲濊剰",
         "鍙岃偩鑴�",
         "蹇冭剰",
         "鑲鸿剰",
-        "鑵轰綋",
+        "鑳拌吅",
         "灏忚偁",
         "鍙岀溂缁勭粐",
         "閬椾綋",
@@ -2474,9 +2756,24 @@
       ],
       //鍣ㄥ畼鏁版嵁
       allocateddata: [],
+      allocateddataform: {},
       procureddata: [],
       transplantdata: [],
-
+      sysOrganlistL: [
+        { label: "蹇冭剰", value: "C38" },
+        { label: "鑲濊剰", value: "C22" },
+        { label: "宸﹁偩", value: "C64L" },
+        { label: "鍙宠偩", value: "C64R" },
+        { label: "鍏ㄨ偤", value: "C34" },
+        { label: "宸﹁偤", value: "C34L" },
+        { label: "鍙宠偤", value: "C34R" },
+        { label: "灏忚偁", value: "C17" },
+        { label: "鑳拌吅", value: "C25" },
+        { label: "閬椾綋", value: "C00" },
+        { label: "宸︾溂瑙掕啘", value: "C69L" },
+        { label: "鍙崇溂瑙掕啘", value: "C69R" },
+        { label: "鍏朵粬", value: "C01" }
+      ],
       witnessform: {
         infoid: null
       },
@@ -2494,7 +2791,13 @@
       showTerminationBtn: 0, //缁堟鐘舵�� 0-鏈粓姝� 1-宸茬粓姝�
       // 娴佺▼鏁版嵁锛歞onatebaseinfo[createtime,updatetime]銆乵edicalevaluation銆乺elativesconfirmation銆乨onateflowcharts銆乨onateorgansService銆乨onationwitness銆乨onatecompletioninfo
       Processdata: {},
-
+      donatebaseinfo: {},
+      medicalevaluation: {},
+      relativesconfirmation: {},
+      donateflowcharts: {},
+      donateorgansService: {},
+      donationwitness: {},
+      donatecompletioninfo: {},
       //鐪佸競鍖洪粯璁ゅ�艰缃紝鍙负绌�
       searchAddress: {
         sheng: "",
@@ -2624,7 +2927,7 @@
       //鎶ュ憡浜哄垪琛�
       reporters: [],
       //闄勪欢鍒楄〃
-
+      annextype: "1", //闄勪欢type
       annexfilesList: [], //闄勪欢灞曠ず鍒�
       potentiallist: [], //娼滃湪闄勪欢
       medicinelist: [], //鍖诲闄勪欢
@@ -2641,6 +2944,7 @@
       headers: {
         Authorization: "Bearer " + getToken()
       },
+      ICDtoken: getToken(),
       // 缃戠粶璇锋眰澶�
       Networkheader: null,
       //绁ㄦ嵁鏂囦欢
@@ -2655,11 +2959,15 @@
   },
 
   created() {
+    console.log("鍔犺浇鐨勫瓧鍏告暟鎹�:", this.dict.type);
+    this.Getnetworkheader();
+    this.getdataList();
     this.infoid = this.$route.query.id;
   },
   mounted() {
     // this.id = this.$route.query.id;
     this.Getbasicinformation();
+
     this.listDonateannex();
     //鑾峰彇鎶ュ憡浜哄垪琛細涓撹亴浜哄憳
     listReportname("zzry").then(res => {
@@ -2680,18 +2988,44 @@
     Getbasicinformation() {
       // 宸︿晶娴佺▼鏁版嵁
       getDonatebaseinfoflow(this.infoid).then(res => {
-        console.log("getDonatebaseinfoflow", res.data);
-        this.Processdata = res.data;
+        if (res.code == 200) {
+          this.Processdata = res.data;
+          this.donatebaseinfo = this.Processdata.donatebaseinfo;
+          this.medicalevaluation = this.Processdata.medicalevaluation;
+          this.relativesconfirmation = this.Processdata.relativesconfirmation;
+          this.donateflowcharts = this.Processdata.donateflowcharts;
+          this.donateorgansService = this.Processdata.donateorgansService;
+          this.donationwitness = this.Processdata.donationwitness;
+          this.donatecompletioninfo = this.Processdata.donatecompletioninfo;
+        } else {
+          this.$message.error("渚ц竟鏍忎俊鎭幏鍙栧け璐�");
+        }
       });
 
       // 琛ㄥ崟鏁版嵁
       getDonatebaseinfo(this.infoid).then(response => {
         this.form = response.data;
-        this.showTerminationBtn = response.data.terminationCase;
+        this.form.andAge = `${
+          this.form.age && this.form.age !== 0
+            ? `${this.form.age}${this.form.ageunit}`
+            : ""
+        } ${
+          this.form.age2 && this.form.age2 !== 0
+            ? `${this.form.age2}${this.form.ageunit2}`
+            : ""
+        }`.trim();
+
+        if (response.data.terminationCase) {
+          this.showTerminationBtn = response.data.terminationCase;
+        } else {
+          this.showTerminationBtn = 0;
+        }
+
         this.actives = response.data.workflow;
         this.workflow = response.data.workflow;
         response.data.sex = parseInt(response.data.sex);
         this.form.id = response.data.id;
+
         this.form.diseasetype = this.form.diseasetype.split(",");
         this.form.infectious = this.form.infectious.split(",");
         this.form.selfwill = this.form.selfwill.split(",");
@@ -2699,6 +3033,7 @@
         this.form.infosources = this.form.infosources.split(",");
         this.form.kinship = this.form.kinship.split(",");
         this.form.patientstate = this.form.patientstate.split(",");
+
         this.open = true;
         this.title = "浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃";
         this.registerAddresss.sheng = response.data.registerprovincename;
@@ -2707,6 +3042,7 @@
         this.residenceAddresss.shi = response.data.residencecityname;
         this.residenceAddresss.qu = response.data.residencetownname;
         this.registerAddresss.qu = response.data.registertownname;
+
         // 鑾峰彇浜岀骇琛�
         this.GetAttacheddata();
       });
@@ -2717,11 +3053,8 @@
         infoid: this.infoid
       };
       if (this.actives == 1) {
-        this.annexfilesList = this.medicinelist;
         this.activetele = "鍖诲璇勪及";
-        if (this.medicineform.infoid) {
-          return;
-        }
+
         listMedicalevaluation(searchParam).then(response => {
           if (response.code == 200 && response.rows[0]) {
             this.medicineform = response.rows[0];
@@ -2732,16 +3065,16 @@
           }
         });
       } else if (this.actives == 2) {
-        this.annexfilesList = this.affirmlist;
         this.activetele = "鎹愮尞纭";
-        if (this.affirmform.infoid) {
-          return;
-        }
+
         listRelativesconfirmation(searchParam).then(response => {
           if (response.code == 200 && response.rows[0]) {
             this.affirmform = response.rows[0];
             if (this.affirmform.organdecision) {
               this.organdecision = this.affirmform.organdecision.split(",");
+            }
+            if (this.affirmform.kinship) {
+              this.kinship = this.affirmform.kinship.split(",");
             }
             if (!this.affirmform) {
               this.affirmform = {};
@@ -2752,14 +3085,6 @@
             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)
@@ -2767,11 +3092,8 @@
           }
         });
       } else if (this.actives == 3) {
-        this.annexfilesList = this.ethiclist;
         this.activetele = "浼︾悊瀹℃煡";
-        if (this.ethicform.infoid) {
-          return;
-        }
+
         //listDonateflowchart(searchParam).then(response => {
         listEthicalreviewopinions(searchParam).then(response => {
           if (response.code == 200 && response.rows.length) {
@@ -2780,11 +3102,13 @@
             console.log("浼︾悊瀹℃煡鏁版嵁涓虹┖");
           }
         });
-      } else if (this.actives == 4 && !this.allocateddata[0]) {
+      } else if (this.actives == 4) {
         listDonateorgan(searchParam).then(res => {
           if (res.code == 200) {
             if (res.rows[0]) {
               this.allocateddata = res.rows;
+              console.log("this.allocateddata", this.allocateddata);
+              this.allocateddataform.allocateddata = this.allocateddata;
             }
             this.organList.organallocated = [];
             for (let i = 0; i < res.rows.length; i++) {
@@ -2796,9 +3120,9 @@
             // );
           }
         });
-      } else if (this.actives == 5 && !this.witnessform.infoid) {
+      } else if (this.actives == 5) {
         // 涓嶅瓨鍦ㄦ椂鑾峰彇鍣ㄥ畼淇℃伅
-        if (this.witnessform.infoid) {
+        if (this.procureddata[0] && !this.istb) {
           return;
         }
 
@@ -2806,7 +3130,22 @@
           if (res.code == 200) {
             if (res.rows[0]) {
               this.procureddata = res.rows;
-              this.procureddata.infoid = this.infoid;
+              // this.procureddata.infoid = this.infoid;
+            } else {
+              this.procureddata = this.allocateddata.filter(
+                obj =>
+                  obj.organname !== "宸﹀崐鑲�" &&
+                  obj.organname !== "鍙冲崐鑲�" &&
+                  obj.organname !== "宸﹀鍙�" &&
+                  obj.organname !== "鍙充笁鍙�" &&
+                  obj.organname !== "宸﹁倽" &&
+                  obj.organname !== "鍙宠倽"
+              );
+              this.procureddata = this.procureddata.map(obj => {
+                obj.id = null;
+                return obj;
+              });
+              // this.procureddata.infoid = this.infoid;
             }
             this.organList.organprocured = [];
             for (let i = 0; i < this.procureddata.length; i++) {
@@ -2825,6 +3164,7 @@
             if (response.data) {
               this.witnessform = response.data;
               this.witnessform.infoid = this.infoid;
+              this.istb = false;
             }
           } else {
             // this.$modal.msgError(
@@ -2833,37 +3173,51 @@
           }
         });
       } else if (this.actives == 6) {
-        this.annexfilesList = this.registerlist;
         this.activetele = "瀹屾垚鐧昏";
-        if (this.accomplishform.infoid) {
+        if (this.transplantdata[0] && !this.istb) {
           return;
         }
-        // 涓嶅瓨鍦ㄦ椂鑾峰彇鍣ㄥ畼
-        let accpre = {
-          id: searchParam.infoid
-        };
-        if (!this.organList.organtransplant[0]) {
-          listDonatecomporgan(searchParam).then(res => {
-            if (res.code == 200) {
-              if (res.rows[0]) {
-                this.transplantdata = res.rows;
-                this.transplantdata.infoid = this.infoid;
-              }
-              for (let i = 0; i < this.transplantdata.length; i++) {
-                this.organList.organtransplant.push(
-                  this.transplantdata[i].organno
-                );
-              }
+        console.log("瀹屾垚鐧昏鍔犺浇鏁版嵁...");
+
+        listDonatecomporgan(searchParam).then(res => {
+          if (res.code == 200) {
+            console.log("listDonatecomporgan 鏁版嵁锛�", res.rows);
+
+            if (res.rows[0]) {
+              this.transplantdata = res.rows;
+              // this.transplantdata.infoid = this.infoid;
             } else {
-              // this.$modal.msgError(
-              //   "鍣ㄥ畼鍒楄〃鑾峰彇澶辫触锛�" + JSON.stringify(resall)
-              // );
+              this.transplantdata = this.allocateddata;
+              this.transplantdata = this.transplantdata.map(obj => {
+                obj.id = null;
+                if (
+                  obj.organname == "宸︾溂瑙掕啘" ||
+                  obj.organname == "鍙崇溂瑙掕啘"
+                ) {
+                  obj.transplantstate = 2;
+                }
+                return obj;
+              });
+
+              this.transplantdata.infoid = this.infoid;
             }
-          });
-        }
+            for (let i = 0; i < this.transplantdata.length; i++) {
+              this.organList.organtransplant.push(
+                this.transplantdata[i].organno
+              );
+            }
+          } else {
+            // this.$modal.msgError(
+            //   "鍣ㄥ畼鍒楄〃鑾峰彇澶辫触锛�" + JSON.stringify(resall)
+            // );
+          }
+        });
+
         // 鑾峰彇瀹屾垚鐧昏淇℃伅
-        listnewDonatecompletioninfo(accpre).then(response => {
+        listDonatecompletioninfo(searchParam).then(response => {
           if (response.code == 200 && response.rows.length) {
+            console.log("listDonatecompletioninfo 鏁版嵁锛�", response.rows[0]);
+
             this.accomplishform = response.rows[0];
             this.accomplishform.infoid = this.infoid;
           } else {
@@ -2871,8 +3225,23 @@
           }
         });
       } else if (this.actives == 0) {
-        this.annexfilesList = this.potentiallist;
         this.activetele = "娼滃湪鎹愮尞";
+      }
+      if (!this.allocateddata[0]) {
+        listDonateorgan(searchParam).then(res => {
+          if (res.code == 200) {
+            console.log("listDonateorgan 鏁版嵁锛�", res.rows);
+            if (res.rows[0]) {
+              this.allocateddata = res.rows;
+              this.allocateddataform.allocateddata = this.allocateddata;
+            }
+            this.organList.organallocated = [];
+            for (let i = 0; i < res.rows.length; i++) {
+              this.organList.organallocated.push(this.allocateddata[i].organno);
+            }
+          } else {
+          }
+        });
       }
     },
     /** 淇濆瓨涓昏〃鎸夐挳 */
@@ -2884,7 +3253,9 @@
           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(",");
@@ -2943,20 +3314,19 @@
             updateDonatebaseinfo(this.form).then(response => {
               this.$modal.msgSuccess("淇濆瓨鎴愬姛");
               Modifydonationattachment(this.donatelist).then(res => {
-                console.log(res);
+                this.listDonateannex();
               });
               this.Getbasicinformation();
               // this.Processvalidation();
               this.open = false;
             });
           } else {
-            this.form.workflow = 1;
-            this.form.recordstate = 0;
+            this.form.workflow = 0;
             addDonatebaseinfo(this.form).then(response => {
               if (response.code == 200) {
                 this.$modal.msgSuccess("鏂板鎴愬姛");
                 Modifydonationattachment(this.donatelist).then(res => {
-                  console.log(res);
+                  this.listDonateannex();
                 });
                 this.Getbasicinformation();
                 // this.Processvalidation();
@@ -2976,13 +3346,16 @@
         this.medicineform.infoid = this.infoid;
         this.$refs["medicineform"].validate(valid => {
           if (valid) {
+            this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
             if (this.medicineform.id != null) {
               updateMedicalevaluation(this.medicineform).then(response => {
                 this.$modal.msgSuccess("鍖诲璇勪及淇℃伅淇敼鎴愬姛");
+                this.$modal.closeLoading();
               });
             } else {
               addMedicalevaluation(this.medicineform).then(response => {
                 this.$modal.msgSuccess("鍖诲璇勪及淇℃伅鏂板鎴愬姛");
+                this.$modal.closeLoading();
               });
             }
             this.Processvalidation();
@@ -2991,18 +3364,25 @@
       } else if (this.actives == 2) {
         this.affirmform.infoid = this.infoid;
         this.affirmform.organdecision = this.organdecision.join(",");
+        this.affirmform.kinship = this.kinship.join(",");
         this.$refs["affirmform"].validate(valid => {
           if (valid) {
+            this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
             if (this.affirmform.id != null) {
               this.affirmform.residenceprovincename = this.defultAddresss.sheng;
               this.affirmform.residencecityname = this.defultAddresss.shi;
               this.affirmform.residencetownname = this.defultAddresss.qu;
               updateRelativesconfirmation(this.affirmform).then(response => {
                 this.$modal.msgSuccess("鎹愮尞纭淇℃伅淇敼鎴愬姛");
+                this.$modal.closeLoading();
               });
             } else {
+              this.affirmform.residenceprovincename = this.defultAddresss.sheng;
+              this.affirmform.residencecityname = this.defultAddresss.shi;
+              this.affirmform.residencetownname = this.defultAddresss.qu;
               addRelativesconfirmation(this.affirmform).then(response => {
                 this.$modal.msgSuccess("鎹愮尞纭淇℃伅鏂板鎴愬姛");
+                this.$modal.closeLoading();
               });
             }
             this.Processvalidation();
@@ -3012,46 +3392,43 @@
         this.ethicform.infoid = this.infoid;
         this.$refs["ethicform"].validate(valid => {
           if (valid) {
+            this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
             if (this.ethicform.id != null) {
               // updateDonateflowchart(this.ethicform).then(response => {
               updateEthicalreviewopinions(this.ethicform).then(res => {
                 this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅淇敼鎴愬姛");
+                this.$modal.closeLoading();
               });
             } else {
               //addDonateflowchart(this.ethicform).then(response => {
               addEthicalreviewopinions(this.ethicform).then(res => {
                 this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅鏂板鎴愬姛");
+                this.$modal.closeLoading();
               });
             }
             this.Processvalidation();
           }
         });
       } else if (this.actives == 4) {
-        this.procureddata.infoid = this.infoid;
-        this.$refs["allocateddata"].validate(valid => {
-          /**          
-          let rows = [];
-          this.allocateddata.map(item => {
-            if (item.id) {
-              item.applicanttime = formatDate(item.applicanttime);
-              updateDonateorgan(item).then(response => { });
-            } else {
-              item.infoid=this.infoid;
-              rows.push(item);
-            }
-          });
-          if (rows.length) {
-            addOrganallocation(rows).then(res => {
-              this.$modal.msgSuccess("鍣ㄥ畼鎹愮尞淇℃伅鏂板鎴愬姛");
-            });
-          }
-           */
+        // this.procureddata.infoid = this.infoid;
+        this.$refs["allocateddataform"].validate(valid => {
+          this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
+
           this.allocateddata.map(item => {
             item.applicanttime = formatDate(item.applicanttime);
           });
+          this.allocateddata.forEach(item => {
+            const objs = this.dataList.find(
+              obj => obj.organizationid == item.transplanthospitalno
+            );
+            if (objs) {
+              item.transplanthospitalname = objs.organizationname;
+            }
+          });
           saveDonateorgan(this.allocateddata).then(res => {
-            if (res == 200) {
+            if (res.code == 200) {
               this.$modal.msgSuccess("鍣ㄥ畼鎹愮尞鍒嗛厤淇℃伅淇濆瓨鎴愬姛锛�");
+              this.$modal.closeLoading();
             }
           });
           this.Processvalidation();
@@ -3067,6 +3444,7 @@
               coordinatedusernameIndex
             ].reportName;
           }
+
           //鍗忚皟鍛�2
           let coordinatedusernametIndex = this.coordinatorlist1.findIndex(
             item => this.witnessform.coordinateduseridt == item.reportNo
@@ -3078,53 +3456,115 @@
           }
 
           if (valid) {
+            this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
+
             if (this.witnessform.id != null) {
-              console.log(456);
               updateDonationwitness(this.witnessform).then(response => {
                 this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅淇敼鎴愬姛");
+                this.form.donationcategory = this.witnessform.donationcategory;
+                this.Processvalidation();
+
+                this.procureddata.forEach(item => {
+                  const objs = this.dataList.find(
+                    obj => obj.organizationid == item.gainhospitalno
+                  );
+                  if (objs) {
+                    item.gainhospitalname = objs.organizationname;
+                  }
+                });
+                //淇濆瓨鍣ㄥ畼鑾峰彇琛ㄦ暟鎹�
+                saveDonationwitnessorgan(this.procureddata).then(res => {
+                  if (res == 200) {
+                    this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
+                  }
+                  this.$modal.closeLoading();
+                });
               });
             } else {
-              console.log(123);
               addDonationwitness(this.witnessform).then(response => {
-                this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
+                if (response.code === 200) {
+                  this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
+                  this.form.donationcategory = this.witnessform.donationcategory;
+                  let data = JSON.parse(JSON.stringify(this.form));
+                  data.diseasetype = "";
+                  data.infectious = data.infectious.join(",");
+                  data.selfwill = data.selfwill.join(",");
+                  data.othercases = data.othercases.join(",");
+                  data.infosources = data.infosources.join(",");
+                  data.kinship = data.kinship.join(",");
+                  data.patientstate = data.patientstate.join(",");
+                  // 鑾峰彇鎹愮尞缂栧彿
+                  getDonationNumber(data).then(res => {
+                    this.form.donorno = res.msg;
+                    this.istb = true;
+                    this.Processvalidation();
+                  });
+                  //淇濆瓨鍣ㄥ畼鑾峰彇琛ㄦ暟鎹�
+                  saveDonationwitnessorgan(this.procureddata).then(res => {
+                    if (res == 200) {
+                      this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
+                    }
+                    this.$modal.closeLoading();
+                  });
+                } else {
+                  this.$modal.msgError("鑾峰彇瑙佽瘉淇℃伅鏂板澶辫触");
+                  this.$modal.closeLoading();
+                }
               });
             }
-
-            //淇濆瓨鍣ㄥ畼鑾峰彇琛ㄦ暟鎹�
-            this.procureddata.infoid = this.infoid;
-            console.log("procureddata", this.procureddata);
-            saveDonationwitnessorgan(this.procureddata).then(res => {
-              if (res == 200) {
-                this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
-              }
-            });
-
-            this.form.donationcategory = this.witnessform.donationcategory;
-            this.Processvalidation();
           }
         });
       } else if (this.actives == 6) {
         this.accomplishform.infoid = this.infoid;
         this.$refs["accomplishform"].validate(valid => {
           if (valid) {
-            // 淇濆瓨鎹愮尞鍣ㄥ畼绉绘淇℃伅
-            this.transplantdata.infoid = this.infoid;
-            console.log("transplantdata", this.transplantdata);
-            saveDonatecomporgan(this.transplantdata).then(res => {
-              if (res == 200) {
-                this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鑾峰彇淇℃伅淇濆瓨鎴愬姛锛�");
+            this.$modal.loading("姝ｅ湪鎻愪氦锛岃绋嶅�欙紒");
+
+            this.transplantdata.forEach(item => {
+              item.donorname = this.form.name;
+            });
+            this.transplantdata.forEach(item => {
+              const objs = this.dataList.find(
+                obj => obj.organizationid == item.hospitalno
+              );
+              if (objs) {
+                item.hospitalname = objs.organizationname;
               }
             });
-
             // 淇濆瓨纭淇℃伅
-            if (this.accomplishform.dcid) {
-              console.log(this.accomplishform);
+            if (this.accomplishform.id) {
               updateDonatecompletioninfo(this.accomplishform).then(response => {
                 this.$modal.msgSuccess("瀹屾垚鐧昏淇℃伅淇敼鎴愬姛");
+                saveDonatecomporgan(this.transplantdata).then(res => {
+                  if (res == 200) {
+                    this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鐧昏淇℃伅淇濆瓨鎴愬姛锛�");
+                  } else {
+                    this.$modal.msgSuccess(res.msg);
+                  }
+                  this.$modal.closeLoading();
+                });
               });
             } else {
               addDonatecompletioninfo(this.accomplishform).then(response => {
                 this.$modal.msgSuccess("瀹屾垚鐧昏鎴愬姛");
+                saveDonatecomporgan(this.transplantdata).then(res => {
+                  if (res.code == 200) {
+                    this.$modal.msgSuccess("鎹愮尞鍣ㄥ畼鐧昏淇℃伅淇濆瓨鎴愬姛锛�");
+                  } else {
+                    this.$modal.msgError(res.msg);
+                  }
+                  this.$modal.closeLoading();
+                });
+                this.istb = true;
+                // this.$modal
+                //   .confirm("妗堜緥宸插畬鎴愭槸鍚﹁烦杞渚嬭垂鐢ㄩ〉闈㈣繘琛岃垂鐢ㄥ崟淇濆瓨锛�")
+                //   .then(() => {
+                //     this.$router.push({
+                //       path: "/finance/donorchargedetail/",
+                //       query: { gxinzt: true, operation: "add", data: this.form, }
+                //     });
+                //   })
+                //   .catch(() => {});
               });
             }
 
@@ -3136,8 +3576,7 @@
     // 鍒囨崲tab
     on_click(e) {
       // if (e != "" || e != null) {
-      console.log(this.form.workflow);
-      console.log(e);
+
       let asdx = this.form.workflow + 1;
       if (asdx >= e) {
         this.actives = e;
@@ -3146,6 +3585,10 @@
         this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
       }
       // }
+    },
+    // 鑾峰彇閮ㄩ棬鏁版嵁缂撳瓨
+    getdataList() {
+      this.$store.dispatch("getdataList").then(() => {});
     },
     // 鍣ㄥ畼鍒嗛厤鏍忕洰鎺у埗
     changeorganState(value) {
@@ -3301,7 +3744,7 @@
         if (organIndex != -1) {
           if (this.transplantdata[organIndex].id > 0) {
             this.$confirm(
-              "鍒犻櫎鍣ㄥ畼鏁版嵁鍚庡皢涓嶆硶鎭㈠锛屾偍纭鍒犻櫎璇ユ潯璁板綍鍚楋紵",
+              "鍒犻櫎鍣ㄥ畼鏁版嵁鍚庡皢鏃犳硶鎭㈠锛屾偍纭鍒犻櫎璇ユ潯璁板綍鍚楋紵",
               "鎻愮ず",
               {
                 confirmButtonText: "纭畾",
@@ -3318,6 +3761,12 @@
                     this.$modal.msgSuccess(
                       "鍒犻櫎鎴愬姛锛屽鏋滈渶瑕佸鍔犺鍣ㄥ畼锛岃閲嶆柊閫夋嫨鍣ㄥ畼锛�"
                     );
+                    listDonorchargeorgan({
+                      infoid: this.transplantdata[organIndex].infoid,
+                      organno: this.transplantdata[organIndex].organno
+                    }).then(res => {
+                      delDonorchargeorgan(res.rows[0].id);
+                    });
                   }
                 );
               })
@@ -3347,7 +3796,8 @@
               id: null,
               infoid: this.infoid,
               donorno: this.form.donorno,
-              organstate: 1
+              organstate: 1,
+              transplantstate: 1
             });
           }
         } else {
@@ -3358,7 +3808,6 @@
 
     // 鍓嶈繘姝ラ
     makeastepforward() {
-      console.log(this.actives);
       if (this.actives <= 6) {
         this.actives++;
         this.GetAttacheddata();
@@ -3368,31 +3817,62 @@
     },
     // 鏇存敼杩涚▼鏁堥獙
     Processvalidation() {
-      console.log(this.form.workflow);
-      console.log(this.actives);
-      if (this.form.workflow + 1 == this.actives || this.actives == 6) {
-        if (this.form.workflow <= 6) {
+      if (this.form.workflow + 1 == this.actives) {
+        if (this.form.workflow < 6) {
           this.form.workflow++;
         } else {
         }
         this.submitForm();
         // this.GetAttacheddata();
       } else if (this.form.workflow > this.actives) {
-        // this.submitForm();
-        Modifydonationattachment(this.donatelist).then(res => {
-          console.log(res);
-        });
-        this.listDonateannex();
-        this.GetAttacheddata();
+        this.submitForm();
+        // Modifydonationattachment(this.donatelist).then(res => {});
+        // this.GetAttacheddata();
       } else {
         this.submitForm();
         // this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
         return;
       }
-      console.log(this.form.workflow);
     },
-    // 涓婃姤瀹℃牳
-    Reportforreview() {},
+    // 鎻愪氦褰掓。
+    Reportforreview() {
+      if (this.form.workflow == 8) {
+        this.form.workflow = 7;
+        this.submitForm();
+        this.$router.go(-1);
+        this.$message({
+          type: "success",
+          message: "鎾ら攢鎴愬姛!"
+        });
+      } else {
+        this.$confirm("鍗冲皢杩涜妗堜緥褰掓。, 纭鎵�鏈夋暟鎹凡淇濆瓨?", "鎻愮ず", {
+          confirmButtonText: "纭畾",
+          cancelButtonText: "鍙栨秷",
+          type: "warning"
+        })
+          .then(() => {
+            fileCase({ infoId: this.infoid }).then(res => {
+              if (res.code == 500) {
+                this.$message.error(res.msg);
+              } else {
+                this.form.workflow = 8;
+                this.submitForm();
+                this.$message({
+                  type: "success",
+                  message: "褰掓。鎴愬姛!"
+                });
+                this.$router.go(-1);
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "宸插彇娑堝綊妗�"
+            });
+          });
+      }
+    },
     // 缁堟妗堜緥
     Terminationcase() {
       this.form.terminationCase == 1
@@ -3403,6 +3883,13 @@
     // 杩斿洖涓婁竴椤�
     cancel() {},
     // ----------------------------------鏂囦欢
+    // 鐐瑰嚮鍒嗙被
+    selecttab(row) {
+      console.log(row.label);
+      this.annextype = row.name;
+
+      this.Filepopup();
+    },
     // 鑾峰彇璇锋眰澶�
     Getnetworkheader() {
       let string = window.location.href;
@@ -3418,49 +3905,19 @@
     // 鑾峰彇闄勪欢鏁版嵁骞跺垎绫讳簩绾у垪
     listDonateannex() {
       let parmi = {};
+      console.log(222);
+
       parmi.infoid = this.infoid.toString();
       listDonateannex(parmi).then(res => {
+        console.log(333);
         this.donatelist = res.rows;
-        const groupedArr = this.donatelist.reduce(
-          (accumulator, currentValue) => {
-            const key = currentValue.annexfilestype;
-            if (key == 0) {
-              this.potentiallist.push(currentValue);
-            } else if (key == 1) {
-              this.medicinelist.push(currentValue);
-            } else if (key == 2) {
-              this.affirmlist.push(currentValue);
-            } else if (key == 3) {
-              this.ethiclist.push(currentValue);
-            } else if (key == 6) {
-              this.registerlist.push(currentValue);
-            }
-            return accumulator;
-          },
-          {}
-        );
-        console.log(groupedArr);
       });
     },
     // 闄勪欢淇敼鏁版嵁杞瓨灏佽
     Newconversion(arr, delvalue, addvalue) {
-      // 鍜屽悇閮ㄤ繚瀛樺悓姝�
-      if (this.actives == 0) {
-        this.potentiallist = arr;
-      } else if (this.actives == 1) {
-        this.medicinelist = arr;
-      } else if (this.actives == 2) {
-        this.affirmlist = arr;
-      } else if (this.actives == 3) {
-        this.ethiclist = arr;
-      } else if (this.actives == 6) {
-        this.registerlist = arr;
-      }
       // 鍒犻櫎鏃朵慨鏀逛富鍒梔elFlag
-      console.log(delvalue);
       const index = this.donatelist.indexOf(delvalue);
-      console.log(index);
-      if (index !== -1) {
+      if (index != -1) {
         if (delvalue.id) {
           this.donatelist[index].delFlag = 1;
           console.log("淇敼鑰佹暟鎹悗", this.donatelist);
@@ -3476,6 +3933,7 @@
         this.donatelist.push(addvalue);
         console.log("鏂板鍚�", this.donatelist);
       }
+      this.pdftitle = "鍏�" + this.donatelist.length + "椤�";
     },
     //鏂囦欢涓婁紶
     handleUploadError() {},
@@ -3486,59 +3944,106 @@
     // 涓婁紶鎴愬姛
     uploadSccess(response, file, fileList) {
       this.rbDetails;
+      const config = {
+        headers: { Authorization: "Bearer " + this.ICDtoken }
+      };
+      const pdfimg = this.Networkheader + "/prod-api" + response.fileName;
+      console.log(this.Networkheader);
       //鑾峰彇绁ㄦ嵁淇℃伅浣嶇疆
       if (response.code == 200) {
-        // this.form.filename = file.raw.name;
         this.previewpdf = true;
+
+        fetch(pdfimg, config)
+          .then(response => response.blob())
+          .then(blob => {
+            // 灏嗚幏鍙栫殑鏁版嵁娴佽浆鎹负URL
+            this.pdfimg = URL.createObjectURL(blob);
+            this.pdfimgsrcList.push(URL.createObjectURL(blob));
+            let addvalue = {
+              annexname: file.name,
+              annexurl: URL.createObjectURL(blob),
+              delFlag: 0,
+              infoid: this.infoid,
+              annexfilestype: this.annextype
+            };
+            this.fileListto.push(addvalue);
+          })
+          .catch(error => {
+            console.error("Error loading image", error);
+            return;
+          });
+
         this.$modal.msgSuccess(response.msg);
-        let addvalue = {
+
+        console.log(this.fileListto, "鏂板鍚�");
+        if (!this.annexfilesList) {
+          this.annexfilesList = [];
+        }
+        let addvalues = {
           annexname: file.name,
           annexurl: response.fileName,
           delFlag: 0,
           infoid: this.infoid,
-          annexfilestype: this.actives
+          annexfilestype: this.annextype
         };
-        this.fileListto.push(addvalue);
-        this.Newconversion(this.fileListto, "", addvalue);
-        this.pdfimgsrcList.push(
-          this.Networkheader + "/prod-api" + response.fileName
-        );
-        console.log(this.pdfimgsrcList);
-        this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
-        this.pdfimg = this.Networkheader + "/prod-api" + response.fileName;
-        this.annexfilesList = this.fileListto;
+        this.annexfilesList.push(addvalues);
+        this.Newconversion(this.annexfilesList, "", addvalues);
       } else {
         console.log(response.msg);
       }
     },
-    // 鐐瑰嚮绁ㄦ嵁
-    Filepopup(index, rows, row) {
+    // 鏂囦欢寮圭獥瑙﹀彂
+    Filepopup() {
+      this.annexfilesList = this.donatelist.filter(
+        obj => obj.annexfilestype == this.annextype
+      );
+
+      const config = {
+        headers: { Authorization: "Bearer " + this.ICDtoken }
+      };
+
+      this.fileListto = [];
       this.pdfimgsrcList = [];
+      this.pdfimg = "";
       this.pdfVisible = true;
       if (this.annexfilesList.length) {
-        this.previewpdf = true;
-        this.fileListto = this.annexfilesList;
-        console.log(this.fileListto);
-        this.pdfimg =
-          this.Networkheader + "/prod-api" + this.fileListto[0].annexurl;
-        this.fileListto.forEach(item => {
-          this.pdfimgsrcList.push(
-            this.Networkheader + "/prod-api" + item.annexurl
-          );
+        this.annexfilesList.forEach((value, indexson) => {
+          const pdfimg = this.Networkheader + "/prod-api" + value.annexurl;
+          fetch(pdfimg, config)
+            .then(response => response.blob())
+            .then(blob => {
+              // 灏嗚幏鍙栫殑鏁版嵁娴佽浆鎹负URL
+              this.fileListto.push({
+                annexname: value.annexname,
+                annexurl: URL.createObjectURL(blob),
+                delFlag: 0,
+                infoid: this.infoid,
+                annexfilestype: value.annexfilestype
+              });
+              if (this.fileListto.length == 1) {
+                this.pdfimg = URL.createObjectURL(blob);
+              }
+              this.pdfimgsrcList.push(URL.createObjectURL(blob));
+            })
+            .catch(error => {
+              console.error("Error loading image", error);
+              return;
+            });
         });
+        this.previewpdf = true;
       } else {
         this.fileListto = [];
         this.pdfimg = "";
         this.pdftitle = "";
       }
-      this.pdftitle = "鍏�" + this.pdfimgsrcList.length + "椤�";
+      this.pdftitle = "鍏�" + this.donatelist.length + "椤�";
     },
     // 鐐瑰嚮宸蹭笂浼犳枃浠�
     downFile(item) {
       console.log(item, "鐐瑰嚮鏂囦欢鎷縤tem");
       this.pdftitle =
-        "鍏�" + this.pdfimgsrcList.length + "椤癸紝褰撳墠閫変腑" + item.name;
-      let name = item.name.split(".");
+        "鍏�" + this.donatelist.length + "椤癸紝褰撳墠閫変腑" + item.annexname;
+      let name = item.annexname.split(".");
       if (name[1] == "pdf") {
         this.$modal.msgWarning("褰撳墠鏂囦欢鏆備笉鏀寔棰勮");
         this.previewpdf = false;
@@ -3546,10 +4051,9 @@
       } else if (name[1] == "jpg" || "png") {
         this.previewpdf = true;
         if (item.annexurl) {
-          this.pdfimg = this.Networkheader + "/prod-api" + item.annexurl;
+          this.pdfimg = item.annexurl;
         } else {
-          this.pdfimg =
-            this.Networkheader + "/prod-api" + item.response.annexurl;
+          this.pdfimg = "";
         }
       } else {
         this.hintitle = "褰撳墠鏂囦欢鏆備笉鏀寔棰勮";
@@ -3563,21 +4067,18 @@
     },
     // 鐐瑰嚮鍒犻櫎
     deletedowfile(row) {
-      const indexlist = this.getIndexInArray(
-        this.pdfimgsrcList,
-        this.Networkheader + "/prod-api" + row.annexurl
-      );
+      let indexvalue = "";
+      const indexlist = this.getIndexInArray(this.pdfimgsrcList, row.annexurl);
       this.pdfimgsrcList.splice(indexlist, 1);
       const index = this.getIndexInArray(this.fileListto, row);
-      this.Newconversion(this.fileListto, this.fileListto[index], "");
       this.fileListto.splice(index, 1);
-      console.log(index);
-    },
-    // 鐐瑰嚮涓婄Щ
-    moveupdowfile(row) {
-      const index = this.getIndexInArray(this.fileListto, row);
-      const item = this.fileListto.splice(index, 1)[0]; // 绉婚櫎鎸囧畾绱㈠紩澶勭殑鍏冪礌锛屽苟淇濆瓨鍒癷tem鍙橀噺涓�
-      this.fileListto.splice(index - 1, 0, item); // 灏唅tem鎻掑叆鍒扮储寮曚綅缃殑鍓嶄竴浣�
+
+      indexvalue = this.annexfilesList.find((item, index) => {
+        return item.annexname == row.annexname;
+      });
+      console.log(indexvalue, "鍒犻櫎绱㈠紩");
+      this.annexfilesList.splice(indexvalue, 1);
+      this.Newconversion(this.annexfilesList, indexvalue, "");
     },
 
     clearFilter() {
@@ -3639,32 +4140,7 @@
       row.caseno = null;
       row.applicanttime = null;
     }
-  },
-
-  dicts: [
-    "sys_nation",
-    "sys_occupation",
-    "sys_education",
-    "sys_Organ",
-    "sys_user_sex",
-    "sys_IDType",
-    "sys_BloodType",
-    "sys_0_1",
-    "sys_patientstate",
-    "sys_DonationCategory",
-    "sys_Kinship",
-    "sys_Infectious",
-    "sys_bloodtype_rhd",
-    "sys_InfoSources",
-    "sys_OtherCases",
-    "sys_DiseaseType",
-    "sys_SelfWill",
-    "sys_FamilyRelation",
-    "sys_OrganDecision",
-    "sys_CoreAssessConclusion",
-    "sys_BaseAssessConclusion",
-    "sys_EthicalReview"
-  ]
+  }
 };
 </script>
 
@@ -3715,7 +4191,6 @@
 
   .box-pdf {
     width: 400px;
-    padding-top: 20px;
     margin-right: 30px;
     border: 1px solid #dcdfe6;
     -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
@@ -3788,4 +4263,7 @@
   position: relative;
   width: 80%;
 }
+:v-deep .el-tabs__nav-scroll {
+  overflow: auto;
+}
 </style>

--
Gitblit v1.9.3