From 700db0c4cb682aed7f0670582ffd5bb5fc51e683 Mon Sep 17 00:00:00 2001
From: WXL <wl_5969728@163.com>
Date: 星期六, 20 十二月 2025 11:46:49 +0800
Subject: [PATCH] 省人民档案页更新

---
 src/views/project/donationdetails/index.vue |  680 +++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 398 insertions(+), 282 deletions(-)

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index 38ef758..4b030f6 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -184,6 +184,7 @@
                     ref="getReportname"
                     v-model="form.reporterno"
                     placeholder="璇烽�夋嫨"
+                    filterable
                   >
                     <el-option
                       v-for="item in reporters"
@@ -204,14 +205,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>
@@ -285,7 +286,7 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
+              <el-col :span="6" v-if="form.treatmenthospitalno">
                 <el-form-item
                   align="left"
                   label="鍖荤枟鏈烘瀯"
@@ -298,7 +299,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"
@@ -367,19 +368,51 @@
         >
           <el-row>
             <el-col :span="8">
-              <el-form-item label="浣忛櫌鍙�" prop="inpatientno">
-                <el-input v-model="form.inpatientno" placeholder="浣忛櫌鍙�" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="16">
-              <el-form-item label="鐤剧梾璇婃柇" prop="diagnosisname">
+              <el-form-item
+                label="鎵�鍦ㄥ尰鐤楁満鏋�"
+                label-width="120px"
+                prop="currentMedicalInstitution"
+              >
                 <el-input
-                  v-model="form.diagnosisname"
-                  placeholder="璇疯緭鍏ョ柧鐥呰瘖鏂悕绉�"
+                  v-model="form.currentMedicalInstitution"
+                  placeholder="璇疯緭鍏�"
                 />
               </el-form-item>
             </el-col>
+            <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="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">
@@ -401,73 +434,6 @@
             <el-col :span="6">
               <el-form-item label="鍥界睄" prop="nationality">
                 <el-input v-model="form.nationality" 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-col :span="6">
-              <el-form-item
-                label="鎵�鍦ㄥ尰鐤楁満鏋�"
-                prop="currentMedicalInstitution"
-              >
-                <el-input
-                  v-model="form.currentMedicalInstitution"
-                  placeholder="璇疯緭鍏�"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="10">
-              <el-form-item
-                label-width="130px"
-                label="鎵�鍦ㄥ尰鐤楁満鏋勭瀹�"
-                prop="currentDept"
-              >
-                <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="firstMedicalInstitution">
-                <el-input
-                  v-model="form.firstMedicalInstitution"
-                  placeholder="璇疯緭鍏�"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="10">
-              <el-form-item
-                label-width="130px"
-                label="棣栨鍖荤枟鏈烘瀯绉戝"
-                prop="firstDept"
-              >
-                <el-input v-model="form.firstDept" placeholder="璇疯緭鍏�" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -510,8 +476,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
@@ -523,7 +495,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
@@ -536,6 +508,44 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <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">
@@ -592,11 +602,28 @@
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
-            <el-col :span="15" align="left">
+          </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"
                   >
@@ -638,21 +665,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">
@@ -959,6 +972,7 @@
                 align="left"
               >
                 <el-select
+                  filterable
                   v-model="medicineform.coreteamassessconclusion"
                   placeholder="璇烽�夋嫨鏍稿績鎴愬憳缁撹"
                 >
@@ -1022,7 +1036,11 @@
           <el-row>
             <el-col :span="6">
               <el-form-item label="鎹愯禒鑰呮皯鏃�" prop="nation">
-                <el-select v-model="affirmform.nation" placeholder="璇烽�夋嫨姘戞棌">
+                <el-select
+                  filterable
+                  v-model="affirmform.nation"
+                  placeholder="璇烽�夋嫨姘戞棌"
+                >
                   <el-option
                     v-for="dict in dict.type.sys_nation || []"
                     :key="dict.value"
@@ -1050,6 +1068,7 @@
             <el-col :span="6">
               <el-form-item label="鎹愯禒鑰呰亴涓�" prop="occupation">
                 <el-select
+                  filterable
                   v-model="affirmform.occupation"
                   placeholder="璇烽�夋嫨鑱屼笟"
                 >
@@ -1167,11 +1186,17 @@
             <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('鍏朵粬')"
@@ -1212,6 +1237,7 @@
             <el-col :span="6">
               <el-form-item label="璐熻矗浜�" prop="responsibleuserid">
                 <el-select
+                  filterable
                   v-model="affirmform.responsibleuserid"
                   placeholder="璇烽�夋嫨"
                 >
@@ -1230,6 +1256,7 @@
                 <el-select
                   v-model="affirmform.coordinateduserido"
                   placeholder="璇烽�夋嫨"
+                  filterable
                 >
                   <el-option
                     v-for="item in coordinatorlist1"
@@ -1246,6 +1273,7 @@
                 <el-select
                   v-model="affirmform.coordinateduseridt"
                   placeholder="璇烽�夋嫨"
+                  filterable
                 >
                   <el-option
                     v-for="item in coordinatorlist1"
@@ -1419,19 +1447,6 @@
                     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="200"
@@ -1450,6 +1465,20 @@
                       </el-date-picker>
                     </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"
@@ -1549,24 +1578,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
@@ -1597,6 +1617,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"
@@ -1611,20 +1644,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
@@ -1707,159 +1747,168 @@
                   clearable
                   v-model="witnessform.coordinatorSignTime"
                   type="datetime"
-                  value-format="yyyy-MM-dd"
+                  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="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)"
@@ -1878,6 +1927,9 @@
                   border
                   :key="tableKey"
                   :data="procureddata"
+                  lazy
+                  :load="loadRowData"
+                  :row-key="row => row.organno"
                 >
                   <el-table-column
                     label="鍣ㄥ畼鍚嶇О"
@@ -1912,8 +1964,10 @@
                       />
                     </template>
                   </el-table-column> -->
+
                   <el-table-column
-                    label="鑾峰彇寮�濮嬫椂闂�"
+                    v-if="organgettimetrue"
+                    label="鍣ㄥ畼绂讳綋鏃堕棿"
                     align="center"
                     width="200"
                     prop="organgettime"
@@ -1926,11 +1980,12 @@
                         v-model="scope.row.organgettime"
                         type="datetime"
                         value-format="yyyy-MM-dd HH:mm:ss"
-                        placeholder="璇疯緭鍏ヨ幏鍙栧紑濮嬫椂闂�"
+                        placeholder="璇疯緭鍏ュ櫒瀹樼浣撴椂闂�"
                       >
                       </el-date-picker>
                     </template>
                   </el-table-column>
+
                   <el-table-column
                     label="鑾峰彇鍖婚櫌"
                     align="center"
@@ -1961,6 +2016,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"
@@ -1984,6 +2058,7 @@
                       <el-select
                         v-model="scope.row.organstate"
                         placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+                        filterable
                       >
                         <el-option
                           v-for="dict in organstatelist"
@@ -2057,6 +2132,7 @@
                 <el-select
                   v-model="witnessform.coordinateduserido"
                   placeholder="璇烽�夋嫨"
+                  filterable
                 >
                   <el-option
                     v-for="item in coordinatorlist1"
@@ -2073,6 +2149,7 @@
                 <el-select
                   v-model="witnessform.coordinateduseridt"
                   placeholder="璇烽�夋嫨"
+                  filterable
                 >
                   <el-option
                     v-for="item in coordinatorlist1"
@@ -2243,6 +2320,7 @@
                       <el-select
                         v-model="scope.row.transplantstate"
                         placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+                        filterable
                       >
                         <el-option
                           v-for="dict in transplantstatelist"
@@ -2299,6 +2377,7 @@
                 <el-select
                   v-model="accomplishform.responsibleuserid"
                   placeholder="璇烽�夋嫨"
+                  filterable
                 >
                   <el-option
                     v-for="item in leaderlist"
@@ -2315,6 +2394,7 @@
                 <el-select
                   v-model="accomplishform.coordinateduserido"
                   placeholder="璇烽�夋嫨"
+                  filterable
                 >
                   <el-option
                     v-for="item in coordinatorlist1"
@@ -2331,6 +2411,7 @@
                 <el-select
                   v-model="accomplishform.coordinateduseridt"
                   placeholder="璇烽�夋嫨"
+                  filterable
                 >
                   <el-option
                     v-for="item in coordinatorlist1"
@@ -2749,18 +2830,23 @@
         infoid: null
       },
       kinshiplist: ["閰嶅伓", "鐖朵翰", "姣嶄翰", "瀛愬コ", "鍙楁墭浜�"],
-      organselection: [
+
+      // 鍥哄畾鐨勯�夐」鍒楄〃锛堢Щ闄や簡"閬椾綋"锛�
+      fixedOrganSelection: [
         "鑲濊剰",
-        "宸﹁偩",
-        "鍙宠偩",
+        "鑲捐剰",
+        "鍗曞乏鑲�",
+        "鍗曞彸鑲�",
         "蹇冭剰",
         "鑲鸿剰",
         "鑳拌吅",
         "灏忚偁",
         "鍙岀溂缁勭粐",
-        "閬椾綋",
         "鍏朵粬"
       ],
+
+      // 闇�瑕佹潯浠舵樉绀虹殑閫夐」
+      conditionalOrgan: "閬椾綋",
 
       //閫夋嫨鍣ㄥ畼琛ㄥ崟
       organList: {
@@ -2789,6 +2875,7 @@
       allocateddata: [],
       allocateddataform: {},
       procureddata: [],
+      organgettimetrue: false,
       transplantdata: [],
       sysOrganlistL: [
         { label: "蹇冭剰", value: "C38" },
@@ -2897,6 +2984,12 @@
         ],
         majorrelatives: [
           { required: true, message: "璇疯緭鍏ヤ富瑕佷翰灞�", trigger: "blur" }
+        ],
+        selfwill: [
+          { required: true, message: "璇烽�夋嫨鏈汉鎰忔効", trigger: "blur" }
+        ],
+        registerAddresss: [
+          { required: true, message: "璇疯緭鍏ョ幇鎵�鍦ㄥ湴", trigger: "blur" }
         ],
         familyrelations: [
           { required: true, message: "璇烽�夋嫨浜插睘涓庢崘鐚�呭叧绯�", trigger: "blur" }
@@ -3026,6 +3119,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();
@@ -3049,12 +3149,15 @@
     // 鐩戝惉 procureddata 鐨勫彉鍖栵紝鏁版嵁鏇存柊鍚庨噸鏂版帓搴�
     procureddata: {
       handler(newVal) {
+        if (this.procureddata[0].organgettime) {
+          this.organgettimetrue = true;
+        }
         if (this.isSorting) {
           return;
         }
         this.customOrganSort();
-      },
-      deep: true // 娣卞害鐩戝惉锛屽洜涓烘暟缁勫唴瀹瑰彲鑳藉彉鍖�
+      }
+      // deep: true // 娣卞害鐩戝惉锛屽洜涓烘暟缁勫唴瀹瑰彲鑳藉彉鍖�
     },
     allocateddata: {
       handler(newVal) {
@@ -3062,12 +3165,17 @@
           return;
         }
         this.allocateddataSort();
-      },
-      deep: true // 娣卞害鐩戝惉锛屽洜涓烘暟缁勫唴瀹瑰彲鑳藉彉鍖�
+      }
+      // deep: true // 娣卞害鐩戝惉锛屽洜涓烘暟缁勫唴瀹瑰彲鑳藉彉鍖�
     }
   },
 
   methods: {
+    loadRowData(row, treeNode, resolve) {
+      // 鍙湁褰撹灞曞紑鎴栭渶瑕佹椂鎵嶅畬鏁存覆鏌撳唴閮ㄧ粍浠�
+      this.$set(row, "loaded", true);
+      resolve();
+    },
     // 鑾峰彇涓昏〃鍙婇檮灞炴暟鎹�
     Getbasicinformation() {
       // 宸︿晶娴佺▼鏁版嵁
@@ -3155,7 +3263,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(",");
@@ -3334,6 +3444,8 @@
       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"
           );
@@ -3420,6 +3532,8 @@
               }
             });
           }
+        } else {
+          this.$modal.msgError("鍓嶉儴娼滃湪鎹愮尞琛ㄥ崟淇℃伅鏈夌己婕忚鎺掓煡鍚庨噸鏂颁繚瀛�");
         }
       });
     },
@@ -3666,6 +3780,7 @@
 
       // 1. 鍔犻攣锛岄樆姝㈢洃鍚櫒鎵ц
       this.isSorting = true;
+      this.loading = true;
       // 鑷畾涔夋帓搴忓嚱鏁�
       this.procureddata.sort((a, b) => {
         const indexA = this.organOrder.indexOf(a.organname);
@@ -3692,6 +3807,7 @@
       this.procureddata = [...this.procureddata];
       this.$nextTick(() => {
         this.isSorting = false;
+        this.loading = false;
       });
     },
     allocateddataSort() {
@@ -4306,7 +4422,7 @@
 
   .left-course {
     background: #fff;
-    width: 17vw;
+    width: 14vw;
     text-align: center;
     margin: 20px 10px;
     padding: 10px;
@@ -4314,7 +4430,7 @@
     min-height: 888px;
 
     .postfilx {
-      width: 15vw;
+      width: 12vw;
       text-align: center;
       margin: 20px 10px;
       padding: 10px;

--
Gitblit v1.9.3