From ead85633109bcb3cc8d8b3c6804c280dd6ee1e5d Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期二, 06 一月 2026 11:38:51 +0800
Subject: [PATCH] 省人民维护

---
 src/views/project/donationdetails/index.vue | 1341 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 896 insertions(+), 445 deletions(-)

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 8bcfd34..7c004c2 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -1,9 +1,20 @@
 <template>
   <div class="particularsdiv">
-    <div class="left-course">
+    <div class="left-course" :class="{ 'left-collapsed': isLeftCollapsed }">
       <div class="postfilx">
-        <div class="title">宸ヤ綔杩涚▼</div>
-        <div>
+        <div class="title">
+          宸ヤ綔杩涚▼
+          <el-button
+            class="collapse-btn"
+            @click="toggleLeftCollapse"
+            :icon="
+              isLeftCollapsed ? 'el-icon-arrow-right' : 'el-icon-arrow-left'
+            "
+            size="mini"
+          >
+          </el-button>
+        </div>
+        <div v-show="!isLeftCollapsed">
           <el-steps direction="vertical" :active="workflow">
             <el-step title="娼滃湪鎹愮尞" icon="el-icon-user">
               <template slot="description" v-if="donatebaseinfo.createtime">
@@ -155,7 +166,7 @@
       </div>
     </div>
     <!-- 鍙充晶鏁版嵁 -->
-    <div style="background: #fff; width: 80%;">
+    <div class="right-content" :class="{ 'right-expanded': isLeftCollapsed }">
       <!-- 椤堕儴鏁版嵁 -->
       <div class="boxdiv">
         <div class="top-text">鎹愮尞妗堜緥淇℃伅</div>
@@ -184,6 +195,7 @@
                     ref="getReportname"
                     v-model="form.reporterno"
                     placeholder="璇烽�夋嫨"
+                    filterable
                   >
                     <el-option
                       v-for="item in reporters"
@@ -204,14 +216,14 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime">
+                <el-form-item label="鎶ュ憡鏃ユ湡" align="left" prop="reporttime">
                   <el-date-picker
                     clearable
                     size="small"
                     v-model="form.reporttime"
                     type="datetime"
                     value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="閫夋嫨鎶ュ憡鏃堕棿"
+                    placeholder="閫夋嫨鎶ュ憡鏃ユ湡"
                   >
                   </el-date-picker>
                 </el-form-item>
@@ -278,10 +290,14 @@
               </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">
+              <el-col :span="6" v-if="form.treatmenthospitalno">
                 <el-form-item
                   align="left"
                   label="鍖荤枟鏈烘瀯"
@@ -294,7 +310,7 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="6" v-if="form.treatmentdeptname">
                 <el-form-item label="绉戝" prop="treatmentdeptno">
                   <el-input
                     v-model="form.treatmentdeptname"
@@ -363,21 +379,53 @@
         >
           <el-row>
             <el-col :span="8">
-              <el-form-item label="浣忛櫌鍙�" prop="inpatientno">
-                <el-input v-model="form.inpatientno" placeholder="浣忛櫌鍙�" />
+              <el-form-item
+                label="鎵�鍦ㄥ尰鐤楁満鏋�"
+                label-width="120px"
+                prop="currentMedicalInstitution"
+              >
+                <el-input
+                  v-model="form.currentMedicalInstitution"
+                  placeholder="璇疯緭鍏�"
+                />
               </el-form-item>
             </el-col>
-            <el-col :span="16">
-              <el-form-item label="鐤剧梾璇婃柇" prop="diagnosisname">
-                <el-input
-                  v-model="form.diagnosisname"
-                  placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�"
-                />
+            <el-col :span="10">
+              <el-form-item
+                label-width="150px"
+                label="鎵�鍦ㄥ尰鐤楁満鏋勭瀹�"
+                prop="currentDept"
+              >
+                <el-input v-model="form.currentDept" placeholder="璇疯緭鍏�" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
+            <el-col :span="8">
+              <el-form-item
+                label="棣栨鍖荤枟鏈烘瀯"
+                label-width="120px"
+                prop="firstMedicalInstitution"
+              >
+                <el-input
+                  v-model="form.firstMedicalInstitution"
+                  placeholder="璇疯緭鍏�"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="10">
+              <el-form-item
+                label-width="150px"
+                label="棣栨鍖荤枟鏈烘瀯绉戝"
+                prop="firstDept"
+              >
+                <el-input v-model="form.firstDept" placeholder="璇疯緭鍏�" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <!-- <el-col :span="6">
               <el-form-item label="姘戞棌" prop="nation">
                 <el-select v-model="form.nation" placeholder="璇烽�夋嫨姘戞棌">
                   <el-option
@@ -393,7 +441,7 @@
               <el-form-item label="绫嶈疮" prop="nativeplace">
                 <el-input v-model="form.nativeplace" placeholder="璇疯緭鍏ュ浗绫�" />
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <el-col :span="6">
               <el-form-item label="鍥界睄" prop="nationality">
                 <el-input v-model="form.nationality" placeholder="璇疯緭鍏ュ浗绫�" />
@@ -401,58 +449,8 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="6">
-              <el-form-item label="鑱屼笟" prop="occupation">
-                <el-select v-model="form.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-col :span="6">
-              <el-form-item label="瀛﹀巻" prop="education">
-                <el-select v-model="form.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-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>
-          <el-row>
             <el-col :span="12">
-              <el-form-item label="浣忓潃" prop="residenceaddress">
+              <el-form-item label="浣忓潃(涓庤韩浠借瘉涓�鑷�)" prop="residenceaddress">
                 <div>
                   <li_area_select
                     ref="residenceSelect"
@@ -489,8 +487,14 @@
               />
             </el-col>
           </el-row>
+
           <el-row>
-            <el-col :span="12">
+            <el-col :span="4">
+              <el-form-item label="浣忛櫌鍙�" prop="inpatientno">
+                <el-input v-model="form.inpatientno" placeholder="浣忛櫌鍙�" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="9">
               <el-form-item align="left" label="琛�鍨�" prop="bloodtype">
                 <el-radio-group v-model="form.bloodtype">
                   <el-radio
@@ -502,7 +506,7 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="12" :pull="1">
+            <el-col :span="9" :pull="1">
               <el-form-item label="Rh(D)" align="left" prop="rhyin">
                 <el-radio-group v-model="form.rhyin">
                   <el-radio
@@ -516,7 +520,45 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-form-item label="鐤剧梾绫诲瀷" align="left">
+            <el-col :span="16">
+              <el-form-item label="鐤剧梾璇婃柇" prop="diagnosisname">
+                <el-input
+                  v-model="form.diagnosisname"
+                  placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <!-- <el-row>
+            <el-col :span="6">
+              <el-form-item label="鑱屼笟" prop="occupation">
+                <el-select v-model="form.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-col :span="6">
+              <el-form-item label="瀛﹀巻" prop="education">
+                <el-select v-model="form.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-row> -->
+
+          <el-row>
+            <el-form-item label="鐤剧梾绫诲瀷" align="left" prop="diseasetype">
               <el-checkbox-group v-model="form.diseasetype">
                 <el-checkbox
                   v-for="dict in dict.type.sys_DiseaseType || []"
@@ -536,7 +578,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item align="left" label="浼犳煋鐥�">
+              <el-form-item align="left" label="浼犳煋鐥�" prop="infectious">
                 <el-checkbox-group v-model="form.infectious">
                   <el-checkbox
                     v-for="dict in dict.type.sys_Infectious || []"
@@ -559,7 +601,7 @@
           </el-row>
           <el-row>
             <el-col :span="9">
-              <el-form-item align="left" label="鐥呬汉鐘跺喌">
+              <el-form-item align="left" label="鐥呬汉鐘跺喌" prop="patientstate">
                 <el-checkbox-group v-model="form.patientstate">
                   <el-checkbox
                     v-for="dict in dict.type.sys_patientstate || []"
@@ -571,11 +613,28 @@
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
-            <el-col :span="15" align="left">
-              <el-form-item label="鍏朵粬鎯呭喌">
+          </el-row>
+          <el-row>
+            <el-col :span="15">
+              <el-form-item label="鍏朵粬鎯呭喌" prop="othercases">
                 <el-checkbox-group v-model="form.othercases">
                   <el-checkbox
                     v-for="dict in dict.type.sys_OtherCases || []"
+                    :key="dict.value"
+                    :label="dict.value"
+                  >
+                    {{ dict.label }}
+                  </el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item align="left" label="鏈汉鎰忔効 " prop="selfwill">
+                <el-checkbox-group v-model="form.selfwill">
+                  <el-checkbox
+                    v-for="dict in dict.type.sys_SelfWill || []"
                     :key="dict.value"
                     :label="dict.value"
                   >
@@ -617,21 +676,7 @@
               </el-row>
             </div>
           </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item align="left" label="鏈汉鎰忔効 ">
-                <el-checkbox-group v-model="form.selfwill">
-                  <el-checkbox
-                    v-for="dict in dict.type.sys_SelfWill || []"
-                    :key="dict.value"
-                    :label="dict.value"
-                  >
-                    {{ dict.label }}
-                  </el-checkbox>
-                </el-checkbox-group>
-              </el-form-item>
-            </el-col>
-          </el-row>
+
           <el-row>
             <el-col :span="12">
               <el-form-item label="涓昏浜插睘" prop="majorrelatives">
@@ -659,7 +704,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item align="left" label="淇℃伅鏉ユ簮">
+              <el-form-item align="left" label="淇℃伅鏉ユ簮" prop="infosources">
                 <el-checkbox-group v-model="form.infosources">
                   <el-checkbox
                     v-for="dict in dict.type.sys_InfoSources || []"
@@ -695,7 +740,7 @@
                 />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <!-- <el-col :span="8">
               <el-form-item label="淇℃伅鍛�" prop="infoname">
                 <el-input v-model="form.infoname" placeholder="璇疯緭鍏ヤ俊鎭憳" />
               </el-form-item>
@@ -707,9 +752,9 @@
                   placeholder="璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽"
                 />
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-row>
-          <el-row>
+          <!-- <el-row>
             <el-col :span="8">
               <el-form-item align="left" label="绾㈠崄瀛椾細" prop="redorganno">
                 <org-selecter
@@ -741,7 +786,7 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-          </el-row>
+          </el-row> -->
         </el-form>
         <div class="dialog-footer">
           <el-button
@@ -938,6 +983,7 @@
                 align="left"
               >
                 <el-select
+                  filterable
                   v-model="medicineform.coreteamassessconclusion"
                   placeholder="璇烽�夋嫨鏍稿績鎴愬憳缁撹"
                 >
@@ -1000,6 +1046,55 @@
         >
           <el-row>
             <el-col :span="6">
+              <el-form-item label="鎹愯禒鑰呮皯鏃�" prop="nation">
+                <el-select
+                  filterable
+                  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
+                  filterable
+                  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="6">
               <el-form-item label="浜插睘濮撳悕" prop="name">
                 <el-input v-model="affirmform.name" placeholder="璇疯緭鍏ュ鍚�" />
               </el-form-item>
@@ -1024,7 +1119,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="韬唤璇佸彿" prop="idcardno">
+              <el-form-item label="浜插睘韬唤璇�" prop="idcardno">
                 <el-input
                   ref="updateBSvalue"
                   class="sfzcode"
@@ -1034,7 +1129,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+              <el-form-item label="浜插睘鐢佃瘽" prop="phone">
                 <el-input
                   v-model="affirmform.phone"
                   placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
@@ -1042,56 +1137,18 @@
               </el-form-item>
             </el-col>
           </el-row>
+
           <el-row>
-            <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-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
@@ -1103,7 +1160,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="绛惧瓧浜插睘" prop="kinshipconfirmationsign">
+              <el-form-item label="浜插睘鍏崇郴" prop="kinshipconfirmationsign">
                 <el-checkbox-group v-model="kinship">
                   <el-checkbox
                     v-for="dict in dict.type.sys_kinshipConfirm || []"
@@ -1140,12 +1197,24 @@
             <el-form-item label-width="100px" label="鎹愮尞鍐冲畾">
               <el-checkbox-group v-model="organdecision">
                 <el-checkbox
-                  v-for="item in organselection"
+                  v-for="item in fixedOrganSelection"
                   :key="item"
                   :label="item"
                   >{{ item }}
                 </el-checkbox>
+                <el-checkbox
+                  v-if="shouldShowConditionalOrgan"
+                  :key="conditionalOrgan"
+                  :label="conditionalOrgan"
+                  >{{ conditionalOrgan }}</el-checkbox
+                >
               </el-checkbox-group>
+              <el-input
+                v-if="organdecision.includes('鍏朵粬')"
+                v-model="affirmform.organdecisionOther"
+                placeholder="璇疯緭鍏ュ叾浠栨崘鐚喅瀹氱殑鍏蜂綋鍐呭"
+                style="margin-top: 10px; width: 300px;"
+              ></el-input>
             </el-form-item>
           </el-row>
           <el-row>
@@ -1179,6 +1248,7 @@
             <el-col :span="6">
               <el-form-item label="璐熻矗浜�" prop="responsibleuserid">
                 <el-select
+                  filterable
                   v-model="affirmform.responsibleuserid"
                   placeholder="璇烽�夋嫨"
                 >
@@ -1197,6 +1267,7 @@
                 <el-select
                   v-model="affirmform.coordinateduserido"
                   placeholder="璇烽�夋嫨"
+                  filterable
                 >
                   <el-option
                     v-for="item in coordinatorlist1"
@@ -1213,6 +1284,7 @@
                 <el-select
                   v-model="affirmform.coordinateduseridt"
                   placeholder="璇烽�夋嫨"
+                  filterable
                 >
                   <el-option
                     v-for="item in coordinatorlist1"
@@ -1235,7 +1307,7 @@
                   size="small"
                   v-model="affirmform.signdate"
                   type="date"
-                  value-format="yyyy-MM-dd hh:mm:ss"
+                  value-format="yyyy-MM-dd"
                   placeholder="閫夋嫨绛惧瓧鏃ユ湡"
                 >
                 </el-date-picker>
@@ -1379,25 +1451,12 @@
                       />
                     </template>
                   </el-table-column>
-                  <el-table-column
+                  <!-- <el-table-column
                     label="鍣ㄥ畼缂栧彿"
                     align="center"
                     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="鍒嗛厤鎺ユ敹鏃堕棿"
                     align="center"
@@ -1418,6 +1477,20 @@
                     </template>
                   </el-table-column>
                   <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="120"
@@ -1433,7 +1506,7 @@
                   <el-table-column
                     label="绉绘鍖婚櫌"
                     align="center"
-                    width="230"
+                    width="280"
                     prop="transplanthospitalno"
                   >
                     <template slot-scope="scope">
@@ -1441,6 +1514,7 @@
                         <org-selecter
                           ref="tranHosSelect"
                           :org-type="'4'"
+                          :filterable="true"
                           :dataList="dataList"
                           v-model="scope.row.transplanthospitalno"
                         />
@@ -1516,24 +1590,15 @@
           label-position="right"
         >
           <el-row>
-            <el-col :span="24">
-              <el-form-item
-                align="left"
-                label="鎹愮尞绫诲埆"
-                prop="donationcategory"
-              >
-                <el-radio-group v-model="witnessform.donationcategory">
-                  <el-radio
-                    v-for="dict in dict.type.sys_DonationCategory || []"
-                    :key="dict.value"
-                    :label="dict.value"
-                    >{{ dict.label }}</el-radio
-                  >
-                </el-radio-group>
+            <el-col :span="10">
+              <el-form-item label="鎹愮尞鍖婚櫌" prop="donateHospital ">
+                <el-input
+                  v-model="witnessform.donateHospital"
+                  placeholder="璇疯緭鍏ユ崘鐚尰闄�"
+                />
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row> </el-row>
           <el-row>
             <el-col :span="6">
               <el-form-item
@@ -1564,6 +1629,19 @@
             <el-col :span="6">
               <el-form-item
                 align="left"
+                label="姝讳骸鍘熷洜"
+                label-width="120px"
+                prop="deathreason"
+              >
+                <el-input
+                  v-model="witnessform.deathreason"
+                  placeholder="璇疯緭鍏ユ浜″師鍥�"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item
+                align="left"
                 label="姝讳骸鏃堕棿"
                 label-width="120px"
                 prop="deathtime"
@@ -1578,20 +1656,27 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="6">
+          </el-row>
+          <el-row>
+            <el-col :span="24">
               <el-form-item
                 align="left"
-                label="姝讳骸鍘熷洜"
-                label-width="120px"
-                prop="deathreason"
+                label="鎹愮尞绫诲埆"
+                prop="donationcategory"
               >
-                <el-input
-                  v-model="witnessform.deathreason"
-                  placeholder="璇疯緭鍏ユ浜″師鍥�"
-                />
+                <el-radio-group v-model="witnessform.donationcategory">
+                  <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>
           </el-row>
+          <el-row> </el-row>
+
           <el-row>
             <el-col :span="6">
               <el-form-item
@@ -1666,7 +1751,7 @@
             <el-col :span="6">
               <el-form-item
                 align="left"
-                label="绛惧瓧鏃堕棿"
+                label="绛惧瓧鏃ユ湡"
                 label-width="120px"
                 prop="coordinatorSignTime"
               >
@@ -1681,152 +1766,161 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item
-                label="鑵逛富鍔ㄨ剦锛氭彃绠℃椂闂�"
-                align="left"
-                label-width="140px"
-                prop="abdominalaortacannulatime"
-              >
-                <el-date-picker
-                  clearable
-                  v-model="witnessform.abdominalaortacannulatime"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="閫夋嫨鑵逛富鍔ㄨ剦鎻掔鏃堕棿"
+          <div
+            v-if="
+              witnessform.abdominalaortacannulatime ||
+                witnessform.abdominalaortaperfusiontime ||
+                witnessform.pulmonaryarterycannulatime ||
+                witnessform.pulmonaryarteryperfusiontime
+            "
+          >
+            <el-row>
+              <el-col :span="6">
+                <el-form-item
+                  label="鑵逛富鍔ㄨ剦锛氭彃绠℃椂闂�"
+                  align="left"
+                  label-width="140px"
+                  prop="abdominalaortacannulatime"
                 >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item
-                label="鐏屾敞鏃堕棿"
-                align="left"
-                label-width="120px"
-                prop="abdominalaortaperfusiontime"
-              >
-                <el-date-picker
-                  clearable
-                  v-model="witnessform.abdominalaortaperfusiontime"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="閫夋嫨鑵逛富鍔ㄨ剦鐏屾敞鏃堕棿"
+                  <el-date-picker
+                    clearable
+                    v-model="witnessform.abdominalaortacannulatime"
+                    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
+                  label="鐏屾敞鏃堕棿"
+                  align="left"
+                  label-width="120px"
+                  prop="abdominalaortaperfusiontime"
                 >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item
-                label="闂ㄩ潤鑴夛細鎻掔鏃堕棿"
-                align="left"
-                label-width="140px"
-                prop="portalveincannulatime"
-              >
-                <el-date-picker
-                  clearable
-                  v-model="witnessform.portalveincannulatime"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="閫夋嫨闂ㄩ潤鑴夎剦鎻掔鏃堕棿"
+                  <el-date-picker
+                    clearable
+                    v-model="witnessform.abdominalaortaperfusiontime"
+                    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
+                  label="闂ㄩ潤鑴夛細鎻掔鏃堕棿"
+                  align="left"
+                  label-width="140px"
+                  prop="portalveincannulatime"
                 >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item
-                label="鐏屾敞鏃堕棿"
-                align="left"
-                label-width="120px"
-                prop="portalveinperfusiontime"
-              >
-                <el-date-picker
-                  clearable
-                  v-model="witnessform.portalveinperfusiontime"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�"
+                  <el-date-picker
+                    clearable
+                    v-model="witnessform.portalveincannulatime"
+                    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
+                  label="鐏屾敞鏃堕棿"
+                  align="left"
+                  label-width="120px"
+                  prop="portalveinperfusiontime"
                 >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="6">
-              <el-form-item
-                label="鑲哄姩鑴夛細鎻掔鏃堕棿"
-                align="left"
-                label-width="140px"
-                prop="pulmonaryarterycannulatime"
-              >
-                <el-date-picker
-                  clearable
-                  v-model="witnessform.pulmonaryarterycannulatime"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="閫夋嫨闂ㄩ潤鑴夋彃绠℃椂闂�"
+                  <el-date-picker
+                    clearable
+                    v-model="witnessform.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="6">
+                <el-form-item
+                  label="鑲哄姩鑴夛細鎻掔鏃堕棿"
+                  align="left"
+                  label-width="140px"
+                  prop="pulmonaryarterycannulatime"
                 >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item
-                label="鐏屾敞鏃堕棿"
-                align="left"
-                label-width="120px"
-                prop="pulmonaryarteryperfusiontime"
-              >
-                <el-date-picker
-                  clearable
-                  v-model="witnessform.pulmonaryarteryperfusiontime"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="閫夋嫨闂ㄩ潤鑴夌亴娉ㄦ椂闂�"
+                  <el-date-picker
+                    clearable
+                    v-model="witnessform.pulmonaryarterycannulatime"
+                    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
+                  label="鐏屾敞鏃堕棿"
+                  align="left"
+                  label-width="120px"
+                  prop="pulmonaryarteryperfusiontime"
                 >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item
-                label="涓诲姩鑴夛細鎻掔鏃堕棿"
-                align="left"
-                label-width="140px"
-                prop="aortacannulatime"
-              >
-                <el-date-picker
-                  clearable
-                  v-model="witnessform.aortacannulatime"
-                  type="datetime"
-                  value-format="yyyy-MM-dd  HH:mm:ss"
-                  placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�"
+                  <el-date-picker
+                    clearable
+                    v-model="witnessform.pulmonaryarteryperfusiontime"
+                    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
+                  label="涓诲姩鑴夛細鎻掔鏃堕棿"
+                  align="left"
+                  label-width="140px"
+                  prop="aortacannulatime"
                 >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item
-                label="鐏屾敞鏃堕棿"
-                align="left"
-                label-width="120px"
-                prop="aortaperfusiontime"
-              >
-                <el-date-picker
-                  clearable
-                  v-model="witnessform.aortaperfusiontime"
-                  type="datetime"
-                  value-format="yyyy-MM-dd  HH:mm:ss"
-                  placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�"
+                  <el-date-picker
+                    clearable
+                    v-model="witnessform.aortacannulatime"
+                    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
+                  label="鐏屾敞鏃堕棿"
+                  align="left"
+                  label-width="120px"
+                  prop="aortaperfusiontime"
                 >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
+                  <el-date-picker
+                    clearable
+                    v-model="witnessform.aortaperfusiontime"
+                    type="datetime"
+                    value-format="yyyy-MM-dd  HH:mm:ss"
+                    placeholder="閫夋嫨涓诲姩鑴夌亴娉ㄦ椂闂�"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
           <el-row>
             <el-col>
               <el-form-item label-width="100px" label="鑾峰彇鍣ㄥ畼">
                 <el-checkbox-group v-model="organList.organprocured">
                   <el-checkbox
-                    v-for="dict in sysOrganlistL"
+                    v-for="dict in dict.type.sys_Organ || []"
                     :key="dict.value"
                     :label="dict.value"
                     @change="changeorganprocured(dict.value)"
@@ -1840,7 +1934,15 @@
           <el-row>
             <el-col>
               <el-form-item>
-                <el-table v-loading="loading" border :data="procureddata">
+                <el-table
+                  v-loading="loading"
+                  border
+                  :key="tableKey"
+                  :data="procureddata"
+                  lazy
+                  :load="loadRowData"
+                  :row-key="row => row.organno"
+                >
                   <el-table-column
                     label="鍣ㄥ畼鍚嶇О"
                     align="center"
@@ -1855,12 +1957,12 @@
                       />
                     </template>
                   </el-table-column>
-                  <el-table-column
+                  <!-- <el-table-column
                     label="鍣ㄥ畼缂栧彿"
                     align="center"
                     width="90"
                     prop="organno"
-                  />
+                  /> -->
                   <!-- <el-table-column
                     label="绯荤粺缂栧彿"
                     align="center"
@@ -1874,7 +1976,9 @@
                       />
                     </template>
                   </el-table-column> -->
+
                   <el-table-column
+                    v-if="organgettimetrue"
                     label="鍣ㄥ畼绂讳綋鏃堕棿"
                     align="center"
                     width="200"
@@ -1893,10 +1997,11 @@
                       </el-date-picker>
                     </template>
                   </el-table-column>
+
                   <el-table-column
                     label="鑾峰彇鍖婚櫌"
                     align="center"
-                    width="230"
+                    width="280"
                     prop="gainhospitalno"
                   >
                     <template slot-scope="scope">
@@ -1923,6 +2028,25 @@
                       />
                     </template>
                   </el-table-column>
+                  <el-table-column
+                    label="鑾峰彇寮�濮嬫椂闂�"
+                    align="center"
+                    width="200"
+                    prop="organStartTime"
+                  >
+                    <template slot-scope="scope">
+                      <el-date-picker
+                        clearable
+                        size="small"
+                        style="width: 100%"
+                        v-model="scope.row.organStartTime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="璇疯緭鍏ヨ幏鍙栧紑濮嬫椂闂�"
+                      >
+                      </el-date-picker>
+                    </template>
+                  </el-table-column>
                   <!-- <el-table-column
                     label="鍙椾綋濮撴皬"
                     align="center"
@@ -1946,6 +2070,7 @@
                       <el-select
                         v-model="scope.row.organstate"
                         placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+                        filterable
                       >
                         <el-option
                           v-for="dict in organstatelist"
@@ -2019,6 +2144,7 @@
                 <el-select
                   v-model="witnessform.coordinateduserido"
                   placeholder="璇烽�夋嫨"
+                  filterable
                 >
                   <el-option
                     v-for="item in coordinatorlist1"
@@ -2035,6 +2161,7 @@
                 <el-select
                   v-model="witnessform.coordinateduseridt"
                   placeholder="璇烽�夋嫨"
+                  filterable
                 >
                   <el-option
                     v-for="item in coordinatorlist1"
@@ -2115,12 +2242,12 @@
                       />
                     </template>
                   </el-table-column>
-                  <el-table-column
+                  <!-- <el-table-column
                     label="鍣ㄥ畼缂栧彿"
                     align="center"
                     width="90"
                     prop="organno"
-                  />
+                  /> -->
                   <el-table-column
                     label="绯荤粺缂栧彿"
                     align="center"
@@ -2137,7 +2264,7 @@
                   <el-table-column
                     label="绉绘鍖婚櫌"
                     align="center"
-                    width="220"
+                    width="280"
                     prop="hospitalno"
                   >
                     <template slot-scope="scope">
@@ -2205,6 +2332,7 @@
                       <el-select
                         v-model="scope.row.transplantstate"
                         placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+                        filterable
                       >
                         <el-option
                           v-for="dict in transplantstatelist"
@@ -2233,7 +2361,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
+          <el-row v-if="accomplishform.isbodydonation">
             <el-col :span="6">
               <el-form-item align="left" label="閬椾綋鎹愮尞" prop="isbodydonation">
                 <el-radio-group v-model="accomplishform.isbodydonation">
@@ -2261,6 +2389,7 @@
                 <el-select
                   v-model="accomplishform.responsibleuserid"
                   placeholder="璇烽�夋嫨"
+                  filterable
                 >
                   <el-option
                     v-for="item in leaderlist"
@@ -2277,6 +2406,7 @@
                 <el-select
                   v-model="accomplishform.coordinateduserido"
                   placeholder="璇烽�夋嫨"
+                  filterable
                 >
                   <el-option
                     v-for="item in coordinatorlist1"
@@ -2293,6 +2423,7 @@
                 <el-select
                   v-model="accomplishform.coordinateduseridt"
                   placeholder="璇烽�夋嫨"
+                  filterable
                 >
                   <el-option
                     v-for="item in coordinatorlist1"
@@ -2627,6 +2758,7 @@
     return {
       infoid: 736,
       drawer: false,
+      isLeftCollapsed: false,
       form: {
         donorno: "",
         reporterno: "",
@@ -2671,6 +2803,20 @@
         contacttime: "",
         reporttime: ""
       },
+      organOrder: [
+        "鑲濊剰",
+        "宸﹁偩",
+        "鍙宠偩",
+        "蹇冭剰",
+        "宸﹁偤",
+        "鍙宠偤",
+        "鑳拌吅",
+        "灏忚偁",
+        "宸︾溂瑙掕啘",
+        "鍙崇溂瑙掕啘"
+      ], // 鎸囧畾鐨勫櫒瀹橀『搴�
+      isSorting: false, // 鏍囧織浣嶏紝琛ㄧず鏄惁姝ｅ湪鎺掑簭
+      tableKey: 0,
       istb: false,
       activeName: "",
       tableDatafile: [
@@ -2691,22 +2837,29 @@
         kinship: []
       },
       organdecision: [],
+      organdecisionOther: "", // 鍏朵粬閫夐」鐨勫叿浣撴弿杩�
       kinship: [],
       ethicform: {
         infoid: null
       },
       kinshiplist: ["閰嶅伓", "鐖朵翰", "姣嶄翰", "瀛愬コ", "鍙楁墭浜�"],
-      organselection: [
+
+      // 鍥哄畾鐨勯�夐」鍒楄〃锛堢Щ闄や簡"閬椾綋"锛�
+      fixedOrganSelection: [
         "鑲濊剰",
-        "鍙岃偩鑴�",
+        "鑲捐剰",
+        "鍗曞乏鑲�",
+        "鍗曞彸鑲�",
         "蹇冭剰",
         "鑲鸿剰",
         "鑳拌吅",
         "灏忚偁",
         "鍙岀溂缁勭粐",
-        "閬椾綋",
         "鍏朵粬"
       ],
+
+      // 闇�瑕佹潯浠舵樉绀虹殑閫夐」
+      conditionalOrgan: "閬椾綋",
 
       //閫夋嫨鍣ㄥ畼琛ㄥ崟
       organList: {
@@ -2735,6 +2888,7 @@
       allocateddata: [],
       allocateddataform: {},
       procureddata: [],
+      organgettimetrue: false,
       transplantdata: [],
       sysOrganlistL: [
         { label: "蹇冭剰", value: "C38" },
@@ -2802,6 +2956,21 @@
         name: [
           { required: true, message: "璇疯緭鍏ユ崘鐚�呭鍚�", trigger: "blur" }
         ],
+        nationality: [
+          { required: true, message: "璇疯緭鍏ュ浗绫�", trigger: "blur" }
+        ],
+        currentMedicalInstitution: [
+          { required: true, message: "璇疯緭鍏ユ墍鍦ㄥ尰鐤楁満鏋�", trigger: "blur" }
+        ],
+        currentDept: [
+          { required: true, message: "鎵�鍦ㄥ尰鐤楁満鏋勭瀹�", trigger: "blur" }
+        ],
+        firstMedicalInstitution: [
+          { required: true, message: "璇疯緭鍏ラ娆″尰鐤楁満鏋�", trigger: "blur" }
+        ],
+        firstDept: [
+          { required: true, message: "璇疯緭鍏ラ娆″尰鐤楁満鏋勭瀹�", trigger: "blur" }
+        ],
         birthday: [
           { required: true, message: "璇烽�夋嫨鍑虹敓鏃ユ湡", trigger: "blur" }
         ],
@@ -2811,21 +2980,44 @@
         residenceaddress: [
           { required: true, message: "璇疯緭鍏ヤ綇鍧�", trigger: "blur" }
         ],
-        contacttime: [
-          {
-            required: true,
-            message: "璇疯緭鍏ョ孩鍗佸瓧浼氳仈绯绘椂闂�",
-            trigger: "blur"
-          }
+        registerAddresss: [
+          { required: true, message: "璇疯緭鍏ョ幇灞呬綇鍦板潃", trigger: "blur" }
+        ],
+        diseasetype: [
+          { required: true, message: "璇烽�夋嫨鐤剧梾绫诲瀷", trigger: "blur" }
+        ],
+        infectious: [
+          { required: true, message: "璇烽�夋嫨浼犳煋鐥呯被鍨�", trigger: "blur" }
+        ],
+        patientstate: [
+          { required: true, message: "璇烽�夋嫨鐥呬汉鐘跺喌", trigger: "blur" }
+        ],
+        kinship: [
+          { required: true, message: "璇烽�夋嫨浜插睘鎯呭喌", trigger: "blur" }
+        ],
+        majorrelatives: [
+          { required: true, message: "璇疯緭鍏ヤ富瑕佷翰灞�", trigger: "blur" }
+        ],
+        selfwill: [
+          { required: true, message: "璇烽�夋嫨鏈汉鎰忔効", trigger: "blur" }
+        ],
+        registerAddresss: [
+          { required: true, message: "璇疯緭鍏ョ幇鎵�鍦ㄥ湴", trigger: "blur" }
+        ],
+        familyrelations: [
+          { required: true, message: "璇烽�夋嫨浜插睘涓庢崘鐚�呭叧绯�", trigger: "blur" }
+        ],
+        infosources: [
+          { required: true, message: "璇烽�夋嫨淇℃伅鏉ユ簮", trigger: "blur" }
         ],
         idcardno: [
           { required: true, message: "璇锋纭緭鍏ヨ瘉浠跺彿鐮�", trigger: "blur" }
         ],
         sex: [{ required: true, message: "鎬у埆涓嶈兘涓虹┖", trigger: "blur" }],
         age: [{ required: true, message: "璇疯緭鍏ュ勾榫�", trigger: "blur" }],
-        treatmenthospitalno: [
-          { required: true, message: "璇烽�夋嫨鍖荤枟鏈烘瀯", trigger: "blur" }
-        ],
+        // treatmenthospitalno: [
+        //   { required: true, message: "璇烽�夋嫨鍖荤枟鏈烘瀯", trigger: "blur" }
+        // ],
         bloodtype: [
           { required: true, message: "璇烽�夋嫨ABO琛�鍨�", trigger: "blur" }
         ],
@@ -2846,16 +3038,6 @@
         infophone: [
           { required: true, message: "璇疯緭鍏ヤ俊鎭憳鑱旂郴鐢佃瘽", trigger: "blur" }
         ],
-        redorganno: [
-          { required: true, message: "璇烽�夋嫨绾㈠崄瀛椾細鏈烘瀯", trigger: "blur" }
-        ],
-        contactperson: [
-          {
-            required: true,
-            message: "绾㈠崄瀛椾細鑱旂郴浜轰笉鑳戒负绌�",
-            trigger: "blur"
-          }
-        ],
         acquisitiontissueno: [
           { required: true, message: "鍣ㄥ畼鑾峰彇缁勭粐涓嶈兘涓虹┖", trigger: "blur" }
         ],
@@ -2870,12 +3052,37 @@
         ]
       },
       // 鍚勭骇鏄庣粏鏁堥獙
-      medicinerules: {},
+      medicinerules: {
+        illnessoverview: [
+          { required: true, message: "璇疯緭鍏ョ梾鎯呮鍐�", trigger: "blur" }
+        ],
+        diagnosisname: [
+          { required: true, message: "璇疯緭鍏ョ柧鐥呰瘖鏂�", trigger: "blur" }
+        ],
+        hospitalassessdoctor: [
+          { required: true, message: "璇疯緭鍏ラ櫌绾ц瘎浼板尰鐢�", trigger: "blur" }
+        ],
+        provincialassessdoctor: [
+          { required: true, message: "璇疯緭鍏ョ渷绾ц瘎浼板尰鐢�", trigger: "blur" }
+        ],
+        coreteamassessdoctor: [
+          { required: true, message: "璇疯緭鍏ユ牳蹇冩垚鍛樿瘎浼板尰鐢�", trigger: "blur" }
+        ],
+      },
       affirmrules: {
         name: [
           { required: true, message: "浜插睘濮撳悕涓嶈兘涓虹┖", trigger: "blur" }
         ],
         phone: [
+          { required: true, message: "瀹跺睘鑱旂郴鐢佃瘽涓嶄负绌�", trigger: "blur" }
+        ],
+        nation: [
+          { required: true, message: "浜插睘濮撳悕涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        education: [
+          { required: true, message: "瀹跺睘鑱旂郴鐢佃瘽涓嶄负绌�", trigger: "blur" }
+        ],
+        occupation: [
           { required: true, message: "瀹跺睘鑱旂郴鐢佃瘽涓嶄负绌�", trigger: "blur" }
         ],
         signfamilyrelations: [
@@ -2941,6 +3148,13 @@
     this.getdataList();
     this.infoid = this.$route.query.id;
   },
+  computed: {
+    // 璁＄畻灞炴�э細鍐冲畾鏄惁鏄剧ず鈥滈仐浣撯�濋�夐」
+    shouldShowConditionalOrgan() {
+      // 褰撻�変腑椤逛腑鍖呭惈鈥滈仐浣撯�濇椂锛屾墠鏄剧ず瀹�
+      return this.organdecision.includes(this.conditionalOrgan);
+    }
+  },
   mounted() {
     // this.id = this.$route.query.id;
     this.Getbasicinformation();
@@ -2958,9 +3172,39 @@
     listReportname("fzr").then(res => {
       this.leaderlist = res.data;
     });
+    // this.customOrganSort();
+  },
+  watch: {
+    // 鐩戝惉 procureddata 鐨勫彉鍖栵紝鏁版嵁鏇存柊鍚庨噸鏂版帓搴�
+    procureddata: {
+      handler(newVal) {
+        if (this.procureddata[0].organgettime) {
+          this.organgettimetrue = true;
+        }
+        if (this.isSorting) {
+          return;
+        }
+        this.customOrganSort();
+      }
+      // deep: true // 娣卞害鐩戝惉锛屽洜涓烘暟缁勫唴瀹瑰彲鑳藉彉鍖�
+    },
+    allocateddata: {
+      handler(newVal) {
+        if (this.isSorting) {
+          return;
+        }
+        this.allocateddataSort();
+      }
+      // deep: true // 娣卞害鐩戝惉锛屽洜涓烘暟缁勫唴瀹瑰彲鑳藉彉鍖�
+    }
   },
 
   methods: {
+    loadRowData(row, treeNode, resolve) {
+      // 鍙湁褰撹灞曞紑鎴栭渶瑕佹椂鎵嶅畬鏁存覆鏌撳唴閮ㄧ粍浠�
+      this.$set(row, "loaded", true);
+      resolve();
+    },
     // 鑾峰彇涓昏〃鍙婇檮灞炴暟鎹�
     Getbasicinformation() {
       // 宸︿晶娴佺▼鏁版嵁
@@ -2982,7 +3226,15 @@
       // 琛ㄥ崟鏁版嵁
       getDonatebaseinfo(this.infoid).then(response => {
         this.form = response.data;
-        console.log(this.form, "form");
+        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;
@@ -3040,7 +3292,9 @@
           if (response.code == 200 && response.rows[0]) {
             this.affirmform = response.rows[0];
             if (this.affirmform.organdecision) {
-              this.organdecision = this.affirmform.organdecision.split(",");
+              this.organdecision = this.affirmform.organdecision
+                .split(",")
+                .flatMap(item => (item === "鍙岃偩鑴�" ? ["宸﹁偩", "鍙宠偩"] : item));
             }
             if (this.affirmform.kinship) {
               this.kinship = this.affirmform.kinship.split(",");
@@ -3213,12 +3467,17 @@
         });
       }
     },
+    // 鍒囨崲渚ц竟闅愯棌
+    toggleLeftCollapse() {
+      this.isLeftCollapsed = !this.isLeftCollapsed;
+    },
     /** 淇濆瓨涓昏〃鎸夐挳 */
-
     submitForm() {
       this.$refs["form"].validate(valid => {
         console.log("鎻愪氦鐨勬暟鎹滑锛�", this.form);
         if (valid) {
+          console.log(112);
+
           this.form.birthday = this.$moment(this.form.birthday).format(
             "YYYY-MM-DD HH:mm:ss"
           );
@@ -3305,6 +3564,8 @@
               }
             });
           }
+        } else {
+          this.$modal.msgError("鍓嶉儴娼滃湪鎹愮尞琛ㄥ崟淇℃伅鏈夌己婕忚鎺掓煡鍚庨噸鏂颁繚瀛�");
         }
       });
     },
@@ -3333,6 +3594,9 @@
       } else if (this.actives == 2) {
         this.affirmform.infoid = this.infoid;
         this.affirmform.organdecision = this.organdecision.join(",");
+        if (!this.organdecision.includes("鍏朵粬")) {
+          this.affirmform.organdecisionOther = "";
+        }
         this.affirmform.kinship = this.kinship.join(",");
         this.$refs["affirmform"].validate(valid => {
           if (valid) {
@@ -3541,6 +3805,75 @@
           }
         });
       }
+    },
+
+    customOrganSort() {
+      console.log("璋冪敤");
+
+      // 1. 鍔犻攣锛岄樆姝㈢洃鍚櫒鎵ц
+      this.isSorting = true;
+      this.loading = true;
+      // 鑷畾涔夋帓搴忓嚱鏁�
+      this.procureddata.sort((a, b) => {
+        const indexA = this.organOrder.indexOf(a.organname);
+        const indexB = this.organOrder.indexOf(b.organname);
+
+        // 濡傛灉涓や釜閮藉湪鍒楄〃涓紝鎸夊垪琛ㄤ腑鐨勯『搴忔帓搴�
+        if (indexA !== -1 && indexB !== -1) {
+          return indexA - indexB;
+        }
+        // 濡傛灉 a 鍦ㄥ垪琛ㄤ腑锛宐 涓嶅湪锛宎 鎺掑墠闈�
+        if (indexA !== -1) {
+          return -1;
+        }
+        // 濡傛灉 b 鍦ㄥ垪琛ㄤ腑锛宎 涓嶅湪锛宐 鎺掑墠闈�
+        if (indexB !== -1) {
+          return 1;
+        }
+        // 涓や釜閮戒笉鍦ㄥ垪琛ㄤ腑锛屼繚鎸佸師椤哄簭锛堟垨鎸夊叾浠栬鍒欙紝姣斿鎸夊瓧姣嶆帓搴忥紝杩欓噷鎸夊師濮嬮『搴忥級
+        return 0;
+      });
+      console.log(this.procureddata, "椤哄簭");
+      this.tableKey += 1; // 鏀瑰彉 key 杩娇琛ㄦ牸閲嶆柊娓叉煋
+      // 浣犲彲浠ヤ娇鐢� this.$forceUpdate() 鎴栬�呴噸鏂拌祴鍊兼暟缁勬潵瑙﹀彂鏇存柊
+      this.procureddata = [...this.procureddata];
+      this.$nextTick(() => {
+        this.isSorting = false;
+        this.loading = false;
+      });
+    },
+    allocateddataSort() {
+      console.log("璋冪敤");
+
+      // 1. 鍔犻攣锛岄樆姝㈢洃鍚櫒鎵ц
+      this.isSorting = true;
+      // 鑷畾涔夋帓搴忓嚱鏁�
+      this.allocateddata.sort((a, b) => {
+        const indexA = this.organOrder.indexOf(a.organname);
+        const indexB = this.organOrder.indexOf(b.organname);
+
+        // 濡傛灉涓や釜閮藉湪鍒楄〃涓紝鎸夊垪琛ㄤ腑鐨勯『搴忔帓搴�
+        if (indexA !== -1 && indexB !== -1) {
+          return indexA - indexB;
+        }
+        // 濡傛灉 a 鍦ㄥ垪琛ㄤ腑锛宐 涓嶅湪锛宎 鎺掑墠闈�
+        if (indexA !== -1) {
+          return -1;
+        }
+        // 濡傛灉 b 鍦ㄥ垪琛ㄤ腑锛宎 涓嶅湪锛宐 鎺掑墠闈�
+        if (indexB !== -1) {
+          return 1;
+        }
+        // 涓や釜閮戒笉鍦ㄥ垪琛ㄤ腑锛屼繚鎸佸師椤哄簭锛堟垨鎸夊叾浠栬鍒欙紝姣斿鎸夊瓧姣嶆帓搴忥紝杩欓噷鎸夊師濮嬮『搴忥級
+        return 0;
+      });
+      console.log(this.allocateddata, "椤哄簭");
+      this.tableKey += 1; // 鏀瑰彉 key 杩娇琛ㄦ牸閲嶆柊娓叉煋
+      // 浣犲彲浠ヤ娇鐢� this.$forceUpdate() 鎴栬�呴噸鏂拌祴鍊兼暟缁勬潵瑙﹀彂鏇存柊
+      this.allocateddata = [...this.allocateddata];
+      this.$nextTick(() => {
+        this.isSorting = false;
+      });
     },
     // 鍒囨崲tab
     on_click(e) {
@@ -4115,124 +4448,242 @@
 
 <style lang="scss" scoped>
 .particularsdiv {
-  display: -webkit-box;
+  display: flex;
   background-color: #f5f7fa;
-  height: 100%;
+  height: 100vh;
+  overflow: hidden;
+  transition: all 0.3s ease;
 
+  // 宸︿晶宸ヤ綔杩涚▼鏍�
   .left-course {
     background: #fff;
-    width: 17vw;
+    width: 220px;
+    min-width: 220px;
     text-align: center;
-    margin: 20px 10px;
-    padding: 10px;
-    margin-top: 0;
-    min-height: 888px;
+    margin: 0;
+    padding: 0;
+    height: 100%;
+    box-shadow: 2px 0 8px rgba(0, 0, 0, 0.1);
+    transition: all 0.3s ease;
+    position: relative;
+    z-index: 100;
+
+    &.left-collapsed {
+      width: 64px; // 鏀逛负鍥哄畾瀹藉害锛岃�屼笉鏄�0
+      min-width: 64px; // 淇濇寔鏈�灏忓搴�
+      transform: translateX(0); // 绉婚櫎骞崇Щ
+
+      // 鎶樺彔鐘舵�佷笅闅愯棌姝ラ鍐呭锛屽彧鏄剧ず鏍囬鍜屾寜閽�
+      .postfilx > div:last-child {
+        opacity: 0;
+        visibility: hidden;
+        pointer-events: none; // 绂佺敤浜や簰
+      }
+
+      .title {
+        padding: 15px 5px; // 璋冩暣鍐呰竟璺濋�傚簲绐勫搴�
+
+        .collapse-btn {
+          margin: 0 auto; // 鎸夐挳灞呬腑
+        }
+      }
+    }
 
     .postfilx {
-      width: 15vw;
-      text-align: center;
-      margin: 20px 10px;
-      padding: 10px;
-      margin-top: 0;
-      // z-index: 999;
-      // position: -webkit-sticky;
-      // position: fixed;
-      // top: 50;
-    }
-
-    .title {
-      background: #22a2c3;
-      margin-bottom: 20px;
-      padding: 10px 0;
-      color: #fff;
-    }
-  }
-}
-
-.upload-demo {
-  text-align: center;
-}
-
-.pdfimg {
-  display: flex; // text-align: center;
-  width: 100%;
-  height: 600px;
-
-  .box-pdf {
-    width: 400px;
-    margin-right: 30px;
-    border: 1px solid #dcdfe6;
-    -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12),
-      0 0 6px 0 rgba(0, 0, 0, 0.04);
-    box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.1); // <- Add this to fix.
-  }
-
-  .pdftit {
-    width: 200px;
-    padding: 20px;
-    font-size: 18px;
-  }
-
-  .pdftit:hover {
-    background: #c0cef7;
-  }
-
-  .pdfimgmin {
-    width: 60%;
-
-    img {
       width: 100%;
+      height: 100%;
+      padding: 0;
+      margin: 0;
+      display: flex;
+      flex-direction: column;
+
+      .title {
+        background: #22a2c3;
+        margin-bottom: 0;
+        padding: 15px 10px;
+        color: #fff;
+        font-size: 16px;
+        font-weight: 600;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        position: relative;
+        transition: all 0.3s ease;
+        min-height: 54px; // 纭繚鏍囬鍖哄煙鏈夊浐瀹氶珮搴�
+        box-sizing: border-box;
+
+        .collapse-btn {
+          background: rgba(255, 255, 255, 0.2);
+          border: none;
+          color: #fff;
+          width: 32px; // 绋嶅井澧炲ぇ纭繚鍙偣鍑诲尯鍩�
+          height: 32px;
+          padding: 0;
+          border-radius: 4px;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          transition: all 0.3s ease;
+          flex-shrink: 0; // 闃叉鎸夐挳琚帇缂�
+
+          &:hover {
+            background: rgba(255, 255, 255, 0.3);
+            transform: scale(1.1);
+          }
+
+          // 纭繚鍥炬爣灞呬腑鏄剧ず
+          .el-icon {
+            margin: 0;
+          }
+        }
+
+        // 鎶樺彔鐘舵�佷笅璋冩暣鏍囬鏂囧瓧
+
+      }
+
+      // 鎶樺彔鐘舵�佷笅闅愯棌瀹屾暣鏍囬鏂囧瓧
+      &.left-collapsed .title {
+        &:after {
+          opacity: 0;
+        }
+      }
+
+      > div:last-child {
+        flex: 1;
+        overflow-y: auto;
+        padding: 20px 15px;
+        transition: all 0.3s ease;
+      }
     }
   }
-
-  .pdfimgmins {
-    font-size: 28px;
-    width: 60%;
-    text-align: center;
-  }
-}
-
-.Ticket-button {
-  margin-top: 10px;
+.Ticket-button{
   text-align: right;
-  padding-right: 66px;
+  margin-right: 50px;
 }
+  // 鍙充晶鍐呭鍖哄煙
+  .right-content {
+    flex: 1;
+    background: #fff;
+    transition: all 0.3s ease;
+    overflow-y: auto;
+    margin: 0;
 
-.boxdiv {
-  max-width: 85vw;
-  font-size: 18px;
-  padding: 0 30px;
-  padding-bottom: 10px;
-  margin-top: 10px;
+    &.right-expanded {
+      margin-left: 0;
+    }
 
-  .top-text {
-    text-align: center;
-    font-size: 23px;
-    font-weight: 600;
-    margin: 20px 0;
-    margin-bottom: 30px;
+    .boxdiv {
+      width: 100%;
+      max-width: none;
+      font-size: 18px;
+      padding: 0 30px;
+      padding-bottom: 20px;
+      margin-top: 0;
+
+      .top-text {
+        text-align: center;
+        font-size: 23px;
+        font-weight: 600;
+        margin: 20px 0;
+        margin-bottom: 30px;
+        padding-top: 20px;
+      }
+    }
   }
 }
 
-::v-deep .el-step__head.is-finish {
-  color: #22a2c3;
-  border-color: #22a2c3;
+// 姝ラ鏍峰紡浼樺寲
+::v-deep .el-steps {
+  &.el-steps--vertical {
+    height: 100%;
+
+    .el-step {
+      margin-bottom: 15px;
+
+      .el-step__head {
+        &.is-finish {
+          color: #22a2c3;
+          border-color: #22a2c3;
+        }
+      }
+
+      .el-step__title {
+        font-size: 14px;
+        font-weight: 600;
+
+        &.is-finish {
+          color: #22a2c3;
+        }
+      }
+
+      .el-step__description {
+        font-size: 12px;
+        color: #666;
+        line-height: 1.5;
+
+        &.is-finish {
+          color: #22a2c3;
+        }
+
+        p {
+          margin: 4px 0;
+        }
+      }
+    }
+  }
 }
 
-::v-deep .el-step__title.is-finish {
-  color: #22a2c3;
+// 鍝嶅簲寮忚璁�
+@media (max-width: 768px) {
+  .particularsdiv {
+    flex-direction: column;
+
+    .left-course {
+      width: 100%;
+      height: auto;
+      max-height: 300px;
+
+      &.left-collapsed {
+        width: 100%; // 绉诲姩绔繚鎸佸叏瀹�
+        min-width: 100%;
+        height: 60px; // 鍙樉绀烘爣棰樻爮楂樺害
+        max-height: 60px;
+
+        .postfilx > div:last-child {
+          display: none; // 瀹屽叏闅愯棌鍐呭鑰屼笉鏄�忔槑
+        }
+      }
+
+      .postfilx {
+        .title {
+          .collapse-btn {
+            transform: rotate(0deg); // 淇濇寔姝ｅ父鏂瑰悜
+          }
+        }
+      }
+    }
+
+    .right-content {
+      margin-left: 0;
+    }
+  }
 }
 
-::v-deep .el-step__description.is-finish {
-  color: #22a2c3;
+// 婊氬姩鏉℃牱寮忎紭鍖�
+.left-course ::-webkit-scrollbar {
+  width: 4px;
 }
 
-:v-deep .el-select {
-  display: inline-block;
-  position: relative;
-  width: 80%;
+.left-course ::-webkit-scrollbar-track {
+  background: #f1f1f1;
 }
-:v-deep .el-tabs__nav-scroll {
-  overflow: auto;
+
+.left-course ::-webkit-scrollbar-thumb {
+  background: #c1c1c1;
+  border-radius: 2px;
+}
+
+.left-course ::-webkit-scrollbar-thumb:hover {
+  background: #a8a8a8;
 }
 </style>

--
Gitblit v1.9.3