From f562df8d292df59e5319be095ee3f2af26f4991f Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期五, 22 十二月 2023 11:32:16 +0800
Subject: [PATCH] 11

---
 src/views/project/donationdetails/index.vue | 1425 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 740 insertions(+), 685 deletions(-)

diff --git a/src/views/project/donationdetails/index.vue b/src/views/project/donationdetails/index.vue
index b51a3b4..535295e 100644
--- a/src/views/project/donationdetails/index.vue
+++ b/src/views/project/donationdetails/index.vue
@@ -71,16 +71,16 @@
             >
               <template
                 slot="description"
-                v-if="Processdata.ethicalreviewopinions.createtime"
+                v-if="Processdata.donateflowcharts.createtime"
               >
                 <p>
                   鎻愪氦鏃堕棿锛�<span>{{
-                    parseTime(Processdata.ethicalreviewopinions.createtime)
+                    parseTime(Processdata.donateflowcharts.createtime)
                   }}</span>
                 </p>
                 <p>
                   鏇存柊鏃堕棿锛�<span>{{
-                    parseTime(Processdata.ethicalreviewopinions.updatetime)
+                    parseTime(Processdata.donateflowcharts.updatetime)
                   }}</span>
                 </p>
               </template>
@@ -153,10 +153,10 @@
       </div>
     </div>
     <!-- 鍙充晶鏁版嵁 -->
-    <div style="background: #fff;">
+    <div style="background: #fff; width: 80%;">
       <!-- 椤堕儴鏁版嵁 -->
       <div class="boxdiv">
-        <div class="top-text">鎹愮尞鑰呰褰曞伐浣滃彴</div>
+        <div class="top-text">鎹愮尞妗堜緥淇℃伅</div>
         <el-form
           ref="form"
           :model="form"
@@ -171,30 +171,47 @@
               "
           >
             <el-row style="margin-top: 10px">
-              <el-col :span="8">
+              <el-col :span="6">
                 <el-form-item label="鎹愮尞缂栧彿" prop="donorno">
                   <el-input v-model="form.donorno" disabled />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item
-                  align="left"
-                  label="鍖荤枟鏈烘瀯"
-                  prop="treatmenthospitalno"
-                >
-                  <org-selecter
-                    ref="addOrgSelect"
-                    :org-type="'3'"
-                    v-model="form.treatmenthospitalno"
+              <el-col :span="6">
+                <el-form-item label="鎶ュ憡浜�" prop="reporterno">
+                  <el-select
+                    ref="getReportname"
+                    v-model="form.reporterno"
+                    placeholder="璇烽�夋嫨"
+                  >
+                    <el-option
+                      v-for="item in reporters"
+                      :key="item.reportNo"
+                      :label="item.reportName"
+                      :value="item.reportNo"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="鑱旂郴鐢佃瘽" prop="reporterphone">
+                  <el-input
+                    v-model="form.reporterphone"
+                    placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="绉戝" prop="treatmentdeptno">
-                  <el-input
-                    v-model="form.treatmentdeptname"
-                    placeholder="璇疯緭鍏ョ瀹�"
-                  />
+              <el-col :span="6">
+                <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="閫夋嫨鎶ュ憡鏃堕棿"
+                  >
+                  </el-date-picker>
                 </el-form-item>
               </el-col>
             </el-row>
@@ -204,36 +221,6 @@
                   <el-input v-model="form.name" placeholder="蹇呭~椤�" />
                 </el-form-item>
               </el-col>
-              <el-col :span="6">
-                <el-form-item label="姘戞棌" prop="nation">
-                  <el-select v-model="form.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="nativeplace">
-                  <el-input
-                    v-model="form.nativeplace"
-                    placeholder="璇疯緭鍏ュ浗绫�"
-                  />
-                </el-form-item>
-              </el-col>
-              <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="idcardtype">
                   <el-select
@@ -252,7 +239,6 @@
               <el-col :span="6">
                 <el-form-item label="璇佷欢鍙风爜" prop="idcardno">
                   <el-input
-                    style="width: 174px"
                     ref="updateBSvalue"
                     class="sfzcode"
                     v-model="form.idcardno"
@@ -261,6 +247,21 @@
                   />
                 </el-form-item>
               </el-col>
+              <el-col :span="6">
+                <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
+                  <el-date-picker
+                    clearable
+                    size="small"
+                    v-model="form.birthday"
+                    type="date"
+                    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="鎬у埆" prop="sex">
                   <el-select v-model="form.sex" placeholder="璇疯緭鍏ユ�у埆">
@@ -278,84 +279,26 @@
                   <el-input v-model="form.age" placeholder="璇疯緭鍏ュ勾榫�" />
                 </el-form-item>
               </el-col>
-            </el-row>
-            <el-row>
               <el-col :span="6">
-                <el-form-item label="鍑虹敓鏃ユ湡" prop="birthday">
-                  <el-date-picker
-                    clearable
-                    size="small"
-                    v-model="form.birthday"
-                    type="date"
-                    style="width: 174px"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="閫夋嫨鍑虹敓鏃ユ湡"
-                  >
-                  </el-date-picker>
+                <el-form-item
+                  align="left"
+                  label="鍖荤枟鏈烘瀯"
+                  prop="treatmenthospitalno"
+                >
+                  <org-selecter
+                    ref="addOrgSelect"
+                    :org-type="'3'"
+                    v-model="form.treatmenthospitalno"
+                  />
                 </el-form-item>
               </el-col>
               <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 label="绉戝" prop="treatmentdeptno">
+                  <el-input
+                    v-model="form.treatmentdeptname"
+                    placeholder="璇疯緭鍏ョ瀹�"
+                  />
                 </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="12">
-                <el-form-item label="浣忓潃" prop="residenceaddress">
-                  <div>
-                    <li_area_select
-                      ref="residenceSelect"
-                      v-model="residenceAddresss"
-                    ></li_area_select>
-                    <!-- <div>{{defultAddress}}</div> -->
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :push="1">
-                <el-input
-                  v-model="form.residenceaddress"
-                  placeholder="璇疯緭鍏ュ唴瀹�"
-                />
-              </el-col>
-            </el-row>
-
-            <el-row>
-              <el-col :span="12">
-                <el-form-item label="鐜版墍鍦ㄥ湴" prop="registeraddress">
-                  <div>
-                    <li_area_select
-                      ref="registerSelect"
-                      v-model="registerAddresss"
-                    ></li_area_select>
-                    <!-- <div>{{defultAddress}}</div> -->
-                  </div>
-                </el-form-item>
-              </el-col>
-              <el-col :span="11" :push="1">
-                <el-input
-                  v-model="form.registeraddress"
-                  placeholder="璇疯緭鍏ュ唴瀹�"
-                />
               </el-col>
             </el-row>
           </div>
@@ -429,6 +372,95 @@
                   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
+                    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="nativeplace">
+                <el-input v-model="form.nativeplace" placeholder="璇疯緭鍏ュ浗绫�" />
+              </el-form-item>
+            </el-col>
+            <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="12">
+              <el-form-item label="浣忓潃" prop="residenceaddress">
+                <div>
+                  <li_area_select
+                    ref="residenceSelect"
+                    v-model="residenceAddresss"
+                  ></li_area_select>
+                  <!-- <div>{{defultAddress}}</div> -->
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11" :push="1">
+              <el-input
+                v-model="form.residenceaddress"
+                placeholder="璇疯緭鍏ュ唴瀹�"
+              />
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="鐜版墍鍦ㄥ湴" prop="registeraddress">
+                <div>
+                  <li_area_select
+                    ref="registerSelect"
+                    v-model="registerAddresss"
+                  ></li_area_select>
+                  <!-- <div>{{defultAddress}}</div> -->
+                </div>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11" :push="1">
+              <el-input
+                v-model="form.registeraddress"
+                placeholder="璇疯緭鍏ュ唴瀹�"
+              />
             </el-col>
           </el-row>
           <el-row>
@@ -623,6 +655,20 @@
             </el-col>
           </el-row>
           <el-row>
+            <el-col :span="6">
+              <el-form-item
+                align="left"
+                label="鑾峰彇缁勭粐"
+                prop="acquisitiontissuename"
+              >
+                <org-selecter
+                  style="width: 260px"
+                  ref="orgSelecter"
+                  :org-type="'1'"
+                  v-model="form.acquisitiontissueno"
+                />
+              </el-form-item>
+            </el-col>
             <el-col :span="8">
               <el-form-item label="淇℃伅鍛�" prop="infoname">
                 <el-input v-model="form.infoname" placeholder="璇疯緭鍏ヤ俊鎭憳" />
@@ -670,85 +716,25 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="24">
-              <el-form-item
-                align="left"
-                label="鑾峰彇缁勭粐"
-                prop="acquisitiontissuename"
-              >
-                <org-selecter
-                  style="width: 260px"
-                  ref="orgSelecter"
-                  :org-type="'1'"
-                  v-model="form.acquisitiontissueno"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="鎶ュ憡浜�" prop="reporterno">
-                <el-select
-                  ref="getReportname"
-                  v-model="form.reporterno"
-                  placeholder="璇烽�夋嫨"
-                >
-                  <el-option
-                    v-for="item in reporters"
-                    :key="item.reportNo"
-                    :label="item.reportName"
-                    :value="item.reportNo"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="鑱旂郴鐢佃瘽" prop="reporterphone">
-                <el-input
-                  v-model="form.reporterphone"
-                  placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="鎶ュ憡鏃堕棿" align="left" prop="reporttime">
-                <el-date-picker
-                  clearable
-                  size="small"
-                  style="width: 190px"
-                  v-model="form.reporttime"
-                  type="datetime"
-                  value-format="yyyy-MM-dd HH:mm:ss"
-                  placeholder="閫夋嫨鎶ュ憡鏃堕棿"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
         </el-form>
         <div class="dialog-footer">
           <el-button
             v-show="!showTerminationBtn"
             type="primary"
             @click="submitForm"
-            >淇濆瓨鎹愮尞鑰呬俊鎭�</el-button
+            >淇濆瓨</el-button
           >
           <el-button
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
-            >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+            >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
           >
-          <el-button
+          <!-- <el-button
             v-show="Reportforreview"
             type="primary"
             @click="Reportforreview"
-            >涓婃姤瀹℃牳</el-button
-          >
-
-          <el-button @click="cancel">鍙� 娑�</el-button>
-          <!-- <el-button @click="handleapproval">鎻愪氦瀹℃牳</el-button> -->
+            >鎻愪氦</el-button
+          > -->
         </div>
       </div>
       <!-- 鍖诲璇勪及 -->
@@ -959,12 +945,12 @@
             v-show="!showTerminationBtn"
             type="primary"
             @click="Savethedetails"
-            >淇濆瓨璇勪及淇℃伅</el-button
+            >淇濆瓨</el-button
           >
           <el-button
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
-            >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+            >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
           >
           <!-- <el-button
             v-show="makeastepforward"
@@ -972,7 +958,7 @@
             @click="makeastepforward"
             >涓嬩竴姝�</el-button
           > -->
-          <el-button @click="cancel">鍙� 娑�</el-button>
+          <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
       </div>
       <!-- 鎹愮尞纭 -->
@@ -984,16 +970,6 @@
           label-width="100px"
           label-position="right"
         >
-          <el-row>
-            <el-col :span="6">
-              <el-form-item label="瀛愬コ鏁伴噺" prop="kinshipChildrennum">
-                <el-input
-                  v-model="affirmform.kinshipChildrennum"
-                  placeholder="璇疯緭鍏ユ暟閲�"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
           <el-row>
             <el-col :span="6">
               <el-form-item label="浜插睘濮撳悕" prop="name">
@@ -1019,14 +995,21 @@
                 </el-select>
               </el-form-item>
             </el-col>
-
-            <el-col :span="12">
+            <el-col :span="6">
               <el-form-item label="韬唤璇佸彿" prop="idcardno">
                 <el-input
                   ref="updateBSvalue"
                   class="sfzcode"
                   v-model="affirmform.idcardno"
                   placeholder="璇疯緭鍏ヨ瘉浠跺彿鐮�"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+                <el-input
+                  v-model="affirmform.phone"
+                  placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
                 />
               </el-form-item>
             </el-col>
@@ -1052,18 +1035,26 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row> </el-row>
           <el-row>
+            <el-col :span="12">
+              <el-form-item label="绛惧瓧浜插睘" prop="kinshipconfirmationsign">
+                <el-checkbox-group v-model="organdecision">
+                  <el-checkbox v-for="item in kinshiplist" :label="item">
+                    {{ item == "瀛愬コ" ? item + "(浜�)" : item }}
+                  </el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </el-col>
             <el-col :span="6">
-              <el-form-item label="鑱旂郴鐢佃瘽" prop="phone">
+              <el-form-item label="鎴愬勾瀛愬コ鏁�" prop="kinshipChildrennum">
                 <el-input
-                  v-model="affirmform.phone"
-                  placeholder="璇疯緭鍏ヨ仈绯荤數璇�"
+                  v-model="affirmform.kinshipChildrennum"
+                  placeholder="璇疯緭鍏ユ暟閲�"
                 />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="鍏朵粬" prop="organdecisionOther">
+              <el-form-item label="鍏朵粬浜插睘" prop="organdecisionOther">
                 <el-input
                   v-model="affirmform.organdecisionOther"
                   placeholder="璇疯緭鍏ュ叾浠�"
@@ -1071,6 +1062,15 @@
               </el-form-item>
             </el-col>
           </el-row>
+          <el-row>
+            <el-form-item label-width="100px" label="鎹愮尞鍐冲畾">
+              <el-checkbox-group v-model="organdecision">
+                <el-checkbox v-for="item in organlist" :label="item">
+                  {{ item }}
+                </el-checkbox>
+              </el-checkbox-group>
+            </el-form-item></el-row
+          >
           <el-row>
             <!-- <el-col :span="18">
               <el-form-item align="left" label="鎹愮尞鍐冲畾">
@@ -1085,6 +1085,18 @@
                 </el-checkbox-group>
               </el-form-item>
             </el-col> -->
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="鑾峰彇缁勭粐" prop="acquisitiontissuename">
+                <org-selecter
+                  style="width: 260px"
+                  ref="orgSelecter"
+                  :org-type="'1'"
+                  v-model="form.acquisitiontissueno"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
@@ -1159,12 +1171,12 @@
             v-show="!showTerminationBtn"
             type="primary"
             @click="Savethedetails"
-            >淇濆瓨鎹愮尞淇℃伅</el-button
+            >淇濆瓨</el-button
           >
           <el-button
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
-            >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+            >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
           >
           <!-- <el-button
             v-show="makeastepforward"
@@ -1172,7 +1184,7 @@
             @click="makeastepforward"
             >涓嬩竴姝�</el-button
           > -->
-          <el-button @click="cancel">鍙� 娑�</el-button>
+          <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
       </div>
       <!-- 浼︾悊瀹℃煡 -->
@@ -1184,18 +1196,10 @@
           label-width="100px"
           label-position="right"
         >
-          <el-form-item label="瀹℃煡鎰忚">
-            <el-input
-              v-model="ethicform.flowcontent"
-              type="textarea"
-              placeholder="璇疯緭鍏ュ唴瀹�"
-            />
-          </el-form-item>
-
           <el-row>
             <el-col :span="18">
               <el-form-item label="瀹℃煡缁撹">
-                <el-radio-group v-model="ethicform.flowconclusion">
+                <el-radio-group v-model="ethicform.expertconclusion">
                   <el-radio
                     v-for="dict in dict.type.sys_EthicalReview"
                     :key="dict.value"
@@ -1205,34 +1209,45 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-
+          </el-row>
+          <el-row>
+            <el-col :span="18">
+              <el-form-item label="瀹℃煡鎰忚">
+                <el-input
+                  v-model="ethicform.expertopinion"
+                  type="textarea"
+                  placeholder="璇疯緭鍏ュ唴瀹�"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
             <!-- createtime   瀹℃煡鏃ユ湡 -->
-            <el-col :span="6" :pull="5">
+            <el-col :span="18">
               <el-form-item label="瀹℃煡鏃ユ湡">
                 <el-date-picker
                   clearable
                   size="small"
-                  v-model="ethicform.createTime"
+                  v-model="ethicform.conclusiontime"
                   type="date"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="閫夋嫨缁撹鏃堕棿"
                 >
                 </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
+              </el-form-item> </el-col
+          ></el-row>
         </el-form>
         <div class="dialog-footer" style="min-height: 500px; margin: 20px 0; ">
           <el-button
             v-show="!showTerminationBtn"
             type="primary"
             @click="Savethedetails"
-            >淇濆瓨浼︾悊淇℃伅</el-button
+            >淇濆瓨</el-button
           >
           <el-button
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
-            >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+            >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
           >
           <!-- <el-button
             v-show="makeastepforward"
@@ -1240,7 +1255,7 @@
             @click="makeastepforward"
             >涓嬩竴姝�</el-button
           > -->
-          <el-button @click="cancel">鍙� 娑�</el-button>
+          <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
       </div>
       <!-- 鍣ㄥ畼鍒嗛厤 -->
@@ -1251,366 +1266,347 @@
           :rules="allocationrules"
           label-position="right"
         >
-          <el-form-item
-            label-width="100px"
-            label="閫夋嫨鍣ㄥ畼"
-            v-show="actives == 4"
-          >
-            <el-checkbox-group v-model="organalForm.organname">
-              <el-checkbox
-                v-for="dict in dict.type.sys_Organ"
-                :key="dict.value"
-                :label="dict.value"
-                @change="changeorganState(dict.value)"
-              >
-                {{ dict.label }}
-              </el-checkbox>
-            </el-checkbox-group>
-          </el-form-item>
-          <el-form-item>
-            <el-table v-loading="loading" border :data="allocationform">
-              <el-table-column
-                label="鍣ㄥ畼鍚嶇О"
-                align="center"
-                width="100"
-                prop="organname"
-              />
-              <el-table-column
-                label="鍣ㄥ畼缂栧彿"
-                align="center"
-                width="100"
-                prop="organno"
-              />
-              <el-table-column
-                label="鍒嗛厤鐘舵��"
-                align="center"
-                width="150"
-                prop="allocationstatus"
-                v-if="actives == 4"
-              >
-                <template slot-scope="scope">
-                  <el-select
-                    v-model="scope.row.allocationstatus"
-                    placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+          <el-row>
+            <el-col>
+              <el-form-item label-width="100px" label="閫夋嫨鍣ㄥ畼">
+                <el-checkbox-group v-model="organalForm.organname">
+                  <el-checkbox
+                    v-for="dict in dict.type.sys_Organ"
+                    :key="dict.value"
+                    :label="dict.value"
+                    @change="changeorganState(dict.value)"
                   >
-                    <el-option
-                      v-for="dict in allocationstatuslist"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
+                    {{ dict.label }}
+                  </el-checkbox>
+                </el-checkbox-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col>
+              <el-form-item>
+                <el-table v-loading="loading" border :data="allocationform">
+                  <el-table-column
+                    label="鍣ㄥ畼鍚嶇О"
+                    align="center"
+                    width="100"
+                    prop="organname"
+                  />
+                  <el-table-column
+                    label="鍣ㄥ畼缂栧彿"
+                    align="center"
+                    width="100"
+                    prop="organno"
+                  />
+                  <el-table-column
+                    label="绯荤粺缂栧彿"
+                    align="center"
+                    width="120"
+                    prop="ageunit"
+                    v-if="actives == 4"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        v-model="scope.row.ageunit"
+                        placeholder="绯荤粺缂栧彿"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鎺ユ敹鏃堕棿"
+                    align="center"
+                    width="200"
+                    prop="applicanttime"
+                    v-if="actives == 4"
+                  >
+                    <template slot-scope="scope">
+                      <el-date-picker
+                        clearable
+                        size="small"
+                        style="width: 100%"
+                        v-model="scope.row.applicanttime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="閫夋嫨鎺ユ敹鏃堕棿"
+                      >
+                      </el-date-picker>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鍙椾綋濮撳悕"
+                    align="center"
+                    width="120"
+                    prop="name"
+                    v-if="actives == 4"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        v-model="scope.row.name"
+                        placeholder="鍙椾綋濮撳悕"
+                      />
+                    </template>
+                  </el-table-column>
+                  <!--
+              <el-table-column label="璇佷欢绫诲瀷" align="center" width="150" prop="idcardtype" v-if="actives == 4">
+                <template slot-scope="scope">
+                  <el-select v-model="scope.row.idcardtype" placeholder="绉绘浜鸿瘉浠剁被鍨�">
+                    <el-option v-for="dict in dict.type.sys_IDType" :key="dict.value" :label="dict.label"
+                      :value="parseInt(dict.value)"></el-option>
                   </el-select>
                 </template>
               </el-table-column>
-              <el-table-column
-                label="鑾峰彇鐘舵��"
-                align="center"
-                width="150"
-                prop="organstate"
-                v-if="actives == 5"
-              >
+              <el-table-column label="璇佷欢鍙风爜" align="center" width="200" prop="idcardno" v-if="actives == 4">
                 <template slot-scope="scope">
-                  <el-select
-                    v-model="scope.row.organstate"
-                    placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+                  <el-input v-model="scope.row.idcardno" placeholder="璇佷欢鍙风爜" />
+                </template>
+              </el-table-column>
+              -->
+                  <el-table-column
+                    label="鍒嗛厤鐘舵��"
+                    align="center"
+                    width="150"
+                    prop="allocationstatus"
+                    v-if="actives == 4"
                   >
-                    <el-option
-                      v-for="dict in organstatelist"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="绉绘鐘舵��"
-                align="center"
-                width="150"
-                prop="transplantstate"
-                v-if="actives == 6"
-              >
-                <template slot-scope="scope">
-                  <el-select
-                    v-model="scope.row.transplantstate"
-                    placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+                    <template slot-scope="scope">
+                      <el-select
+                        v-model="scope.row.allocationstatus"
+                        placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+                      >
+                        <el-option
+                          v-for="dict in allocationstatuslist"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    prop="reallocationreason"
+                    label="閲嶅垎閰嶈鏄�"
+                    align="center"
+                    v-if="actives == 4"
                   >
-                    <el-option
-                      v-for="dict in transplantstatelist"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="dict.value"
-                    ></el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="绉绘鍖婚櫌"
-                align="center"
-                width="230"
-                prop="transplanthospitalname"
-              >
-                <template slot-scope="scope">
-                  <org-selecter
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    ref="tranHosSelect"
-                    :org-type="'4'"
-                    v-model="scope.row.transplanthospitalno"
-                    style="width: 100%"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="鑾峰彇缁勭粐"
-                align="center"
-                width="230"
-                prop="gainhospitalno"
-                v-if="actives == 5"
-              >
-                <template slot-scope="scope">
-                  <org-selecter
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    ref="tranHosSelect"
-                    :org-type="'4'"
-                    v-model="scope.row.gainhospitalno"
-                    style="width: 100%"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="绯荤粺缂栧彿"
-                align="center"
-                width="120"
-                prop="ageunit"
-                v-if="actives == 4"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    v-model="scope.row.ageunit"
-                    placeholder="绯荤粺缂栧彿"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="鎺ユ敹鏃堕棿"
-                align="center"
-                width="200"
-                prop="applicanttime"
-                v-if="actives == 4"
-              >
-                <template slot-scope="scope">
-                  <el-date-picker
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    clearable
-                    size="small"
-                    style="width: 100%"
-                    v-model="scope.row.applicanttime"
-                    type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="閫夋嫨鎺ユ敹鏃堕棿"
+                    <template slot-scope="scope">
+                      <el-input
+                        clearable
+                        v-model="scope.row.reallocationreason"
+                        placeholder="璇疯緭鍏ラ噸鍒嗛厤璇存槑"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鍣ㄥ畼绂讳綋鏃堕棿"
+                    align="center"
+                    width="200"
+                    prop="organgettime"
+                    v-if="actives == 5"
                   >
-                  </el-date-picker>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="鍙椾綋濮撳悕"
-                align="center"
-                width="120"
-                prop="name"
-                v-if="actives == 4"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    v-model="scope.row.name"
-                    placeholder="鍙椾綋濮撳悕"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="绉绘璐熻矗浜�"
-                align="center"
-                width="120"
-                prop="transplantdoct"
-                v-if="actives == 6"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    v-model="scope.row.transplantdoct"
-                    placeholder="鍖诲笀濮撳悕"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="绉绘鏃堕棿"
-                align="center"
-                width="200"
-                prop="transplanttime"
-                v-if="actives == 6"
-              >
-                <template slot-scope="scope">
-                  <el-date-picker
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    clearable
-                    size="small"
-                    style="width: 100%"
-                    v-model="scope.row.transplanttime"
-                    type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="閫夋嫨绉绘鏃堕棿"
+                    <template slot-scope="scope">
+                      <el-date-picker
+                        clearable
+                        size="small"
+                        style="width: 100%"
+                        v-model="scope.row.organgettime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="璇疯緭鍏ュ櫒瀹樼浣撴椂闂�"
+                      >
+                      </el-date-picker>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鑾峰彇鍖婚櫌"
+                    align="center"
+                    width="230"
+                    prop="gainhospitalno"
+                    v-if="actives == 5"
                   >
-                  </el-date-picker>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="鑾峰彇鍖诲笀"
-                align="center"
-                width="120"
-                prop="organgetdoct"
-                v-if="actives == 5"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    v-model="scope.row.organgetdoct"
-                    placeholder="鍖诲笀濮撳悕"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="鑾峰彇鏃堕棿"
-                align="center"
-                width="200"
-                prop="organgettime"
-                v-if="actives == 5"
-              >
-                <template slot-scope="scope">
-                  <el-date-picker
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    clearable
-                    size="small"
-                    style="width: 100%"
-                    v-model="scope.row.organgettime"
-                    type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    placeholder="閫夋嫨鑾峰彇鏃堕棿"
+                    <template slot-scope="scope">
+                      <div class="elldiv">
+                        <org-selecter
+                          ref="tranHosSelect"
+                          :org-type="'4'"
+                          v-model="scope.row.gainhospitalno"
+                        />
+                      </div>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鑾峰彇鍖诲笀"
+                    align="center"
+                    width="120"
+                    prop="organgetdoct"
+                    v-if="actives == 5"
                   >
-                  </el-date-picker>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="璇佷欢绫诲瀷"
-                align="center"
-                width="150"
-                prop="idcardtype"
-                v-if="actives == 4"
-              >
-                <template slot-scope="scope">
-                  <el-select
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    v-model="scope.row.idcardtype"
-                    placeholder="绉绘浜鸿瘉浠剁被鍨�"
+                    <template slot-scope="scope">
+                      <el-input
+                        v-model="scope.row.organgetdoct"
+                        placeholder="璇疯緭鍏ュ尰甯堝鍚�"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鑾峰彇鐘舵��"
+                    align="center"
+                    width="150"
+                    prop="organstate"
+                    v-if="actives == 5"
                   >
-                    <el-option
-                      v-for="dict in dict.type.sys_IDType"
-                      :key="dict.value"
-                      :label="dict.label"
-                      :value="parseInt(dict.value)"
-                    ></el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-              <el-table-column
-                label="璇佷欢鍙风爜"
-                align="center"
-                width="200"
-                prop="idcardno"
-                v-if="actives == 4"
-              >
-                <template slot-scope="scope">
-                  <el-input
-                    :disabled="
-                      scope.row.allocationstatus == 2 ||
-                        scope.row.organstate == 2 ||
-                        scope.row.transplantstate == 2
-                    "
-                    v-model="scope.row.idcardno"
-                    placeholder="璇佷欢鍙风爜"
-                  />
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="abandonreason"
-                label="寮冪敤/浣滃簾鍘熷洜"
-                align="center"
-                width="260"
-              >
-                <template slot-scope="scope">
-                  <el-row>
-                    <el-input
-                      clearable
-                      v-model="scope.row.abandonreason"
-                      placeholder="璇疯緭鍏ュ純鐢�/浣滃簾鍘熷洜"
-                    />
-                  </el-row>
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-form-item>
+                    <template slot-scope="scope">
+                      <el-select
+                        v-model="scope.row.organstate"
+                        placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+                      >
+                        <el-option
+                          v-for="dict in organstatelist"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="璇存槑"
+                    align="center"
+                    prop="notgetreason"
+                    v-if="actives == 5"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        clearable
+                        v-model="scope.row.notgetreason"
+                        placeholder="璇疯緭鍏ユ湭鑾峰彇璇存槑"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="绉绘鍖婚櫌"
+                    align="center"
+                    width="230"
+                    prop="transplanthospitalname"
+                    v-if="actives == 6"
+                  >
+                    <template slot-scope="scope">
+                      <org-selecter
+                        ref="tranHosSelect"
+                        :org-type="'4'"
+                        v-model="scope.row.transplanthospitalno"
+                        style="width: 100%"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="绉绘璐熻矗浜�"
+                    align="center"
+                    width="120"
+                    prop="transplantdoct"
+                    v-if="actives == 6"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        v-model="scope.row.transplantdoct"
+                        placeholder="鍖诲笀濮撳悕"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="绉绘鏃堕棿"
+                    align="center"
+                    width="200"
+                    prop="transplanttime"
+                    v-if="actives == 6"
+                  >
+                    <template slot-scope="scope">
+                      <el-date-picker
+                        clearable
+                        size="small"
+                        style="width: 100%"
+                        v-model="scope.row.transplanttime"
+                        type="datetime"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        placeholder="閫夋嫨绉绘鏃堕棿"
+                      >
+                      </el-date-picker>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="绉绘鐘舵��"
+                    align="center"
+                    width="150"
+                    prop="transplantstate"
+                    v-if="actives == 6"
+                  >
+                    <template slot-scope="scope">
+                      <el-select
+                        v-model="scope.row.transplantstate"
+                        placeholder="璇烽�夋嫨鍣ㄥ畼鐘舵��"
+                      >
+                        <el-option
+                          v-for="dict in transplantstatelist"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    prop="abandonreason"
+                    label="璇存槑"
+                    align="center"
+                    v-if="actives == 6"
+                  >
+                    <template slot-scope="scope">
+                      <el-input
+                        clearable
+                        v-model="scope.row.abandonreason"
+                        placeholder="璇疯緭鍏ュ純鐢ㄨ鏄�"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="鎿嶄綔"
+                    width="200"
+                    align="center"
+                    class-name="small-padding fixed-width"
+                    v-if="actives == 4"
+                  >
+                    <template slot-scope="scope">
+                      <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-copy-document"
+                        @click="deldistribution(scope.row)"
+                        >鍒犻櫎</el-button
+                      >
+                      <el-button
+                        size="mini"
+                        type="text"
+                        icon="el-icon-copy-document"
+                        @click="redistribution(scope.row)"
+                        >閲嶆柊鍒嗛厤</el-button
+                      >
+                    </template>
+                  </el-table-column>
+                </el-table>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-form>
         <div class="dialog-footer" v-show="actives == 4">
           <el-button
             v-show="!showTerminationBtn"
             type="primary"
             @click="Savethedetails"
-            >淇濆瓨鍣ㄥ畼鍒嗛厤淇℃伅</el-button
+            >淇濆瓨</el-button
           >
           <el-button
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
-            >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+            >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
           >
           <!-- <el-button
             v-show="makeastepforward"
@@ -1618,7 +1614,7 @@
             @click="makeastepforward"
             >涓嬩竴姝�</el-button
           > -->
-          <el-button @click="cancel">鍙� 娑�</el-button>
+          <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
       </div>
       <!-- 鑾峰彇瑙佽瘉 -->
@@ -1960,12 +1956,12 @@
             v-show="!showTerminationBtn"
             type="primary"
             @click="Savethedetails"
-            >淇濆瓨瑙佽瘉淇℃伅</el-button
+            >淇濆瓨</el-button
           >
           <el-button
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
-            >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+            >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
           >
           <!-- <el-button
             v-show="makeastepforward"
@@ -1974,7 +1970,7 @@
             >涓嬩竴姝�</el-button
           > -->
 
-          <el-button @click="cancel">鍙� 娑�</el-button>
+          <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
       </div>
       <!-- 瀹屾垚鐧昏 -->
@@ -1987,24 +1983,7 @@
           label-position="right"
         >
           <el-row>
-            <el-col :span="8">
-              <el-form-item label="瀹屾垚鏃堕棿" prop="completetime">
-                <el-date-picker
-                  style="width: 167px"
-                  clearable
-                  size="small"
-                  v-model="accomplishform.completetime"
-                  type="date"
-                  value-format="yyyy-MM-dd hh:mm:ss"
-                  placeholder="閫夋嫨瀹屾垚鏃堕棿"
-                >
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="7">
+            <el-col :span="6">
               <el-form-item align="left" label="閬椾綋鎹愮尞" prop="isbodydonation">
                 <el-radio-group v-model="accomplishform.isbodydonation">
                   <el-radio
@@ -2016,7 +1995,7 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="7">
+            <el-col :span="12">
               <el-form-item align="left" label="鎺ユ敹鍗曚綅" prop="receivingunit">
                 <el-input
                   v-model="accomplishform.receivingunit"
@@ -2025,9 +2004,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-
           <el-row>
-            <el-col :span="7">
+            <el-col :span="6">
               <el-form-item label="璐熻矗浜�" prop="responsibleuserid">
                 <el-select
                   v-model="accomplishform.responsibleuserid"
@@ -2043,7 +2021,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="7">
+            <el-col :span="6">
               <el-form-item label="鍗忚皟鍛樹竴" prop="coordinateduserido">
                 <el-select
                   v-model="accomplishform.coordinateduserido"
@@ -2059,7 +2037,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="7">
+            <el-col :span="6">
               <el-form-item label="鍗忚皟鍛樹簩" prop="coordinateduseridt">
                 <el-select
                   v-model="accomplishform.coordinateduseridt"
@@ -2075,6 +2053,20 @@
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :span="6">
+              <el-form-item label="瀹屾垚鏃堕棿" prop="completetime">
+                <el-date-picker
+                  style="width: 167px"
+                  clearable
+                  size="small"
+                  v-model="accomplishform.completetime"
+                  type="date"
+                  value-format="yyyy-MM-dd hh:mm:ss"
+                  placeholder="閫夋嫨瀹屾垚鏃堕棿"
+                >
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
           </el-row>
         </el-form>
         <div class="dialog-footer">
@@ -2082,25 +2074,43 @@
             v-show="!showTerminationBtn"
             type="primary"
             @click="Savethedetails"
-            >瀹屾垚鐧昏</el-button
+            >淇濆瓨</el-button
           >
           <el-button
             :type="showTerminationBtn == 0 ? 'warning' : 'success'"
             @click="Terminationcase"
-            >{{ showTerminationBtn == 0 ? "缁堟妗堜緥" : "鎭㈠妗堜緥" }}</el-button
+            >{{ showTerminationBtn == 0 ? "缁堟" : "鎭㈠" }}</el-button
           >
           <el-button
             v-show="Reportforreview"
             type="primary"
             @click="Reportforreview"
-            >涓婃姤瀹℃牳</el-button
+            >鎻愪氦</el-button
           >
-          <el-button @click="cancel">鍙� 娑�</el-button>
+          <!-- <el-button @click="cancel">鍙� 娑�</el-button> -->
         </div>
       </div>
       <!-- 瀹岀粨娴佺▼ -->
       <div class="boxdiv" v-show="actives > 6">
-        <h3>鍏ㄩ儴娴佺▼宸插畬缁擄紒</h3>
+        <div style="display:flex; line-height: 100px; justify-content: center;">
+          <!-- <el-image
+            style="width: 100px; height: 100px"
+            :src="require('@/assets/images/wanc.png')"
+          ></el-image> -->
+          <div style="padding: 20px 0; margin: 0 30px">
+            <img
+              style="width: 60px; height: 60px"
+              src="@/assets/images/wanc.png"
+              class="user-avatar"
+            />
+          </div>
+          <div style="font-size: 28px;">鍏ㄩ儴娴佺▼宸插畬缁擄紒</div>
+          <img
+            style="width: 100px; height: 100px"
+            src="@/assets/images/zhan.png"
+            class="user-avatar"
+          />
+        </div>
       </div>
     </div>
     <!-- 闄勪欢寮圭獥 -->
@@ -2255,11 +2265,7 @@
   Modifydonationattachment
 } from "@/api/project/donateannex";
 import { listReportname } from "@/api/project/organization";
-import {
-  listnewDonatecompletioninfo,
-  addDonatecompletioninfo,
-  updateDonatecompletioninfo
-} from "@/api/project/donatecompletioninfo";
+
 import {
   getDonatebaseinfo,
   addDonatebaseinfo,
@@ -2272,15 +2278,23 @@
   updateMedicalevaluation
 } from "@/api/project/medicalevaluation";
 import {
+  listRelativesconfirmation,
+  getRelativesconfirmation,
+  addRelativesconfirmation,
+  updateRelativesconfirmation
+} from "@/api/project/relativesconfirmation";
+import {
+  listEthicalreviewopinions,
+  getEthicalreviewopinions,
+  addEthicalreviewopinions,
+  updateEthicalreviewopinions,
+  listnewEthicalreviewopinions
+} from "@/api/project/ethicalreviewopinions";
+import {
   addDonateflowchart,
   listDonateflowchart,
   updateDonateflowchart
 } from "@/api/project/DonationEvaluation";
-import {
-  listOrganallocation,
-  addOrganallocation,
-  updateOrganallocation
-} from "@/api/project/organallocation";
 import {
   listDonateorgan,
   addDonateorgan,
@@ -2288,17 +2302,21 @@
   updateDonateorgan
 } from "@/api/project/donateorgan";
 import {
+  listOrganallocation,
+  addOrganallocation,
+  updateOrganallocation
+} from "@/api/project/organallocation";
+import {
   addDonationwitness,
   updateDonationwitness,
   getDonationwitness,
   getByInfoId
 } from "@/api/project/donationwitness";
 import {
-  listRelativesconfirmation,
-  getRelativesconfirmation,
-  addRelativesconfirmation,
-  updateRelativesconfirmation
-} from "@/api/project/relativesconfirmation";
+  listnewDonatecompletioninfo,
+  addDonatecompletioninfo,
+  updateDonatecompletioninfo
+} from "@/api/project/donatecompletioninfo";
 import Li_area_select from "@/components/Address";
 import OrgSelecter from "@/views/project/components/orgselect";
 import AnnexUpload from "@/views/project/components/annexupload";
@@ -2314,30 +2332,6 @@
     AnnexUpload,
     ReportName
   },
-  // dicts: [
-  //   "sys_nation",
-  //   "sys_occupation",
-  //   "sys_education",
-  //   "sys_Organ",
-  //   "sys_user_sex",
-  //   "sys_IDType",
-  //   "sys_BloodType",
-  //   "sys_0_1",
-  //   "sys_patientstate",
-  //   "sys_DonationCategory",
-  //   "sys_Kinship",
-  //   "sys_Infectious",
-  //   "sys_bloodtype_rhd",
-  //   "sys_InfoSources",
-  //   "sys_OtherCases",
-  //   "sys_DiseaseType",
-  //   "sys_SelfWill",
-  //   "sys_FamilyRelation",
-  //   "sys_OrganDecision",
-  //   "sys_CoreAssessConclusion",
-  //   "sys_BaseAssessConclusion",
-  //   "sys_EthicalReview"
-  // ],
   data() {
     return {
       infoid: 736,
@@ -2349,49 +2343,44 @@
           address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1518 寮�",
           tag: "涓浗涓�绫�(DBD)",
           type: "success"
-        },
-        {
-          name: "鐜嬪皬铏�",
-          address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1517 寮�",
-          tag: "涓浗浜岀被(DCD)",
-          type: "danger"
-        },
-        {
-          name: "鐜嬪皬铏�",
-          address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1519 寮�",
-          tag: "涓浗涓夌被(DBCD)",
-          type: "warning"
-        },
-        {
-          name: "鐜嬪皬铏�",
-          address: "涓婃捣甯傛櫘闄�鍖洪噾娌欐睙璺� 1516 寮�",
-          tag: "涓浗涓夌被(DBCD)",
-          type: "warning"
         }
       ],
       medicineform: {
         infoid: null
       },
       affirmform: {
-        infoid: null
+        infoid: null,
+        organdecision: []
       },
+      organdecision: [],
       ethicform: {
         infoid: null
       },
+
+      kinshiplist: ["閰嶅伓", "鐖朵翰", "姣嶄翰", "瀛愬コ", "鍙楁墭浜�"],
+      organlist: [
+        "鑲濊剰",
+        "鍙岃偩鑴�",
+        "蹇冭剰",
+        "鑲鸿剰",
+        "鑵轰綋",
+        "灏忚偁",
+        "鍙岀溂缁勭粐",
+        "閬椾綋",
+        "鍏朵粬"
+      ],
       allocationstatuslist: [
-        { value: 0, label: "鏈垎閰�" },
         { value: 1, label: "宸插垎閰�" },
         { value: 2, label: "浣滃簾" }
       ],
       organstatelist: [
-        { value: "0", label: "鏈幏鍙�" },
         { value: "1", label: "宸茶幏鍙�" },
-        { value: "2", label: "寮冪敤" }
+        { value: "2", label: "鍥炵撼" }
       ],
       transplantstatelist: [
-        { value: 0, label: "鏈Щ妞�" },
         { value: 1, label: "宸茬Щ妞�" },
-        { value: 2, label: "寮冪敤" }
+        { value: 2, label: "搴撳瓨" },
+        { value: 3, label: "寮冪敤" }
       ],
       allocationform: [],
       witnessform: {
@@ -2511,7 +2500,32 @@
       },
       // 鍚勭骇鏄庣粏鏁堥獙
       medicinerules: {},
-      affirmrules: {},
+      affirmrules: {
+        name: [
+          { required: true, message: "浜插睘濮撳悕涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        phone: [
+          { required: true, message: "瀹跺睘鑱旂郴鐢佃瘽涓嶄负绌�", trigger: "blur" }
+        ],
+        signfamilyrelations: [
+          { required: true, message: "涓庢崘鐚�呭叧绯�", trigger: "blur" }
+        ],
+        idcardno: [
+          { required: true, message: "璇佷欢鍙蜂笉鑳戒负绌�", trigger: "blur" }
+        ],
+        organdecision: [
+          { required: true, message: "鎹愮尞鍐冲畾涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        responsibleuserid: [
+          { required: true, message: "璐熻矗浜轰笉鑳戒负绌�", trigger: "blur" }
+        ],
+        coordinateduserido: [
+          { required: true, message: "鍗忚皟鍛�1涓嶈兘涓虹┖", trigger: "blur" }
+        ],
+        coordinateduseridt: [
+          { required: true, message: "鍗忚皟鍛�2涓嶈兘涓虹┖", trigger: "blur" }
+        ]
+      },
       ethicrules: {},
       allocationrules: {},
       witnessrules: {},
@@ -2596,18 +2610,21 @@
         this.residenceAddresss.shi = response.data.residencecityname;
         this.residenceAddresss.qu = response.data.residencetownname;
         this.registerAddresss.qu = response.data.registertownname;
+        // 鑾峰彇浜岀骇琛�
+        this.GetAttacheddata();
       });
-      // 鑾峰彇浜岀骇琛�
-      this.GetAttacheddata();
     },
     // 鑾峰彇浜岀骇琛ㄦ暟鎹�
     GetAttacheddata() {
       let searchParam = {
         infoid: this.infoid
       };
-      if (this.actives == 1 && !this.medicineform.infoid) {
+      if (this.actives == 1) {
         this.annexfilesList = this.medicinelist;
         this.activetele = "鍖诲璇勪及";
+        if (this.medicineform.infoid) {
+          return;
+        }
         listMedicalevaluation(searchParam).then(response => {
           if (response.code == 200 && response.rows[0]) {
             this.medicineform = response.rows[0];
@@ -2617,12 +2634,18 @@
             // );
           }
         });
-      } else if (this.actives == 2 && !this.affirmform.infoid) {
+      } else if (this.actives == 2) {
         this.annexfilesList = this.affirmlist;
         this.activetele = "鎹愮尞纭";
+        if (this.affirmform.infoid) {
+          return;
+        }
         listRelativesconfirmation(searchParam).then(response => {
           if (response.code == 200 && response.rows[0]) {
             this.affirmform = response.rows[0];
+            if (this.affirmform.organdecision) {
+              this.organdecision = this.affirmform.organdecision.split(",");
+            }
             if (!this.affirmform) {
               this.affirmform = {};
               this.affirmform.residenceprovincename = "";
@@ -2646,18 +2669,21 @@
             // );
           }
         });
-      } else if (this.actives == 3 && !this.ethicform.infoid) {
+      } else if (this.actives == 3) {
         this.annexfilesList = this.ethiclist;
         this.activetele = "浼︾悊瀹℃煡";
-
-        listDonateflowchart(searchParam).then(response => {
+        if (this.ethicform.infoid) {
+          return;
+        }
+        //listDonateflowchart(searchParam).then(response => {
+        listEthicalreviewopinions(searchParam).then(response => {
           if (response.code == 200 && response.rows.length) {
             this.ethicform = response.rows[0];
           } else {
             console.log("浼︾悊瀹℃煡鏁版嵁涓虹┖");
           }
         });
-      } else if (this.actives == 4 && !this.medicineform[0]) {
+      } else if (this.actives == 4 && !this.allocationform[0]) {
         listDonateorgan(searchParam).then(response => {
           if (response.code == 200) {
             if (response.rows[0]) {
@@ -2701,9 +2727,12 @@
             // );
           }
         });
-      } else if (this.actives == 6 && !this.allocationform.infoid) {
+      } else if (this.actives == 6) {
         this.annexfilesList = this.registerlist;
         this.activetele = "瀹屾垚鐧昏";
+        if (this.allocationform.infoid) {
+          return;
+        }
         let accpre = {
           id: searchParam.infoid
         };
@@ -2732,7 +2761,7 @@
           }
         });
       } else if (this.actives == 0) {
-        this.annexfilesList = this.registerlist;
+        this.annexfilesList = this.potentiallist;
         this.activetele = "娼滃湪鎹愮尞";
       }
     },
@@ -2842,6 +2871,7 @@
         });
       } else if (this.actives == 2) {
         this.affirmform.infoid = this.infoid;
+        this.affirmform.organdecision = this.organdecision.join(",");
         this.$refs["affirmform"].validate(valid => {
           if (valid) {
             if (this.affirmform.id != null) {
@@ -2864,11 +2894,13 @@
         this.$refs["ethicform"].validate(valid => {
           if (valid) {
             if (this.ethicform.id != null) {
-              updateDonateflowchart(this.ethicform).then(response => {
+              // updateDonateflowchart(this.ethicform).then(response => {
+              updateEthicalreviewopinions(this.ethicform).then(response => {
                 this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅淇敼鎴愬姛");
               });
             } else {
-              addDonateflowchart(this.ethicform).then(response => {
+              //addDonateflowchart(this.ethicform).then(response => {
+              addEthicalreviewopinions(this.ethicform).then(response => {
                 this.$modal.msgSuccess("浼︾悊瀹℃煡淇℃伅鏂板鎴愬姛");
               });
             }
@@ -2939,6 +2971,7 @@
                 this.$modal.msgSuccess("鑾峰彇瑙佽瘉淇℃伅鏂板鎴愬姛");
               });
             }
+            this.form.donationcategory = this.witnessform.donationcategory;
             this.Processvalidation();
           }
         });
@@ -2957,7 +2990,7 @@
               }
             });
             // 淇濆瓨纭淇℃伅
-            if (this.accomplishform.id) {
+            if (this.accomplishform.dcid) {
               console.log(this.accomplishform);
               updateDonatecompletioninfo(this.accomplishform).then(response => {
                 this.$modal.msgSuccess("瀹屾垚鐧昏淇℃伅淇敼鎴愬姛");
@@ -3056,7 +3089,7 @@
     Processvalidation() {
       console.log(this.form.workflow);
       console.log(this.actives);
-      if (this.form.workflow + 1 == this.actives) {
+      if (this.form.workflow + 1 == this.actives || this.actives == 6) {
         if (this.form.workflow <= 6) {
           this.form.workflow++;
         } else {
@@ -3065,9 +3098,14 @@
         // this.GetAttacheddata();
       } else if (this.form.workflow > this.actives) {
         // this.submitForm();
+        Modifydonationattachment(this.donatelist).then(res => {
+          console.log(res);
+        });
+        this.listDonateannex();
         this.GetAttacheddata();
       } else {
-        this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
+        this.submitForm();
+        // this.$modal.msgWarning("璇峰厛瀹屾垚鍓嶉儴姝ラ");
         return;
       }
       console.log(this.form.workflow);
@@ -3300,19 +3338,21 @@
 
 <style lang="scss" scoped>
 .particularsdiv {
-  display: flex;
+  display: -webkit-box;
   background-color: #f5f7fa;
   height: 100%;
+
   .left-course {
     background: #fff;
-    width: 20%;
+    width: 17vw;
     text-align: center;
     margin: 20px 10px;
     padding: 10px;
     margin-top: 0;
+    min-height: 888px;
 
     .postfilx {
-      width: 15%;
+      width: 15vw;
       text-align: center;
       margin: 20px 10px;
       padding: 10px;
@@ -3322,6 +3362,7 @@
       position: fixed;
       top: 50;
     }
+
     .title {
       background: #22a2c3;
       margin-bottom: 20px;
@@ -3330,9 +3371,11 @@
     }
   }
 }
+
 .upload-demo {
   text-align: center;
 }
+
 .pdfimg {
   display: flex; // text-align: center;
   width: 100%;
@@ -3372,12 +3415,15 @@
     text-align: center;
   }
 }
+
 .Ticket-button {
   margin-top: 10px;
   text-align: right;
   padding-right: 66px;
 }
+
 .boxdiv {
+  max-width: 85vw;
   font-size: 18px;
   padding: 0 30px;
   padding-bottom: 10px;
@@ -3391,14 +3437,23 @@
     margin-bottom: 30px;
   }
 }
+
 ::v-deep .el-step__head.is-finish {
   color: #22a2c3;
   border-color: #22a2c3;
 }
+
 ::v-deep .el-step__title.is-finish {
   color: #22a2c3;
 }
+
 ::v-deep .el-step__description.is-finish {
   color: #22a2c3;
 }
+
+:v-deep .el-select {
+  display: inline-block;
+  position: relative;
+  width: 80%;
+}
 </style>

--
Gitblit v1.9.3